Merge tag 'sisu_5.5.6' into debian/sid

SiSU 5.5.6

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/sisu/v6/xml_odf_odt.rb b/lib/sisu/v6/xml_odf_odt.rb
index 224de6da..bb69be5d 100644
--- a/lib/sisu/v6/xml_odf_odt.rb
+++ b/lib/sisu/v6/xml_odf_odt.rb
@@ -61,10 +61,10 @@
 
 =end
 module SiSU_XML_ODF_ODT
-  require_relative 'particulars'                        # particulars.rb
+  require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
   require_relative 'ao'                                 # ao.rb
-  require_relative 'sysenv'                             # sysenv.rb
+  require_relative 'se'                                 # se.rb
     include SiSU_Env
   include SiSU_Viz
   require_relative 'xml_odf_odt_format'                 # xml_odf_odt_format.rb
@@ -117,7 +117,7 @@ module SiSU_XML_ODF_ODT
         end
         SiSU_XML_ODF_ODT::Source::Scroll.new(@particulars).songsheet
       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
@@ -150,7 +150,7 @@ module SiSU_XML_ODF_ODT
           unless (@md.opt.act[:verbose_plus][:set]==:on \
           || @md.opt.act[:maintenance][:set]==:on)
             if @env.processing_path.odt =~/od[ft]/
-              #p "rm -r #{@env.processing_path.odt}" if @md.opt.cmd =~/v/
+              #p "rm -r #{@env.processing_path.odt}" if @md.opt.selections.str =~/v/
               FileUtils::rm_r(@env.processing_path.odf_pth)
               #system("rm -r #{@env.processing_path.odt}")
             end
@@ -636,7 +636,7 @@ module SiSU_XML_ODF_ODT
         odf_book_idx
         odf_metadata
         data.each do |dob|
-          #p dob.obj if dob.obj =~safe_characters and @md.opt.cmd =~/V/ #KEEP
+          #p dob.obj if dob.obj =~safe_characters and @md.opt.selections.str =~/V/ #KEEP
           dob.obj='' if dob.obj =~/#{Mx[:lv_o]}\d+:.*?#{Mx[:lv_c]}.+?#{Mx[:pa_non_object_dummy_heading]}/ #fix Mx[:lv_o]
           para_array=[]
           dob.obj=dob.obj.gsub(/</,'&lt;').gsub(/>/,'&gt;')