From 8138e2301b94ad697109c9e00da24710840b94c6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 14 Feb 2012 20:33:26 -0500
Subject: v3dv: sysenv, output_dir_structure, rewritten, affected code modified

---
 lib/sisu/v3dv/sysenv.rb | 68 ++++++++++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 41 deletions(-)

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

diff --git a/lib/sisu/v3dv/sysenv.rb b/lib/sisu/v3dv/sysenv.rb
index 1b1a5857..7374d88f 100644
--- a/lib/sisu/v3dv/sysenv.rb
+++ b/lib/sisu/v3dv/sysenv.rb
@@ -405,56 +405,42 @@ module SiSU_Env
       @fnn,@fnb,@fnt,@flv,@fnz=@@fnn,@@fnb,@@fnt,@@flv,@@fnz
     end
     def output_dir_structure
-      def by_language_code?
-        x=if defined? @rc['output_dir_structure_by'] \
-        and @rc['output_dir_structure_by'] =~/language/
-          true
-        elsif defined? @rc['output_structure']['by_language'] \
-        and @rc['output_structure']['by_language'] ==true
-          true
-        else false
+      def by?
+        output_structure=:filename #set default output structure
+        output_structure=if defined? @rc['output_dir_structure_by']
+          output_structure=if (@rc['output_dir_structure_by'] =~/language/) \
+          or ((defined? @rc['output_structure']['by_language']) \
+          && @rc['output_structure']['by_language'] ==true)
+            :language
+          elsif (@rc['output_dir_structure_by'] =~/filetype/) \
+          or ((defined? @rc['output_structure']['by_filetype']) \
+          && @rc['output_structure']['by_filetype'] ==true)
+            :filetype
+          elsif (@rc['output_dir_structure_by'] =~/filename/) \
+          or ((defined? @rc['output_structure']['by_filename']) \
+          && @rc['output_structure']['by_filename'] ==true)
+            :filename
+          end
         end
       end
+      def by_language_code?
+        ((by?) ==:language) \
+        ? true \
+        : false
+      end
       def by_filetype?
-        x=if by_language_code?
-          false
-        elsif defined? @rc['output_dir_structure_by'] \
-        and @rc['output_dir_structure_by'] =~/filetype/
-          true
-        elsif defined? @rc['output_structure']['by_filetype'] \
-        and @rc['output_structure']['by_filetype'] ==true
-          true
-        else false
-        end
+        ((by?) ==:filetype) \
+        ? true \
+        : false
       end
       def by_filename?
-        x=if by_language_code?
-          false
-        elsif by_filetype?
-          false
-        elsif defined? @rc['output_dir_structure_by'] \
-        and @rc['output_dir_structure_by'] =~/filename/
-          true
-        elsif defined? @rc['output_structure']['by_filename'] \
-        and @rc['output_structure']['by_filename'] ==true
-          true
-        else true
-        end
+        ((by?) ==:filename) \
+        ? true \
+        : false
       end
       def multilingual?
         by_language_code?
       end
-      def by?
-        by=if by_language_code?
-          'language'
-        elsif by_filetype?
-          'filetype'
-        elsif by_filename?
-          'filename'
-        else
-          'filename'
-        end
-      end
       self
     end
     def document_language_versions_found #REVISIT
-- 
cgit v1.2.3


From 2b884fb73428186df29bf22ff38d77e5d2f823cf Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 14 Feb 2012 21:10:19 -0500
Subject: v3dv: --redirect (--redirect=dir_path) & --dump (--dump=dir_path) +
 consequences

* --dump places output in directory specified, if none specified in the current
  directory (pwd).
* --redirect places output in subdirectory under specified directory,
  subdirectory uses the filename (without the suffix). If no output directory is
  specified places the subdirectory under the current directory (pwd).
* html, css incorporated into each file (concordance & manifest included)
* html, xhtml & xmls, css copied into css subdirectory (not used by html as
  embedded)
