From 145f3092505f614ca5c81a4cbcfea9f22329e745 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 3 Feb 2012 20:02:32 -0500
Subject: v3 v3dv: path & url links, updates for multiple output directory
 structures

---
 lib/sisu/v3dv/xhtml.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/lib/sisu/v3dv/xhtml.rb b/lib/sisu/v3dv/xhtml.rb
index bf1c964a..050e16d8 100644
--- a/lib/sisu/v3dv/xhtml.rb
+++ b/lib/sisu/v3dv/xhtml.rb
@@ -83,9 +83,10 @@ module SiSU_XHTML
         unless @opt.cmd =~/q/
           path=@env.path.output_tell
           loc=@env.url.output_tell
-
-          tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}"
-          elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}"
+          tool=if @opt.cmd =~/[MV]/
+            "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}"
+          elsif @opt.cmd =~/v/
+            "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}"
           else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
           end
           @opt.cmd=~/[MVvz]/ \
-- 
cgit v1.2.3


From 7e3cee576368c095fe491014bd279eb280c598ba Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 3 Feb 2012 20:41:32 -0500
Subject: v3dv, dal +, use symbols to identify document objects type (is) and
 group (of)

* (dal & code affected as a result)
---
 lib/sisu/v3dv/xhtml.rb | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

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

diff --git a/lib/sisu/v3dv/xhtml.rb b/lib/sisu/v3dv/xhtml.rb
index 050e16d8..5d17128c 100644
--- a/lib/sisu/v3dv/xhtml.rb
+++ b/lib/sisu/v3dv/xhtml.rb
@@ -192,9 +192,10 @@ WOK
         tags
       end
       def xml_structure(dob,type='norm')
-        if dob.is =~/para|heading/
+        if dob.is ==:para \
+        || dob.is ==:heading
           named=name_tags(dob)
-          if dob.is=='heading'
+          if dob.is==:heading
             lv=dob.ln
             n=dob.ln - 1
             n3=dob.ln + 2
@@ -295,7 +296,7 @@ WOK
             end
             if not @rcdc
               x=SiSU_XML_Format::FormatSeg.new(@md,dob)
-              if dob.is=='heading'
+              if dob.is==:heading
                 xml_structure(dob)
                 dob.obj=case dob.ln
                 when 1; x.heading_body1
@@ -306,25 +307,25 @@ WOK
                 when 6; x.heading_body6
                 end
               else
-                if dob.is =='verse'
+                if dob.is ==:verse
                   poem_structure(dob)
-                elsif dob.is =='group'
+                elsif dob.is ==:group
                   group_structure(dob)
-                elsif dob.is =='block'
+                elsif dob.is ==:block
                   block_structure(dob)
-                elsif dob.is =='code'
+                elsif dob.is ==:code
                   code_structure(dob)
-                elsif dob.is =='table'
+                elsif dob.is ==:table
                   table_structure(dob)
-                elsif dob.is =='para' \
+                elsif dob.is ==:para \
                 and dob.indent.to_s =~/[1-9]/ \
                 and dob.bullet_==true
                   xml_structure(dob,"indent_bullet#{dob.indent}")
-                elsif dob.is =='para' \
+                elsif dob.is ==:para \
                 and dob.indent.to_s =~/[1-9]/ \
                 and dob.indent == dob.hang
                   xml_structure(dob,"indent#{dob.indent}")
-                elsif dob.is=='para' \
+                elsif dob.is==:para \
                 and dob.hang.to_s =~/[0-9]/ \
                 and dob.indent != dob.hang
                   xml_structure(dob,"hang#{dob.hang.to_s}_indent#{dob.indent.to_s}")
-- 
cgit v1.2.3