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/html.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb
index 581c3e5e..afd69118 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/v6/html.rb
@@ -150,7 +150,7 @@ module SiSU_HTML
           SiSU_HTML::Source::Output.new(scroll,@md).scroll
         end
       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
@@ -163,7 +163,7 @@ module SiSU_HTML
             end
           end
         end
-        SiSU_Env::Clear.new(@opt.cmd,@opt.fns,@md).param_instantiate
+        SiSU_Env::Clear.new(@opt.selections.str,@opt.fns,@md).param_instantiate
         @@flag,@@scr,@@seg,@@seg_endnotes,@@seg_subtoc,@@seg_ad={},{},{},{},{},{}
         @@seg_total,@@tracker,@@loop_count,@@tablehead,@@number_of_cols=0,0,0,0,0
         @@seg_name,@@seg_name_html,@@seg_subtoc_array,@@seg_endnotes_array,@@segtocband,@@tablefoot=Array.new(7){[]}
@@ -305,7 +305,7 @@ module SiSU_HTML
                 @@toc[:seg_mini] << toc[:seg_mini] if toc[:seg_mini]
                 @@toc[:scr] << toc[:scr] if toc[:scr]
               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
               end
@@ -729,7 +729,7 @@ WOK
               end
             end
           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
@@ -751,7 +751,7 @@ WOK
               end
             end
           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