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_fictionbook.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/lib/sisu/v3/xml_fictionbook.rb b/lib/sisu/v3/xml_fictionbook.rb
index 1425dc74..8fe1e7c1 100644
--- a/lib/sisu/v3/xml_fictionbook.rb
+++ b/lib/sisu/v3/xml_fictionbook.rb
@@ -61,9 +61,9 @@ module SiSU_XML_Fictionbook
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   require_relative 'shared_txt'                         # shared_txt.rb
-    include SiSU_text_utils
+    include SiSU_TextUtils
   require_relative 'shared_xml'                         # shared_xml.rb
-    include SiSU_XML_munge
+    include SiSU_XML_Munge
   include SiSU_Param
   pwd=Dir.pwd
   class Source
@@ -76,7 +76,7 @@ module SiSU_XML_Fictionbook
         @md=SiSU_Param::Parameters.new(@opt).get
         @dal_array=SiSU_DAL::Source.new(@opt).get
         SiSU_XML_Fictionbook::Source::Scroll.new(@dal_array,@md).songsheet
-      rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
       end
     end
@@ -84,8 +84,8 @@ module SiSU_XML_Fictionbook
     class Scroll <Source
       def initialize(data='',md='')
         @data,@md=data,md
-        @trans=SiSU_XML_munge::Trans.new(@md)
-        @file_fictionbook=SiSU_Env::SiSU_file.new(@md,'fictionbook.xml').mkfile
+        @trans=SiSU_XML_Munge::Trans.new(@md)
+        @file_fictionbook=SiSU_Env::FileOp.new(@md,'fictionbook.xml').mkfile
       end
       def songsheet
         @t='fictionbook'
@@ -103,8 +103,8 @@ module SiSU_XML_Fictionbook
         tail
       end
       def head
-        version=SiSU_Env::Info_version.instance.get_version
-        rb_ver=SiSU_Env::Info_version.instance.rbversion
+        version=SiSU_Env::InfoVersion.instance.get_version
+        rb_ver=SiSU_Env::InfoVersion.instance.rbversion
         date_available=if defined? @md.date.available; "\n     <p>#{@md.date.available} Initial version</p>"
         else ''
         end
@@ -151,14 +151,14 @@ WOK
         @data.each do |para|
           @endnotes << para.scan(/~\{(.+?)\}~/m)
         end
-        @endnotes.flatten!
+        @endnotes=@endnotes.flatten
       end
       def endnotes
         @endnotes.each do |endnote|
-          endnote.strip!
+          endnote=endnote.strip
           endnote=@trans.markup_fictionbook(endnote)
           endnote="<p>#{endnote}</p>"
-          util=SiSU_text_utils::Wrap.new(endnote,80,10)
+          util=SiSU_TextUtils::Wrap.new(endnote,80,10)
           endnote=util.line_wrap
           put(endnote)
         end
@@ -171,12 +171,12 @@ WOK
         put(tail)
       end
       def markup(para,type='')
-        para.strip!
+        para=para.strip
         para=@trans.markup_fictionbook(para)
         para=if type.empty?; "<p>#{para}</p>"
         else "<#{type}><p>#{para}</p></#{type}>"
         end
-        util=SiSU_text_utils::Wrap.new(para,80,10)
+        util=SiSU_TextUtils::Wrap.new(para,80,10)
         wrap=util.line_wrap
       end
       def put(line)
-- 
cgit v1.2.3