* html xmls, images copied to output directory
* no links to manifest
* manifest with relative links only
* longer html filenames given to avoid names clashing (e.g. for toc, manifest,
  concordance)
* html, epub, remove manifest toc links
* -j copy images associated with file (images used by html & xmls)
  * automatically invoked by --dump & redirect
* v3 v3dv: document --redirect, --dump, -j update sisu_commands.sst
  [documents not generated until v3.2.0 (when v3dv branch is merged into v3)]
---
 lib/sisu/v3dv/sysenv.rb | 310 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 212 insertions(+), 98 deletions(-)

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

diff --git a/lib/sisu/v3dv/sysenv.rb b/lib/sisu/v3dv/sysenv.rb
index 7374d88f..b305dfb7 100644
--- a/lib/sisu/v3dv/sysenv.rb
+++ b/lib/sisu/v3dv/sysenv.rb
@@ -408,7 +408,15 @@ module SiSU_Env
       def by?
         output_structure=:filename #set default output structure
         output_structure=if defined? @rc['output_dir_structure_by']
-          output_structure=if (@rc['output_dir_structure_by'] =~/language/) \
+          output_structure=if (@rc['output_dir_structure_by'] =~/dump/) \
+          or ((defined? @rc['output_structure']['dump']) \
+          && @rc['output_structure']['dump'] ==true)
+            :dump
+          elsif (@rc['output_dir_structure_by'] =~/redirect/) \
+          or ((defined? @rc['output_structure']['redirect']) \
+          && @rc['output_structure']['redirect'] ==true)
+            :redirect
+          elsif (@rc['output_dir_structure_by'] =~/language/) \
           or ((defined? @rc['output_structure']['by_language']) \
           && @rc['output_structure']['by_language'] ==true)
             :language
@@ -420,9 +428,21 @@ module SiSU_Env
           or ((defined? @rc['output_structure']['by_filename']) \
           && @rc['output_structure']['by_filename'] ==true)
             :filename
+          else #recheck current default
+            :language
           end
         end
       end
+      def dump?
+        ((by?) ==:dump) \
+        ? true \
+        : false
+      end
+      def redirect?
+        ((by?) ==:redirect) \
+        ? true \
+        : false
+      end
       def by_language_code?
         ((by?) ==:language) \
         ? true \
@@ -1568,7 +1588,12 @@ WOK
         end
       end
       def default_output_css
-        if @env.output_dir_structure.by_language_code?
+        if (@md.opt.opt_act[:dump][:bool] \
+        &&  @md.opt.opt_act[:dump][:inst]) \
+        || (@md.opt.opt_act[:redirect][:bool] \
+        &&  @md.opt.opt_act[:redirect][:inst])
+          './'
+        elsif @env.output_dir_structure.by_language_code?
           '../../'
         elsif @env.output_dir_structure.by_filetype?
           '../'
@@ -1664,7 +1689,14 @@ WOK
         defaults[:sisu_share]
       end
       def style
-        defaults[:stylesheet_stub]
+        if (@md.opt.opt_act[:dump][:bool] \
+        &&  @md.opt.opt_act[:dump][:inst]) \
+        || (@md.opt.opt_act[:redirect][:bool] \
+        &&  @md.opt.opt_act[:redirect][:inst])
+          'css'
+        else
+         defaults[:stylesheet_stub]
+        end
       end
       def sample_data                                                          #sample data repository source directory
         defaults[:sample_data_path]
@@ -3312,14 +3344,10 @@ WOK
       end
     end
   end
-  class FileOp <InfoFile                                                    #todo unify with CreateFile
-    def initialize(md,fno='')
-      begin
-        @md,@fno=md,fno
-        @env=SiSU_Env::InfoEnv.new(@md.fns)
-      rescue; STDERR.puts SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue
-      ensure
-      end
+  class OutputStructure
+    def initialize(md)
+      @md=md
+      @env=SiSU_Env::InfoEnv.new(@md.fns)
     end
     def output_dir_structure
       def by_language_code?
