From b130d967b295b548d837ea5f603a6b0fec7a08a8 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 14 Jun 2007 10:21:17 +0100
Subject: sisu-0.54.0 (minor additions to syntax, indent range extended) from
 upstream

* indent levels (1-9) added [previously two levels] done for plaintext, html,
  xml, odf, latex/pdf [minor syntax addition (_3 - _9), version number
  change]

* bullet indent levels (1-9) added [previously two levels] done for
  plaintext, html, odf, latex/pdf [minor syntax addition (_3* - _9*), version
  number change]

* url decoration, open close, default angle brackets <http://url>

* fixes, some line-breaking for plaintext (and text groups for) odf and xml

* css, modifications for extended indents in html and xml [sisu -CC (for
  update)]

* vim syntax highlighter updated to take account of extended indent range

* rant installer minor changes for future ruby

* conversion script in data/sisu/conf/convert/sisu_convert
---
 lib/sisu/v0/xml.rb | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'lib/sisu/v0/xml.rb')

diff --git a/lib/sisu/v0/xml.rb b/lib/sisu/v0/xml.rb
index 20c5f80e..7edbb8ea 100644
--- a/lib/sisu/v0/xml.rb
+++ b/lib/sisu/v0/xml.rb
@@ -120,7 +120,7 @@ module SiSU_XML_SAX
       end
       def songsheet
         pre
-        markup
+        @data=markup(@data)
         post
         publish
       end
@@ -293,8 +293,7 @@ WOK
         @@xml[:body] << "#{@tab*0}</object>" << "\n" #if para[@regx]
         @endnotes=[]
       end
-      def markup
-        data=@data
+      def markup(data)
         xml_sc(@md)
         @endnotes,@level,@cont,@copen,@xml_contents_close=[],[],[],[],[]
         @rcdc=false
@@ -355,10 +354,12 @@ WOK
                     table=SiSU_Tables::Table_xml.new(para,ocn)
                     para=table.table_split
                     table_structure(para)
-                  elsif para =~ /<:i1>/
-                    xml_structure(para,nil,nil,nil,'indent1')
-                  elsif para =~ /<:i2>/
-                    xml_structure(para,nil,nil,nil,'indent2')
+                  elsif para =~ /^\s*(?:<:i([1-9])> )?_\*/                           #uncomment
+                    m=$1
+                    para.gsub!(/^(\s*(?:<:i[1-9]> )?)_\*/,'\1')
+                    xml_structure(para,nil,nil,nil,"indent_bullet#{m}")
+                  elsif para =~ /<:i([1-9])>/
+                    xml_structure(para,nil,nil,nil,"indent#{$1}")
                   else xml_structure(para,nil,nil,nil)
                   end
                   #@@xml[:body] << "#{@tab*6}<object>" << "\n" if para[@regx]
@@ -381,11 +382,7 @@ WOK
               end
               para='' if para =~/<a name="n\d+">/ and para =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/ # -endnote
               if para =~/.*<:#>.*$/
-                para=case para
-                when /<:i1>/
-                  format_text=Format_text_object.new(para,'')
-                  format_text.scr_inden_ocn_e_no_paranum
-                when /<:i2>/
+                para=if para =~ /<:i[1-9]>/
                   format_text=Format_text_object.new(para,'')
                   format_text.scr_inden_ocn_e_no_paranum
                 end
@@ -438,7 +435,6 @@ WOK
       end
       def publish
         content=[]
-        data=@data
         content << @@xml[:open] << @@xml[:head] << @@xml[:body] << @@xml[:metadata]
         content << @@xml[:owner_details] if @md.stmp =~/\w\w/
         content << @@xml[:tail] << @@xml[:close]
-- 
cgit v1.2.3