From 39e11a4420226c3238e787de5be1c9279f46cf1f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Aug 2014 00:10:22 -0400
Subject: v5 v6: code file renames, fairly extensive

* v5 file renames sync with v6 for easier comparison
* v5 here (5.5.6) remains as in previous version (5.5.5)
---
 lib/sisu/v6/xhtml.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sisu/v6/xhtml.rb')

diff --git a/lib/sisu/v6/xhtml.rb b/lib/sisu/v6/xhtml.rb
index dc04e8b2..0f03dc5b 100644
--- a/lib/sisu/v6/xhtml.rb
+++ b/lib/sisu/v6/xhtml.rb
@@ -63,9 +63,9 @@
 module SiSU_XHTML
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   require_relative 'xml_shared'                         # xml_shared.rb
     include SiSU_XML_Munge
-- 
cgit v1.2.3


From 64e5c9120ffb7a65b96eded0850f481e116f1d3f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Aug 2014 00:16:16 -0400
Subject: v6: use opt.act, code internals (simplify, cleaner; remove opt.cmd &
 opt.mod)

* v5 dp, indentation changed to retain easy comparison with v6
---
 lib/sisu/v6/xhtml.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sisu/v6/xhtml.rb')

diff --git a/lib/sisu/v6/xhtml.rb b/lib/sisu/v6/xhtml.rb
index 0f03dc5b..ee19a12e 100644
--- a/lib/sisu/v6/xhtml.rb
+++ b/lib/sisu/v6/xhtml.rb
@@ -116,7 +116,7 @@ module SiSU_XHTML
         end
         SiSU_XHTML::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
@@ -140,7 +140,7 @@ module SiSU_XHTML
           end
           SiSU_Rexml::Rexml.new(@md,@file.place_file.xhtml.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