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_character_check.rb | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

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

diff --git a/lib/sisu/v3/dal_character_check.rb b/lib/sisu/v3/dal_character_check.rb
index 70cddf91..e5ab7578 100644
--- a/lib/sisu/v3/dal_character_check.rb
+++ b/lib/sisu/v3/dal_character_check.rb
@@ -56,7 +56,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_character_check
+module SiSU_DAL_CharacterCheck
   class Check
     def initialize(data)
       @data=data
@@ -68,26 +68,27 @@ module SiSU_character_check
       @tuned_file,@endnote_array=[],[]
       endnote_no=1
       data.each do |dob|
-        unless dob.is =='table'
-          dob.obj.strip!
-          dob.obj.gsub!(/^[{~}]\s*$/,'')
-          dob.obj.gsub!(/~#\s*/,"#{Mx[:pa_non_object_no_heading]}")
-          dob.obj.gsub!(/-#\s*/,"#{Mx[:pa_non_object_dummy_heading]}")
-          dob.obj.gsub!(/(#{Mx[:en_a_o]})\s*\s+/,'\1 '); dob.obj.gsub!(/(~\{\s*)\s+/,'\1 ')
-          dob.obj.gsub!(/ \/\//,"#{Mx[:br_line]}")
-          dob.obj.gsub!(/<br>/,"#{Mx[:br_line]}")                              #needed by xml, xhtml etc.
-          dob.obj.gsub!(/\t/,' ')
-          dob.obj.gsub!(/\342\200\231/u,"'") #if dob =~/’/  #Avoid #&lsquo; &rsquo; #&ldquo; &rdquo;
-          dob.obj.gsub!(/�/u,' ')                                              #watch, replace with char code
-          dob.obj.gsub!(/·/u,'*')
-          dob.obj.gsub!(/\\copy(?:right)?\b/,'&#169;')
-          dob.obj.gsub!(/\\trademark\b|\\tm\b/,'&#174;')
+        unless dob.is ==:table
+          dob.obj=dob.obj.strip.
+            gsub(/^[{~}]\s*$/,'').
+            gsub(/~#\s*/,"#{Mx[:pa_non_object_no_heading]}").
+            gsub(/-#\s*/,"#{Mx[:pa_non_object_dummy_heading]}").
+            gsub(/(#{Mx[:en_a_o]})\s*\s+/,'\1 ').
+            gsub(/(~\{\s*)\s+/,'\1 ').
+            gsub(/ \/\//,"#{Mx[:br_line]}").
+            gsub(/<br>/,"#{Mx[:br_line]}").                              #needed by xml, xhtml etc.
+            gsub(/\t/,' ').
+            gsub(/\342\200\231/u,"'"). #if dob =~/’/  #Avoid #&lsquo; &rsquo; #&ldquo; &rdquo;
+            gsub(/�/u,' ').                                              #watch, replace with char code
+            gsub(/·/u,'*').
+            gsub(/\\copy(?:right)?\b/,'&#169;').
+            gsub(/\\trademark\b|\\tm\b/,'&#174;')
           dob.obj=dob.obj + "\n"
-          unless dob.is =~/^code/
+          unless dob.is ==:code
             case dob.obj
             when /\^~/                                     #% Note must do this first (earlier loop) and then enter gathered data into ~^\d+
               sub_dob=dob.obj.dup
-              @endnote_array << sub_dob.gsub!(/\n/,'').gsub!(/\^~\s+(.+)\s*/,%{#{Mx[:en_a_o]}#{endnote_no} \\1 #{Mx[:en_a_c]}}).strip
+              @endnote_array << sub_dob.gsub(/\n/,'').gsub(/\^~\s+(.+)\s*/,%{#{Mx[:en_a_o]}#{endnote_no} \\1 #{Mx[:en_a_c]}}).strip
               endnote_no+=1
               dob=nil if dob.obj =~/\^~ .+/                #watch, removes 'binary' endnote now in endnote array for later insertion
             end
-- 
cgit v1.2.3