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/defaults.rb | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/lib/sisu/v3/defaults.rb b/lib/sisu/v3/defaults.rb
index 7278c5f9..e74ff83c 100644
--- a/lib/sisu/v3/defaults.rb
+++ b/lib/sisu/v3/defaults.rb
@@ -66,9 +66,9 @@ module SiSU_Viz
   class Skin
     def initialize
       @fonts='verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman' # 'verdana, arial, georgia, tahoma, sans-serif, helvetica, "times new roman", times, roman'
-      @dir=SiSU_Env::Info_env.new
-      @date=SiSU_Env::Info_date.new #{@date.year}
-      @v=SiSU_Env::Info_version.instance.get_version
+      @dir=SiSU_Env::InfoEnv.new
+      @date=SiSU_Env::InfoDate.new #{@date.year}
+      @v=SiSU_Env::InfoVersion.instance.get_version
     end
     #% glyph
     def glyph_bullet # &bullet;
@@ -735,8 +735,8 @@ module SiSU_Viz
           when /\/i$/; 'i'
           else         ''
           end
-          r.gsub!(/^\/(.+?)\/i?/,'\1')
-          r.gsub!(/\(/,'(?:') # avoid need to escape use of brackets within regex provided
+          r=r.gsub(/^\/(.+?)\/i?/,'\1').
+            gsub(/\(/,'(?:') # avoid need to escape use of brackets within regex provided
           m='\b(' + r + ')\b'
           make[:str]
           make[:regx]=if x =~/i/; /#{m}/i
@@ -756,8 +756,8 @@ module SiSU_Viz
           when /\/i$/; 'i'
           else         ''
           end
-          r.gsub!(/^\/(.+?)\/i?/,'\1')
-          r.gsub!(/\(/,'(?:') # avoid need to escape use of brackets within regex provided
+          r.gsub(/^\/(.+?)\/i?/,'\1').
+            gsub(/\(/,'(?:') # avoid need to escape use of brackets within regex provided
           m='\b(' + r + ')\b'
           make[:str]
           make[:regx]=if x =~/i/; /#{m}/i
@@ -957,7 +957,7 @@ module SiSU_Viz
     </a>}
     end
     def png_hp
-      dir=SiSU_Env::Info_env.new #(@fns)
+      dir=SiSU_Env::InfoEnv.new #(@fns)
       %{  <a href="#{url.site}">
       <img border="0" width="160" height="60" src="#{@dir.url.images_local}/#{icon_home_banner}" alt="#{txt_home}" />
     </a>}
@@ -1029,7 +1029,7 @@ module SiSU_Viz
       %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_external_toc}" alt="lateral hop" />}
     end
     def png_home
-      #dir=SiSU_Env::Info_env.new #(@fns)
+      #dir=SiSU_Env::InfoEnv.new #(@fns)
       %{<img border="0" src="#{url_path_image_base}/#{icon_home_button}" alt="#{txt_home} --&gt;" />}
       #%{<img border="0" src="#{dir.url.images_local}/#{icon_home_button}" alt="#{txt_home} --&gt;" />}
     end
@@ -1040,7 +1040,7 @@ module SiSU_Viz
     def png_book
       %{<img border="2" height="15" width="15" src="#{url_path_image_sys}/#{icon_book}" alt="Cameron May Books" />}
     end
-    #% png_nav
+    #% png_nav #not currently used
     def png_nav_home
     end
     def png_nav_toc
@@ -1724,9 +1724,9 @@ WOK
   end
   class Home < Skin
     def initialize
-      @v=SiSU_Env::Info_version.instance.get_version
-      @dir=SiSU_Env::Info_env.new
-      @date=SiSU_Env::Info_date.new #{@date.year}
+      @v=SiSU_Env::InfoVersion.instance.get_version
+      @dir=SiSU_Env::InfoEnv.new
+      @date=SiSU_Env::InfoDate.new #{@date.year}
     end
     def redirect
       <<WOK
@@ -1890,7 +1890,7 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, P
   ---
 </p>
 <p class="small">
-  License, SiSU is licensed under 
+  License, SiSU is licensed under
   <a href="http://www.gnu.org/licenses/gpl.html" target="_top">
     GPLv3 or later
   </a>
@@ -2032,7 +2032,7 @@ as a developers tool it is flexible and extensible
 </p>
 <br />
 <p class="small">
-<a href="http://www.sisudoc.org"><b>SiSU</b></a> at <a href="http://www.sisudoc.org">&lt;www.sisudoc.org&gt;</a> or <a href="http://www.jus.uio.no/sisu/">&lt;www.jus.uio.no/sisu/&gt;</a></p> 
+<a href="http://www.sisudoc.org"><b>SiSU</b></a> at <a href="http://www.sisudoc.org">&lt;www.sisudoc.org&gt;</a> or <a href="http://www.jus.uio.no/sisu/">&lt;www.jus.uio.no/sisu/&gt;</a></p>
 </div>
 <div id="column_right">
 <p class="tiny">
-- 
cgit v1.2.3