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/xml_tables.rb | 54 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

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

diff --git a/lib/sisu/v3/xml_tables.rb b/lib/sisu/v3/xml_tables.rb
index 1f154bda..5457a2fc 100644
--- a/lib/sisu/v3/xml_tables.rb
+++ b/lib/sisu/v3/xml_tables.rb
@@ -63,30 +63,30 @@ module SiSU_Tables
     @@tablehead=0
     @@tablefoot=[] #watch #bug??? #check was @@tablefoot
     def initialize(one,ocn='')
-      @one,@parablock,@ocn,@vz=one,one,ocn,SiSU_Env::Get_init.instance.skin
+      @one,@parablock,@ocn,@vz=one,one,ocn,SiSU_Env::GetInit.instance.skin
     end
     def table_split                                                            #% used but, no longer operational, revisit
       @new_content=[]
       @one.split(/\n/).each do |parablock|
-        table=Table_xml.new("#{parablock}\n")
+        table=TableXML.new("#{parablock}\n")
         @new_content << table.table
       end
       @new_content.join
     end
   end
-  class Table_xml <Table
+  class TableXML <Table
     @@tablehead=0
     @@tablefoot=[]
     def initialize(one,ocn='')
-      @one,@parablock,@ocn,@vz=one,one,ocn,SiSU_Env::Get_init.instance.skin
+      @one,@parablock,@ocn,@vz=one,one,ocn,SiSU_Env::GetInit.instance.skin
     end
     def table
       m=@parablock[/<!f(.+?)!>/,1]
       @@tablefoot << m if m
-      @parablock.gsub!(/<!f.+?!>/,'')
+      @parablock=@parablock.gsub(/<!f.+?!>/,'')
       @@tablehead=1 if @parablock =~/#{Mx[:gr_o]}Th#{Mx[:tc_p]}/u
       if @parablock =~/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}/u
-        @parablock.gsub!(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}.+?#{Mx[:tc_p]}~(\d+);\w\d+;\w\d+#{Mx[:gr_c]}/u,
+        @parablock=@parablock.gsub(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}.+?#{Mx[:tc_p]}~(\d+);\w\d+;\w\d+#{Mx[:gr_c]}/u,
           %{\n<ocn>#{@ocn}</ocn><table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">})
       end
       if @parablock =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/
@@ -96,37 +96,37 @@ module SiSU_Tables
       end
       if @@tablehead==1
         if @parablock =~/#{Mx[:tc_p]}#{Mx[:tc_p]}/u
-          @parablock.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,
+          @parablock=@parablock.gsub(/#{Mx[:tc_o]}#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,
             %{<tr>
   <td width="\\1%" valign="top">
-    #{@vz.paragraph_table_xml}<b>})
-          @parablock.gsub!(/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,
-            %{</b></td><td width="\\1%" valign="top">
-  #{@vz.paragraph_table_xml}<b>})
-          @parablock.gsub!(/#{Mx[:tc_c]}/,"</b>\n</td>\n</tr>")
+    #{@vz.paragraph_table_xml}<b>}).
+            gsub(/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,
+              %{</b></td><td width="\\1%" valign="top">
+  #{@vz.paragraph_table_xml}<b>}).
+            gsub(/#{Mx[:tc_c]}/,"</b>\n</td>\n</tr>")
           @@tablehead=0
         end
         @parablock
       else
-        @parablock.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,
+        @parablock=@parablock.gsub(/#{Mx[:tc_o]}#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,
           %{<tr>
   <td width="\\1%" valign="top">
-    #{@vz.paragraph_table_xml}})
-        @parablock.gsub!(/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,
-          %{
+    #{@vz.paragraph_table_xml}}).
+          gsub(/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,
+            %{
   </td>
   <td width="\\1%" valign="top">
-    #{@vz.paragraph_table_xml}})
-        @parablock.gsub!(/#{Mx[:tc_c]}/,"\n</td>\n</tr>\n")
+    #{@vz.paragraph_table_xml}}).
+          gsub(/#{Mx[:tc_c]}/,"\n</td>\n</tr>\n")
       end
       @parablock
     end
   end
-  class Table_xml_exp <Table
+  class TableXMLexp <Table
     @@tablehead=0
     @@tablefoot=[]
     def initialize(one)
-      @one,@parablock,@vz=one,one,SiSU_Env::Get_init.instance.skin
+      @one,@parablock,@vz=one,one,SiSU_Env::GetInit.instance.skin
     end
     def table_head(inf)
       %{<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
@@ -159,7 +159,7 @@ module SiSU_Tables
     def table
       m=@parablock[/<!f(.+?)!>/,1]
       @@tablefoot << m if m
-      @parablock.gsub!(/<!f.+?!>/,'')
+      @parablock=@parablock.gsub(/<!f.+?!>/,'')
       @@tablehead=1 if @parablock =~/#{Mx[:gr_o]}Th#{Mx[:tc_p]}/u
       if @parablock =~/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}.+?#{Mx[:tc_p]}~(\d+);\w\d+;\w\d+#{Mx[:gr_c]}/u; @parablock=table_head($1)
       end
@@ -173,26 +173,26 @@ module SiSU_Tables
       if @@tablehead==1
         if @parablock =~/#{Mx[:tc_p]}#{Mx[:tc_p]}/u
           if @parablock =~/#{Mx[:tc_o]}#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u
-            @parablock.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,table_row($1,true))
+            @parablock=@parablock.gsub(/#{Mx[:tc_o]}#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,table_row($1,true))
           end
           if @parablock =~/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u
-            @parablock.gsub!(/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,table_cell($1,true))
+            @parablock=@parablock.gsub(/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,table_cell($1,true))
           end
           if @parablock =~/#{Mx[:tc_c]}/
-            @parablock.gsub!(/#{Mx[:tc_c]}/,table_row_close(true))
+            @parablock=@parablock.gsub(/#{Mx[:tc_c]}/,table_row_close(true))
           end
           @@tablehead=0
         end
         @parablock
       else
         if @parablock =~/^#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u
-          @parablock.gsub!(/^#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,table_row($1))
+          @parablock=@parablock.gsub(/^#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,table_row($1))
         end
         if @parablock =~/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u
-          @parablock.gsub!(/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,table_cell($1))
+          @parablock=@parablock.gsub(/#{Mx[:tc_p]}#{Mx[:tc_p]}(\d+?)#{Mx[:tc_p]}/u,table_cell($1))
         end
         if @parablock =~/#{Mx[:tc_c]}/
-          @parablock.gsub!(/#{Mx[:tc_c]}/,table_row_close)
+          @parablock=@parablock.gsub(/#{Mx[:tc_c]}/,table_row_close)
         end
         @parablock
       end
-- 
cgit v1.2.3