From 756caa5d09492586824354864be6a5c9fe244005 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 12 Mar 2012 18:45:04 -0400
Subject: v3dv: start using output control hooks

* for config file, document headers, & command line
* v3dv: sysenv, ProcessingSettings, start to use hooks to make it possible
  to control (via: the command line; the document markup header, or; the
  configuration file) the likes of: ocn, toc, segsubtoc, minitoc,
  links-to-manifest, search-form, html-navigation, html-navigation-bar,
  html-right-pane, html-top-band; these are switched on by default and may
  be switched off in omit lists within configuration file, the document
  markup header, or command line. The command line takes precedence & may
  switch on or off overriding settings within the document markup header or
  the sisu configuration file.
  * --inc- on by default, but if switched off in doc header or
    configuration, the command line --inc- has precedence; for each possible
    exclude configuration the --inc- switch that overrides configuration
    settings
  * --exc- == --no-; exclude/switch off feature (but --inc- include has
    precedence)
  * document header @build: :omit: [list output features to be omitted]
  * configuration (sisurc.yml) omit:
  exclude output feature, overrides configuration settings (omit --dev
  development branch modifier once merged back to main)
   --exc-ocn,                 html (seg, scroll), epub, xml, pdf
     sisu --dev --exc-ocn --html --epub --xml-sax --xml-dom --xhtml -v \
     filename.sst
   --exc-toc,                 html (scroll), epub, pdf
     sisu --dev --exc-toc --html --epub --pdf -v filename.sst
   --exc-segsubtoc            html (seg), epub
     sisu --dev --exc-segsubtoc --html --epub -v filename.sst
   --exc-minitoc,             html (seg), concordance, manifest
     sisu --dev --exc-minitoc --html --concordance -v filename.sst
   --exc-manifest-minitoc,    manifest
     sisu --dev --exc-manifest-minitoc --html -v filename.sst
   --exc-links_to_manifest, --exc-manifest-links,
                              html (seg, scroll)
     sisu --dev --exc-manifest-links --html -v filename.sst
   --exc-search-form,         html (seg, scroll), manifest
     sisu --dev --exc-search-form --html -v filename.sst
   --exc-html-minitoc,        html (seg), concordance
     sisu --dev --exc-html-minitoc --html --concordance -v filename.sst
   --exc-html-navigation,     html (seg, scroll)?
     sisu --dev --exc-html-navigation --html -v filename.sst
   --exc-html-navigation-bar, html (seg)
     sisu --dev --exc-html-navigation-bar --html -v filename.sst
   --exc-html-search-form,    html (seg, scroll)
     sisu --dev --exc-html-search-form --html -v filename.sst
   --exc-html-right-pane,     html (seg, scroll)
     sisu --dev --exc-html-right-pane --html -v filename.sst
   --exc-html-top-band,       html (seg, scroll), concordance (minitoc is
     forced on to provide seg navigation)
     sisu --dev --exc-html-top-band --html --concordance -v filename.sst
---
 lib/sisu/v3dv/shared_images.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/lib/sisu/v3dv/shared_images.rb b/lib/sisu/v3dv/shared_images.rb
index a61fdd38..1d398213 100644
--- a/lib/sisu/v3dv/shared_images.rb
+++ b/lib/sisu/v3dv/shared_images.rb
@@ -56,6 +56,7 @@
  ** Description: common file for xml generation
 =end
 module SiSU_Images
+  require_relative 'particulars'                        # particulars.rb
   class Source
     def initialize(opt)
       @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
@@ -68,7 +69,7 @@ module SiSU_Images
         @particulars=particulars
         @md=@particulars.md
         @env=@particulars.env
-        @o_str ||=SiSU_Env::OutputStructure.new(@md).output_dir_structure
+        @o_str ||=SiSU_Env::ProcessingSettings.new(@md).output_dir_structure
       end
       def songsheet
         images_set.select_sisu_base
@@ -97,11 +98,11 @@ module SiSU_Images
         def dest_path(image_type)
           pth=if image_type==:image_sys
             pth=(@o_str.dump_or_redirect?) \
-            ? "#{@md.file.output_path.html.dir}/image" \
+            ? "#{@md.file.output_path.html.dir}/image"
             : "#{@env.path.webserv}/_sisu/image_sys"
           elsif image_type==:image
             pth=(@o_str.dump_or_redirect?) \
-            ? "#{@md.file.output_path.html.dir}/image" \
+            ? "#{@md.file.output_path.html.dir}/image"
             : "#{@env.path.webserv}/_sisu/image"
           end
         end
-- 
cgit v1.2.3