@@ -3332,11 +3360,57 @@ WOK
         @env.output_dir_structure.by_filename?
       end
       def multilingual?
-        @env.output_dir_structure.by_language_code?
-        #by_language_code?
+        by_language_code?
+      end
+      def dump?
+        ((@md.opt.opt_act[:dump][:bool] \
+        &&  @md.opt.opt_act[:dump][:inst]) \
+        || (@env.output_dir_structure.dump?)) \
+        ? true \
+        : false
+      end
+      def redirect?
+        ((@md.opt.opt_act[:redirect][:bool] \
+        &&  @md.opt.opt_act[:redirect][:inst]) \
+        || (@env.output_dir_structure.redirect?)) \
+        ? true \
+        : false
+      end
+      def dump_or_redirect?
+        ((dump?) || (redirect?)) \
+        ? true \
+        : false
+      end
+      def by?
+        if dump?
+          :dump
+        elsif redirect?
+          :redirect
+        elsif by_language_code?
+          :language
+        elsif by_filetype?
+          :filetype
+        elsif by_filename?
+          :filename
+        else #recheck current default
+          :language
+        end
       end
       self
     end
+  end
+  class FileOp <InfoFile                                                    #todo unify with CreateFile
+    def initialize(md,fno='')
+      begin
+        @md,@fno=md,fno
+        @env=SiSU_Env::InfoEnv.new(@md.fns)
+      rescue; STDERR.puts SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue
+      ensure
+      end
+    end
+    def output_dir_structure
+      OutputStructure.new(@md).output_dir_structure
+    end
     def mkdir_initialize                                                       # not used but consider using
       FileUtils::mkdir_p(output_path.base.dir) unless FileTest.directory?(output_path.base.dir)
       FileUtils::mkdir_p("#{output_path.base.dir}/#{@md.fnb}") unless FileTest.directory?("#{output_path.base.dir}/#{@md.fnb}")
@@ -3386,8 +3460,9 @@ WOK
         @@filename_html_scroll=File.new(p_fn,'w+')
       end
       def html_seg_index
-        pth=(by_filename?) \
-        ? "#{output_path.html.dir}"
+        pth=((by_filename?) \
+          || (output_dir_structure.dump?)) \
+        ? "#{output_path.html.dir}" \
         : "#{output_path.html.dir}/#{@md.fnb}"
         fn=base_filename.html_seg_index
         make_path(pth)
@@ -3395,8 +3470,9 @@ WOK
         @@filename_html_index=File.new(p_fn,'w+')
       end
       def html_segtoc
-        pth=(by_filename?) \
-        ? "#{output_path.html.dir}"
+        pth=((by_filename?) \
+          || (output_dir_structure.dump?)) \
+        ? "#{output_path.html.dir}" \
         : "#{output_path.html.dir}/#{@md.fnb}"
         fn=base_filename.html_segtoc
         make_path(pth)
@@ -3705,9 +3781,9 @@ WOK
     def base_filename
       def txt
         ft='.txt'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else
           'plain' + @md.lang_code_insert + ft
@@ -3715,9 +3791,9 @@ WOK
       end
       def html_scroll
         ft='.html'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else
           'scroll' + @md.lang_code_insert + ft
@@ -3725,7 +3801,7 @@ WOK
       end
       def html_seg_index
         ft='.html'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           'index' + ft
         else
           'index' + @md.lang_code_insert + ft
@@ -3733,7 +3809,9 @@ WOK
       end
       def html_segtoc
         ft='.html'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.dump_or_redirect?
+          @md.fnb + '.toc' + ft
+        elsif output_dir_structure.by_language_code?
           'toc' + ft
         else
           'toc' + @md.lang_code_insert + ft
