From 6811ac91f21a434fc7d967c11e1b20f33918c6ea Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 19 Mar 2012 22:07:29 -0400
Subject: v3: 3.2 branch is main (v3dv --> v3); dev (v3dv) branch directories
 removed

* v3dv (3.2) "merged" into v3 (previously 3.1) (& removed)
  * conf/sisu/v3dv --> conf/sisu/v3
  * data/sisu/v3dv --> data/sisu/v3
  * lib/sisu/v3dv  --> lib/sisu/v3
  * bin/sisu* (v3dv references changed to v3)
  * (--dev modifier (superfluous for the time being) runs main v3 branch)
---
 lib/sisu/v3/dal_expand_insertions.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/sisu/v3/dal_expand_insertions.rb')

diff --git a/lib/sisu/v3/dal_expand_insertions.rb b/lib/sisu/v3/dal_expand_insertions.rb
index e48acd47..ef25fcdd 100644
--- a/lib/sisu/v3/dal_expand_insertions.rb
+++ b/lib/sisu/v3/dal_expand_insertions.rb
@@ -56,13 +56,13 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_insertions
+module SiSU_DAL_Insertions
   class Insertions
     def initialize(md,data)
       @md,@data=md,data
     end
     def output_filetypes_in_cmd(cmd_shortcut,lnk=nil) #make list of file types in shortcut command (as configured), e.g. when sisu -3 is used
-      cf_defaults=SiSU_Env::Info_processing_flag.new
+      cf_defaults=SiSU_Env::InfoProcessingFlag.new
       cmd_list=case cmd_shortcut.inspect
       when /0/; cf_defaults.cf_0
       when /1/; cf_defaults.cf_1
@@ -141,7 +141,7 @@ module SiSU_insertions
       def xml_dom
         "#{@base_path}/xml/#{@linked_doc}.xml"
       end
-      def txt 
+      def txt
         "#{@base_path}/txt/#{@linked_doc}.txt"
       end
       def digest
@@ -241,7 +241,7 @@ module SiSU_insertions
       def xml_dom
         "#{@base_path}/scroll.#{@lng}.dom.xml"
       end
-      def txt 
+      def txt
         "#{@base_path}/plain.#{@lng}.txt"
       end
       def digest
@@ -270,17 +270,17 @@ module SiSU_insertions
         and not codeblock_ \
         and para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/
           txt,cmd,source,linked_doc,note,manifest=nil,nil,nil,nil,nil,nil
-          @u=SiSU_Env::Info_env.new.url
+          @u=SiSU_Env::InfoEnv.new.url
           pre=txt=cmd=source=linked_doc=note=''
           if defined? @u.remote
             if /(?<pre>.+?)\{(?<txt>.+?)\s\[(?<cmd>\d[sS]*)\]\}(?<source>(?<linked_doc>\S+?)\.ss[tm]\b)(?<note>.*)/m =~ para
-              pre.strip!
+              pre=pre.strip
             elsif /\{(?<txt>.+?)\s\[(?<cmd>\d[sS]*)\]\}(?<source>(?<linked_doc>\S+?)\.ss[tm]\b)(?<note>.*)/m =~ para
             end
-            if linked_doc =~ /(\S+?)\/(\S+)/ 
+            if linked_doc =~ /(\S+?)\/(\S+)/
               linked_doc,linked_doc_lang=$1,$2
             else
-              linked_doc,linked_doc_lang=linked_doc,@md.opt.lng_base 
+              linked_doc,linked_doc_lang=linked_doc,@md.opt.lng_base
             end
           else
             puts "error, does currently support relative paths (reltive paths were removed, as had problems for citation, and was not suited to all output types should possibly reconsider) #{__FILE__} #{__LINE__}"
@@ -289,7 +289,7 @@ module SiSU_insertions
           end
           lnk={}
           case @md.opt.dir_structure_by
-          when /language/
+          when :language
             lnk={
               manifest:         by_language(linked_doc,linked_doc_lang).manifest,
               html_toc:         by_language(linked_doc,linked_doc_lang).html_toc,
@@ -307,7 +307,7 @@ module SiSU_insertions
               sisupod:          by_language(linked_doc,linked_doc_lang,source).sisupod,
               source:           by_language(linked_doc,linked_doc_lang,source).source,
             }
-          when /filetype/
+          when :filetype
             lnk={
               manifest:         by_filetype(linked_doc,linked_doc_lang).manifest,
               html_toc:         by_filetype(linked_doc,linked_doc_lang).html_toc,
-- 
cgit v1.2.3