aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3/xml.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v3/xml.rb')
-rw-r--r--lib/sisu/v3/xml.rb30
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/sisu/v3/xml.rb b/lib/sisu/v3/xml.rb
index a3767177..9b9bc3f5 100644
--- a/lib/sisu/v3/xml.rb
+++ b/lib/sisu/v3/xml.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
=begin
* Name: SiSU
@@ -57,19 +57,19 @@
=end
module SiSU_XML_SAX
- require "#{SiSU_lib}/defaults" # defaults.rb
+ require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require "#{SiSU_lib}/particulars" # particulars.rb
+ require_relative 'particulars' # particulars.rb
include SiSU_Particulars
- require "#{SiSU_lib}/sysenv" # sysenv.rb
+ require_relative 'sysenv' # sysenv.rb
include SiSU_Env
- require "#{SiSU_lib}/shared_xml" # shared_xml.rb
+ require_relative 'shared_xml' # shared_xml.rb
include SiSU_XML_munge
- require "#{SiSU_lib}/xml_format" # xml_format.rb
+ require_relative 'xml_format' # xml_format.rb
include SiSU_XML_format
- require "#{SiSU_lib}/rexml" # rexml.rb
+ require_relative 'rexml' # rexml.rb
include SiSU_Rexml
- require "#{SiSU_lib}/shared_metadata" # shared_metadata.rb
+ require_relative 'shared_metadata' # shared_metadata.rb
@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0
@@tablefoot=''
class Source
@@ -115,11 +115,11 @@ module SiSU_XML_SAX
end
end
class Scroll
- require "#{SiSU_lib}/shared_txt" # shared_txt.rb
+ require_relative 'shared_txt' # shared_txt.rb
include SiSU_text_utils
- require "#{SiSU_lib}/css" # css.rb
- require "#{SiSU_lib}/shared_xhtml" # decide use, whether xml rather than xhtml
- @@xml={ :body=>[],:open=>[],:close=>[],:head=>[] }
+ require_relative 'css' # css.rb
+ require_relative 'shared_xhtml' # decide use, whether xml rather than xhtml
+ @@xml={ body: [], open: [], close: [], head: [] }
def initialize(particulars)
@env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
@vz=SiSU_Env::Get_init.instance.skin
@@ -353,11 +353,11 @@ WOK
end
elsif dob.obj =~/(#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
elsif dob.obj =~/MetaData/
- txt_obj={:txt =>'<br /><a name="metadata">MetaData</a>'}
+ txt_obj={ txt: '<br /><a name="metadata">MetaData</a>' }
format_scroll=Format_scroll.new(@md,txt_obj)
dob.obj=format_scroll.bold_para
elsif dob.obj =~/(Owner Details)/
-# txt_obj={:txt =>'<br /><a name="owner.details">Owner Details</a>'}
+# txt_obj={ txt: '<br /><a name="owner.details">Owner Details</a>' }
# format_scroll=Format_scroll.new(@md,txt_obj)
# @@xml[:owner_details]=format_scroll.bold_para
dob.obj=''
@@ -368,7 +368,7 @@ WOK
end
if dob.obj =~/.*<:#>.*$/ #investigate removal
dob.obj=if dob.obj =~ /#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}/
- txt_obj={:txt =>dob}
+ txt_obj={ txt: dob }
format_text=Format_text_object.new(@md,txt_obj)
format_text.scr_inden_ocn_e_no_paranum
end