@@ -3741,7 +3819,7 @@ WOK
       end
       def html_book_index
         ft='.html'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           'book_index' + ft
         else
           'book_index' + @md.lang_code_insert + ft
@@ -3749,7 +3827,9 @@ WOK
       end
       def html_concordance
         ft='.html'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.dump_or_redirect?
+          @md.fnb + '.concordance' + ft
+        elsif output_dir_structure.by_language_code?
           'concordance' + ft
         else
           'concordance' + @md.lang_code_insert + ft
@@ -3757,9 +3837,9 @@ WOK
       end
       def xhtml
         ft= '.xhtml'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else
           'scroll' + @md.lang_code_insert + ft
@@ -3767,7 +3847,7 @@ WOK
       end
       def epub
         ft='.epub'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
         else
           @md.fnb + @md.lang_code_insert + ft
@@ -3775,9 +3855,9 @@ WOK
       end
       def odt
         ft='.odt'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else
           'opendocument' + @md.lang_code_insert + ft
@@ -3785,9 +3865,9 @@ WOK
       end
       def xml_sax
         ft='.sax.xml'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else
           'scroll' + @md.lang_code_insert + ft
@@ -3795,22 +3875,22 @@ WOK
       end
       def xml_dom
         ft='.dom.xml'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else
           'scroll' + @md.lang_code_insert + ft
         end
       end
       def pdf_p
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + '.portrait.'
         else 'portrait' + @md.lang_code_insert + '.'
         end
       end
       def pdf_l
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + '.landscape.'
         else 'landscape' + @md.lang_code_insert + '.'
         end
@@ -3847,7 +3927,7 @@ WOK
       end
       def manpage
         ft='1'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + '.' + ft
         else
           @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft
@@ -3855,7 +3935,7 @@ WOK
       end
       def info
         ft='info'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + '.' + ft
         else
           @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft
@@ -3863,7 +3943,7 @@ WOK
       end
       def texinfo
         ft='texinfo'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + '.' + ft
         else
           @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft
@@ -3871,9 +3951,9 @@ WOK
       end
       def hash_digest
         ft='.txt'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + '.hash_digest' + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else
           'digest' + @md.lang_code_insert + ft
@@ -3881,9 +3961,9 @@ WOK
       end
       def sitemap
         ft='.xml'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + '.sitemap' + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else
           'sitemap' + @md.lang_code_insert + ft
@@ -3891,9 +3971,9 @@ WOK
       end
       def qrcode_title
         ft='.title.png'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else #fix
           'sisu_manifest' + @md.lang_code_insert + ft
@@ -3901,9 +3981,9 @@ WOK
       end
       def qrcode_md
         ft='.md.png'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else #fix
           'sisu_manifest' + @md.lang_code_insert + ft
@@ -3911,9 +3991,9 @@ WOK
       end
       def manifest_txt
         ft='.txt'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else #fix
           'sisu_manifest' + @md.lang_code_insert + ft
@@ -3921,9 +4001,11 @@ WOK
       end
       def manifest
         ft='.html'
-        if @env.output_dir_structure.by_language_code?
+        if output_dir_structure.dump_or_redirect?
+          @md.fnb + '.manifest' + ft
+        elsif output_dir_structure.by_language_code?
           @md.fnb + ft
-        elsif @env.output_dir_structure.by_filetype?
+        elsif output_dir_structure.by_filetype?
           @md.fnb + @md.lang_code_insert + ft
         else #fix
           'sisu_manifest' + @md.lang_code_insert + ft
