From 809034240a1be22cc00cb3b4c1df1dd2facdc8f8 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Aug 2014 00:32:27 -0400
Subject: v5: merged v6 libraries

* commandline, --act0 to --act9, rc-config with flag:act[0-9]
  * configurable command line options increased to 0 - 9 (instead of 0 - 5)
  * use --act0 to --act9 (previous flags -1 to -5; -0 to -9 now available)
  * default --act0
  * rc config with flag:act0 to flag:act9 (previously roman numerals)
  * legacy roman numeral configuration works (for now)
* use opt.act, code internals (simplify, cleaner; remove opt.cmd
    & opt.mod)
* hub, further changes related to use of opt.act; hub file split
---
 lib/sisu/v5/xml_sax.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sisu/v5/xml_sax.rb')

diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb
index 58719798..273d24cc 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
-- 
cgit v1.2.3


From 6bc3b814011e829db684ec96bb3abd1e4abb29c3 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Aug 2014 00:34:25 -0400
Subject: v5 v6: extend document structure, headings A - D, 1 - 4

* sql db table structure changed (needs to be rebuilt)
---
 lib/sisu/v5/xml_sax.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/sisu/v5/xml_sax.rb')

diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb
index 273d24cc..69dc39a3 100644
--- a/lib/sisu/v5/xml_sax.rb
+++ b/lib/sisu/v5/xml_sax.rb
@@ -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)
-- 
cgit v1.2.3