From df67ee1079d074dc2af54aa87187c6538e73d5d7 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 10 Jan 2012 22:50:12 -0500
Subject: v3dv: class names, use more CamelCase

---
 lib/sisu/v3dv/odf.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/sisu/v3dv/odf.rb')

diff --git a/lib/sisu/v3dv/odf.rb b/lib/sisu/v3dv/odf.rb
index 85a9a390..2f0cf38e 100644
--- a/lib/sisu/v3dv/odf.rb
+++ b/lib/sisu/v3dv/odf.rb
@@ -73,7 +73,7 @@ module SiSU_ODF
     require 'find'
     def initialize(opt)
       @opt=opt
-      @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt)
+      @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
       @@endnotes_para=[]
     end
     def read
@@ -89,8 +89,8 @@ module SiSU_ODF
           SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}").flow if @opt.cmd =~/[MV]/
         end
         SiSU_ODF::Source::Scroll.new(@particulars).songsheet
-        SiSU_Env::Info_skin.new(@md).select
-      rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+        SiSU_Env::InfoSkin.new(@md).select
+      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
       end
     end
@@ -104,7 +104,7 @@ module SiSU_ODF
       @@fns=nil
       def initialize(particulars)
         @md,@env,@dal_array=particulars.md,particulars.env,particulars.dal_array
-        @vz=SiSU_Env::Get_init.instance.skin
+        @vz=SiSU_Env::GetInit.instance.skin
         @tab="\t"
         @brace_url=SiSU_Viz::Skin.new.url_decoration
         @br=(@md.opt.cmd =~/M/) ? '' : ''
@@ -246,7 +246,7 @@ module SiSU_ODF
       def text_link_odf(txt,url,trail)
         txt.gsub!(/(\\\+)/,'+') #this is convoluted, and risky :-(
         url.gsub!(/(\\\+)/,'+') #this is convoluted, and risky :-(
-        map_nametags=SiSU_Particulars::Combined_singleton.instance.get_map_nametags(@md).nametags_map
+        map_nametags=SiSU_Particulars::CombinedSingleton.instance.get_map_nametags(@md).nametags_map
         t=case url
         when /^https?:/
           %{<text:a xlink:type="simple" xlink:href="#{url}">#{txt.strip}</text:a>#{trail}}
@@ -458,7 +458,7 @@ module SiSU_ODF
       end
       def obj_break(dob)
         if dob.is =='break'
-          br=SiSU_ODF_Format::Format_obj_break.new(@md,dob)
+          br=SiSU_ODF_Format::FormatObjBreak.new(@md,dob)
           if dob.obj==Mx[:br_page] \
           or dob.obj==Mx[:br_page_new]
             dob=br.br_page
@@ -482,7 +482,7 @@ module SiSU_ODF
           if dob.is !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
             if defined? dob.ocn \
             and not dob.ocn.nil?
-              p_num=SiSU_ODF_Format::Paragraph_number.new(dob.ocn).display
+              p_num=SiSU_ODF_Format::ParagraphNumber.new(dob.ocn).display
             end
           end
         end
@@ -511,7 +511,7 @@ module SiSU_ODF
       end
       def markup(data)                                                                 # Used for major markup instructions
         safe_characters=/[^a-zA-Z0-9}{\/?,."';:)(><\-_&!@%~#\]\[*=$| \n+`#{Mx[:tc_p]}]/u
-        dir=SiSU_Env::Info_env.new(@md.fns)
+        dir=SiSU_Env::InfoEnv.new(@md.fns)
         dir.path.odt_bld
         @data_mod,@endnotes,@level,@cont,@copen,@odf_contents_close=Array.new(6){[]}
         @rcdc=false
@@ -598,7 +598,7 @@ module SiSU_ODF
           and (dob.obj =~/~metadata/ or dob =~/#{Mx[:lv_o]}1:meta#{Mx[:lv_x]}\s*Document Information/) #fix Mx[:lv_o]
           if dob.is !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
             if defined? dob.ocn and dob.ocn =~/\d+/
-              @p_num=SiSU_ODF_Format::Paragraph_number.new(dob.ocn)
+              @p_num=SiSU_ODF_Format::ParagraphNumber.new(dob.ocn)
             end
             if dob.is=~/heading|para|group|verse|code|table|break/ # extend, include other types
               odf_structure(@md,dob)
@@ -686,7 +686,7 @@ WOK
       def odf                                                           #%odf output
         env=SiSU_Env::FileOp.new(@md)
         env.mkdir
-        header=SiSU_ODF_Format::ODT_head_1_2.new(@md)
+        header=SiSU_ODF_Format::ODT_Head_1_2.new(@md)
         filename="#{@env.processing_path.odt}/manifest.rdf"
         od=File.new(filename,'w+')
         od << header.manifest_rdf
-- 
cgit v1.2.3