@@ -3953,52 +4035,70 @@ WOK
       @ft=ft
       def dir
         def abc
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.redirect?
+            "#{@md.opt.opt_act[:redirect][:inst]}/#{@md.fnb}"
+          elsif output_dir_structure.dump?
+            @md.opt.opt_act[:dump][:inst]
+          elsif output_dir_structure.by_language_code?
             "#{output_path.base.dir}/#{@md.opt.lng}/#{@ft}"
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             "#{output_path.base.dir}/#{@ft}"
           else
             "#{output_path.base.dir}/#{@md.fnb}"
           end
         end
         def ab
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.redirect?
+            "#{@md.opt.opt_act[:redirect][:inst]}/#{@md.fnb}"
+          elsif output_dir_structure.dump?
+            @md.opt.opt_act[:dump][:inst]
+          elsif output_dir_structure.by_language_code?
             "#{output_path.base.dir}/#{@md.opt.lng}/#{@ft}"
           else
             "#{output_path.base.dir}/#{@ft}"
           end
         end
         def ab_src
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.redirect?
+            "#{@md.opt.opt_act[:redirect][:inst]}/#{@md.fnb}"
+          elsif output_dir_structure.dump?
+            @md.opt.opt_act[:dump][:inst]
+          elsif output_dir_structure.by_language_code?
             "#{output_path.base.dir}/#{@ft}/#{@md.opt.lng}"
           else
             "#{output_path.base.dir}/#{@ft}"
           end
         end
         def ab_pod
-          "#{output_path.base.dir}/#{@ft}"
+          if output_dir_structure.redirect?
+            "#{@md.opt.opt_act[:redirect][:inst]}/#{@md.fnb}"
+          elsif output_dir_structure.dump?
+            @md.opt.opt_act[:dump][:inst]
+          else
+            "#{output_path.base.dir}/#{@ft}"
+          end
         end
         self
       end
       def url
         def abc
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{output_path.base.url}/#{@md.opt.lng}/#{@ft}"
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             "#{output_path.base.url}/#{@ft}"
           else
             "#{output_path.base.url}/#{@md.fnb}"
           end
         end
         def ab
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{output_path.base.url}/#{@md.opt.lng}/#{@ft}"
           else
             "#{output_path.base.url}/#{@ft}"
           end
         end
         def ab_src
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{output_path.base.url}/#{@ft}/#{@md.opt.lng}"
           else
             "#{output_path.base.url}/#{@ft}"
@@ -4011,30 +4111,32 @@ WOK
       end
       def rel
         def abc
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{@md.opt.lng}/#{@ft}"
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             "#{@ft}"
           else
             "#{@md.fnb}"
           end
         end
         def ab
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{@md.opt.lng}/#{@ft}"
           else
             "#{@ft}"
           end
         end
         def ab_src
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.dump_or_redirect?
+            "."
+          elsif output_dir_structure.by_language_code?
             "#{@ft}/#{@md.opt.lng}"
           else
             "#{@ft}"
           end
         end
         def ab_pod
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{@ft}"
           else
             "#{@ft}"
@@ -4044,30 +4146,36 @@ WOK
       end
       def rel_sm
         def abc
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{@md.opt.lng}/#{@ft}"
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             "#{@ft}"
           else
             "#{@md.fnb}"
           end
         end
         def ab
-          if @env.output_dir_structure.by_language_code?
-            "#{@md.opt.lng}/#{@ft}"
-          else
-            "#{@ft}"
+          if output_dir_structure.dump_or_redirect?
+            '.'
+          elsif output_dir_structure.by_language_code? \
+          or output_dir_structure.by_filetype?
+            '../' + @ft
+          else '.'
           end
         end
         def ab_src
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.dump_or_redirect?
+            '.'
+          elsif output_dir_structure.by_language_code?
             "#{@ft}/#{@md.opt.lng}"
           else
             "#{@ft}"
           end
         end
         def ab_pod
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.dump_or_redirect?
+            '.'
+          elsif output_dir_structure.by_language_code?
             "../../#{@ft}/#{@md.opt.lng}"
           else
             "../#{@ft}"
