diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-08-08 00:38:36 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-08-08 00:38:36 -0400 |
commit | fe909890122d015ab05273e8d181b2b30765710f (patch) | |
tree | e922edaef0997e926a4983593ec088dcca7f7d77 /lib/sisu/v5/xml_sax.rb | |
parent | debian/changelog (5.5.6-1) (diff) | |
parent | documentation related (diff) |
Merge tag 'sisu_5.6.0' into debian/sid
SiSU 5.6.0
Diffstat (limited to 'lib/sisu/v5/xml_sax.rb')
-rw-r--r-- | lib/sisu/v5/xml_sax.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb index 58719798..69dc39a3 100644 --- a/lib/sisu/v5/xml_sax.rb +++ b/lib/sisu/v5/xml_sax.rb @@ -116,7 +116,7 @@ module SiSU_XML_SAX end SiSU_XML_SAX::Source::Songsheet.new(@particulars).song rescue - SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do + SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -141,7 +141,7 @@ module SiSU_XML_SAX end SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.act[:maintenance][:set]==:on # test rexml parsing, comment out when not in use #debug rescue - SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.fns).location do + SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.fns).location do __LINE__.to_s + ':' + __FILE__ end ensure @@ -333,8 +333,8 @@ WOK @endnotes,@level,@cont,@copen,@xml_contents_close=[],[],[],[],[] @rcdc=false xml_head - (0..6).each { |x| @cont[x]=@level[x]=false } - (4..6).each { |x| @xml_contents_close[x]='' } + (0..7).each { |x| @cont[x]=@level[x]=false } + (4..7).each { |x| @xml_contents_close[x]='' } data.each do |dob| @trans.char_enc.utf8(dob) if @sys.locale =~/utf-?8/i #% utf8 dob=@trans.markup(dob) @@ -361,6 +361,7 @@ WOK when 4 then x.heading_body4 when 5 then x.heading_body5 when 6 then x.heading_body6 + when 7 then x.heading_body7 end else if dob.is==:verse @@ -415,7 +416,7 @@ WOK dob.obj=dob.obj.gsub(/#{Mx[:pa_o]}:\S+#{Mx[:pa_c]}/,'') if dob.obj end end - 6.downto(4) do |x| + 7.downto(4) do |x| y=x - 1; v=x - 3 @@xml[:body] << "#{Ax[:tab]*5}</content>\n#{Ax[:tab]*y}</contents#{v}>" if @level[x]==true end @@ -423,7 +424,7 @@ WOK y=x - 1 @@xml[:body] << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]==true end - #6.downto(1) { |x| y=x - 1; @@xml[:body] << "#{Ax[:tab]*y}</level #{x}>" if @level[x]==true } + #7.downto(1) { |x| y=x - 1; @@xml[:body] << "#{Ax[:tab]*y}</level #{x}>" if @level[x]==true } end def pre rdf=SiSU_XML_Tags::RDF.new(@md) |