@@ -4077,16 +4185,16 @@ WOK
       end
       def rcp
         def abc
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{output_path.stub.rcp}/#{@md.opt.lng}/#{@ft}"
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             "#{output_path.stub.rcp}/#{@ft}"
           else
             "#{output_path.stub.rcp}/#{@md.fnb}"
           end
         end
         def ab
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             "#{output_path.stub.rcp}/#{@md.opt.lng}/#{@ft}"
           else
             "#{output_path.stub.rcp}/#{@ft}"
@@ -4094,16 +4202,6 @@ WOK
         end
         self
       end
-      def rel_sm
-        def ab
-          if @env.output_dir_structure.by_language_code? \
-          or @env.output_dir_structure.by_filetype?
-            '../' + @ft
-          else '.'
-          end
-        end
-        self
-      end
       self
     end
     def output_path
@@ -4137,9 +4235,18 @@ WOK
         end
         self
       end
+      def webserver_path
+        if output_dir_structure.dump?
+          @md.opt.opt_act[:dump][:inst]
+        elsif output_dir_structure.redirect?
+          @md.opt.opt_act[:redirect][:inst]
+        else
+          "#{@env.path.webserv}"
+        end
+      end
       def base
         def dir
-          "#{@env.path.webserv}/#{@md.opt.f_pth[:pth_stub]}"
+          "#{webserver_path}/#{@md.opt.f_pth[:pth_stub]}"
         end
         def url
           "#{@env.url.webserv}/#{@md.opt.f_pth[:pth_stub]}"
@@ -4299,9 +4406,11 @@ WOK
           set_path(ft).rel_sm.ab
         end
         def rel_image
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.dump_or_redirect?
+            './image'
+          elsif output_dir_structure.by_language_code?
             '../../_sisu/image'
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             '../_sisu/image'
           else
             '../_sisu/image'
@@ -4329,9 +4438,11 @@ WOK
           set_path(ft).rel_sm.ab
         end
         def rel_image
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.dump_or_redirect?
+            './image'
+          elsif output_dir_structure.by_language_code?
             '../../../_sisu/image'
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             '../../_sisu/image'
           else
             '../_sisu/image'
@@ -4363,9 +4474,9 @@ WOK
           set_path(ft).rel_sm.ab
         end
         def rel_image
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             '../../_sisu/image'
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             '../_sisu/image'
           else
             '../_sisu/image'
@@ -4550,6 +4661,9 @@ WOK
         def rcp
           set_path(ft).rcp.abc
         end
+        def rel_sm
+          set_path(ft).rel_sm.ab
+        end
         self
       end
       def harvest
@@ -4569,9 +4683,9 @@ WOK
           set_path(ft).rcp.ab
         end
         def rel_sm
-          if @env.output_dir_structure.by_language_code?
+          if output_dir_structure.by_language_code?
             ''
-          elsif @env.output_dir_structure.by_filetype?
+          elsif output_dir_structure.by_filetype?
             ''
           else
             ''
@@ -5031,7 +5145,7 @@ WOK
   class CSS_Select < InfoEnv
     def initialize(md)
       @md=md
-      @env=SiSU_Env::InfoEnv.new
+      @env=SiSU_Env::InfoEnv.new('',@md)
     end
     def html
       css=if @md.doc_css \
@@ -5101,7 +5215,7 @@ WOK
     def initialize(md)
       @md=md
       @css=SiSU_Env::CSS_Select.new(@md)
-      @env=SiSU_Env::InfoEnv.new
+      @env=SiSU_Env::InfoEnv.new('',@md)
       @file=SiSU_Env::FileOp.new(@md)
     end
     def html
@@ -5189,7 +5303,7 @@ WOK
     def cp_external_images
       src="#{@env.processing_path.processing}/external_document/image"
       dest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external"
-      if FileTest.directory?(src) 
+      if FileTest.directory?(src)
         cp_images(src,dest)
       end
     end
-- 
cgit v1.2.3


From 6d898f1eb74160fbc7d6365b3ad8d6b9417d2f19 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 14 Feb 2012 21:32:53 -0500
Subject: v3dv: control hooks

* hooks to make it possible to control (via: the command line; the document
  markup header, or; the command line) the likes of: toc, manifest,
  manifest-links, metadata, html-minitoc, html-navigation, html-navigation-bar;
  these are switched on by default and control takes the form of making it
  possible to switch them off.
---
 lib/sisu/v3dv/sysenv.rb | 221 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 221 insertions(+)

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

diff --git a/lib/sisu/v3dv/sysenv.rb b/lib/sisu/v3dv/sysenv.rb
index b305dfb7..fcfc234b 100644
--- a/lib/sisu/v3dv/sysenv.rb
+++ b/lib/sisu/v3dv/sysenv.rb
@@ -1199,6 +1199,129 @@ module SiSU_Env
       else false
       end
     end
+    def manifest_minitoc?
+      flag=if (defined? @rc['manifest']['minitoc'] \
+      and not @rc['manifest']['minitoc'].nil?)
+        @rc['manifest']['minitoc']
+      else false
+      end
+    end
+    def build
+      def omit_list
+        @off_list ||=if (defined? @rc['omit_list'] \
+        and not @rc['omit_list'].nil?)
+          @rc['omit_list']
+        elsif (defined? @rc['omit']['list'] \
+        and not @rc['omit']['list'].nil?)
+          @rc['omit']['list']
+        else
+          nil
+        end
+      end
+      def listed?(test) #fix
+        listed=if omit_list
+          x=(omit_list.scan(/\b#{test}\b/)).join
+          test==x \
+          ? true \
+          : false
+        else
+          false
+        end
+        listed
+      end
+      def ocn?
+        flag=if (defined? @rc['omit']['ocn'] \
+        and not @rc['omit']['ocn'].nil?) \
+        or listed?('ocn')
+          false
+        else
+          true
+        end
+      end
+      def toc?
+        flag=if (defined? @rc['omit']['toc'] \
+        and not @rc['omit']['toc'].nil?) \
+        or listed?('toc')
+          false
+        else
+          true
+        end
+      end
+      def manifest?
+        flag=if (defined? @rc['omit']['manifest'] \
+        and not @rc['omit']['manifest'].nil?) \
+        or listed?('manifest')
+          false
+        else
+          true
+        end
+      end
+      def manifest_links?
+        flag=if (defined? @rc['omit']['manifest_links'] \
+        and not @rc['omit']['manifest_links'].nil?) \
+        or listed?('manifest_links')
+          false
+        else
+          true
+        end
+      end
+      def manifest_minitoc?
+        flag=if (defined? @rc['omit']['manifest_minitoc'] \
+        and not @rc['omit']['manifest_minitoc'].nil?) \
+        or listed?('manifest_minitoc')
+          false
+        else
+          true
+        end
+      end
+      def html_minitoc?
+        flag=if (defined? @rc['omit']['html_minitoc'] \
+        and not @rc['omit']['html_minitoc'].nil?) \
+        or (listed?('html_minitoc') \
+        || listed?('minitoc'))
+          false
+        else
+          true
+        end
+      end
+      def html_navigation?
+        flag=if (defined? @rc['omit']['html_navigation'] \
+        and not @rc['omit']['html_navigation'].nil?) \
+        or listed?('html_navigation')
+          false
+        else
+          true
+        end
+      end
+      def html_navigation_bar?
+        flag=if (defined? @rc['omit']['html_navigation_bar'] \
+        and not @rc['omit']['html_navigation_bar'].nil?) \
+        or listed?('html_navigation_bar')
+          false
+        else
+          true
+        end
+      end
+      def html_search_form?
+        flag=if (defined? @rc['omit']['html_search_form'] \
+        and not @rc['omit']['html_search_form'].nil?) \
+        or listed?('html_search_form')
+          false
+        else
+          true
+        end
+      end
+      def html_right_column?
+        flag=if (defined? @rc['omit']['html_right_column'] \
+        and not @rc['omit']['html_right_column'].nil?) \
+        or listed?('html_right_column')
+          false
+        else
+          true
+        end
+      end
+      self
+    end
     def odt_ocn?
       ((defined? @rc['odt']['ocn']) \
       && @rc['odt']['ocn']==true) \
@@ -4826,6 +4949,104 @@ WOK
       self
     end
   end
+  class InfoSet #<InfoEnv
+    def initialize(md)
+      @md=md
+      @env=SiSU_Env::InfoEnv.new(md.fns)
+    end
+    def heading_omit_list
+      @md.make.omit_list
+    end
+    def not_heading_make_omit_listed?(test) #fix
+      listed=if heading_omit_list
+        x=(heading_omit_list.scan(/\b#{test}\b/)).join
+        test==x \
+        ? false \
+        : true
+      else
+        true
+      end
+      listed
+    end
+    def ocn?
+      @md.opt.opt_act[:ocn][:bool] \
+      && (@env.build.ocn?) \
+      ? true \
+      : false
+    end
+    def toc?
+      @md.opt.opt_act[:toc][:bool] \
+      && (not_heading_make_omit_listed?('ocn')) \
+      && (@env.build.toc?) \
+      ? true \
+      : false
+    end
+    def manifest?
+      @md.opt.opt_act[:manifest][:bool] \
+      && (not_heading_make_omit_listed?('manifest')) \
+      && (@env.build.manifest?) \
+      ? true \
+      : false
+    end
+    def manifest_links?
+      @md.opt.opt_act[:manifest_links][:bool] \
+      && (not_heading_make_omit_listed?('manifest_links')) \
+      && (@env.build.manifest_links?) \
+      ? true \
+      : false
+    end
+    def manifest_minitoc?
+      @md.opt.opt_act[:manifest_minitoc][:bool] \
+      && (not_heading_make_omit_listed?('manifest_minitoc')) \
+      && (@env.build.manifest_minitoc?) \
+      ? true \
+      : false
+    end
+    def metadata?
+      @md.opt.opt_act[:metadata][:bool] \
+      && (not_heading_make_omit_listed?('metadata')) \
+      && (@env.build.metadata?) \
+      ? true \
+      : false
+    end
+    def html_minitoc?
+      @md.opt.opt_act[:html_minitoc][:bool] \
+      && ((not_heading_make_omit_listed?('html_minitoc')) \
+      || (not_heading_make_omit_listed?('minitoc'))) \
+      && (@env.build.html_minitoc?) \
+      ? true \
+      : false
+    end
+    def html_navigation?
+      @md.opt.opt_act[:html_navigation][:bool] \
+      && (not_heading_make_omit_listed?('html_navigation')) \
+      && (@env.build.html_navigation?) \
+      ? true \
+      : false
+    end
+    def html_navigation_bar?
+      @md.opt.opt_act[:html_navigation_bar][:bool] \
+      && (not_heading_make_omit_listed?('html_navigation_bar')) \
+      && (@env.build.html_navigation_bar?) \
+      ? true \
+      : false
+    end
+    def html_search_form?
+      @md.opt.opt_act[:html_search_form][:bool] \
+      && (not_heading_make_omit_listed?('html_search_form')) \
+      && (@env.build.html_search_form?) \
+      ? true \
+      : false
+    end
+    def html_right_column?
+      @md.opt.opt_act[:html_right_column][:bool] \
+      && ((not_heading_make_omit_listed?('html_right_column')) \
+      || (not_heading_make_omit_listed?('html_promo'))) \
+      && (@env.build.html_right_column?) \
+      ? true \
+      : false
+    end
+  end
   class CreateFile <InfoEnv                                                  #todo unify with FileOp
     def initialize(fns)
       begin
-- 
cgit v1.2.3