From 75e3bf86382edf99275a25895b362647158e25c1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 10 Jan 2012 22:37:26 -0500 Subject: v3dv, add dev branch (use to make some changes to module & class names & test) * (intended as) short term branch, merge back into v3 once tested * sisu --dev (to invoke) --- lib/sisu/v3dv/xml.rb | 467 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 467 insertions(+) create mode 100644 lib/sisu/v3dv/xml.rb (limited to 'lib/sisu/v3dv/xml.rb') diff --git a/lib/sisu/v3dv/xml.rb b/lib/sisu/v3dv/xml.rb new file mode 100644 index 00000000..9ed3e871 --- /dev/null +++ b/lib/sisu/v3dv/xml.rb @@ -0,0 +1,467 @@ +# encoding: utf-8 +=begin + + * Name: SiSU + + * Description: a framework for document structuring, publishing and search + + * Author: Ralph Amissah + + * Copyright: (C) 1997 - 2012, Ralph Amissah, All Rights Reserved. + + * License: GPL 3 or later: + + SiSU, a framework for document structuring, publishing and search + + Copyright (C) Ralph Amissah + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see . + + If you have Internet connection, the latest version of the GPL should be + available at these locations: + + + + + + + + * SiSU uses: + * Standard SiSU markup syntax, + * Standard SiSU meta-markup syntax, and the + * Standard SiSU object citation numbering and system + + * Hompages: + + + + * Download: + + + * Ralph Amissah + + + + ** Description: xml output (sax style) processing + +=end +module SiSU_XML_SAX + require_relative 'defaults' # defaults.rb + include SiSU_Viz + require_relative 'particulars' # particulars.rb + include SiSU_Particulars + require_relative 'sysenv' # sysenv.rb + include SiSU_Env + require_relative 'shared_xml' # shared_xml.rb + include SiSU_XML_munge + require_relative 'xml_format' # xml_format.rb + include SiSU_XML_format + require_relative 'rexml' # rexml.rb + include SiSU_Rexml + require_relative 'shared_metadata' # shared_metadata.rb + @@alt_id_count,@@tablehead,@@number_of_cols=0,0,0 + @@tablefoot='' + class Source + def initialize(opt) + @opt=opt + @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt) + end + def read + begin + @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array + unless @opt.cmd =~/q/ + path=@env.path.output_tell + loc=@env.url.output_tell + tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}" + elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}" + else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" + end + @opt.cmd=~/[MVvz]/ \ + ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML SAX',tool).colorize + : SiSU_Screen::Ansi.new(@opt.cmd,'XML SAX',tool).green_title_hi + SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}").flow if @opt.cmd =~/[MV]/ + end + SiSU_XML_SAX::Source::Songsheet.new(@particulars).song + rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error + ensure + #file closed in songsheet + end + end + private + class Songsheet + def initialize(particulars) + @env,@md,@dal_array,@particulars=particulars.env,particulars.md,particulars.dal_array,particulars + @file=SiSU_Env::SiSU_file.new(@md) + end + def song + begin + SiSU_XML_SAX::Source::Scroll.new(@particulars).songsheet + SiSU_XML_SAX::Source::Tidy.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use + SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug + rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error + ensure + end + end + end + class Scroll + require_relative 'shared_txt' # shared_txt.rb + include SiSU_text_utils + 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 + @trans=SiSU_XML_munge::Trans.new(@md) + @sys=SiSU_Env::System_call.new + end + def songsheet + pre + @data=markup(@dal_array) + post + publish + end + protected + def embedded_endnotes(dob='') + dob.obj.gsub!(/#{Mx[:en_a_o]}(\d+)\s+(.+?)#{Mx[:en_a_c]}/, + '\1\2 ') + dob.obj.gsub!(/#{Mx[:en_b_o]}([*+]\d+)\s+(.+?)#{Mx[:en_b_c]}/, + '\1\2 ') + dob.obj.gsub!(/#{Mx[:en_a_o]}([*+]+)\s+(.+?)#{Mx[:en_a_c]}/, + '\1\2 ') + end + def extract_endnotes(dob='') + notes=dob.obj.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+\s+.+?)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/) + notes.flatten.each do |e| + s=e.to_s + util=SiSU_text_utils::Wrap.new(s,70) + wrap=util.line_wrap + wrap.gsub!(/^(\d+)\s+(.+?)\s*\Z/m, < +#{Ax[:tab]*2}\\1 +#{Ax[:tab]*2} +#{Ax[:tab]*3}\\2 +#{Ax[:tab]*2} +#{Ax[:tab]*1} +WOK +) + wrap.gsub!(/^([*+]\d+)\s+(.+?)\s*\Z/m, < +#{Ax[:tab]*2}\\1 +#{Ax[:tab]*2} +#{Ax[:tab]*3}\\2 +#{Ax[:tab]*2} +#{Ax[:tab]*1} +WOK +) + wrap.gsub!(/^([*+]+)\s+(.+?)\s*\Z/m, < +#{Ax[:tab]*2}\\1 +#{Ax[:tab]*2} +#{Ax[:tab]*3}\\2 +#{Ax[:tab]*2} +#{Ax[:tab]*1} +WOK +) + @endnotes << wrap + end + end + def xml_head + metadata=Metadata::Summary.new(@md).xml_sax.metadata + @@xml[:head] << metadata + end + def xml_sc(md='') + sc=if @md.sc_info + < + filename: + + #{@md.sc_filename} +
+ version number: + + #{@md.sc_number} +
+ version date: + + #{@md.sc_date} +
+ +WOK + else '' + end + @@xml[:sc]=sc + end + def xml_structure(dob,type='norm') + if dob.is=='heading' + lv=dob.ln + n=dob.ln - 1 + n3=dob.ln + 2 + else lv=nil + end + extract_endnotes(dob) + dob.obj.gsub!(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'\1') #footnote/endnote clean + dob.obj.gsub!(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'\1') #footnote/endnote clean + #if defined? dob.obj + #t_ograph="#{dob.obj}" + util=SiSU_text_utils::Wrap.new(dob.obj,70) + wrapped=util.line_wrap + #end + @@xml[:body] << if defined? dob.ocn; %{#{Ax[:tab]*0}} + else "#{Ax[:tab]*0}" + end + @@xml[:body] << "#{Ax[:tab]*1}#{dob.ocn}" if defined? dob.ocn + @@xml[:body] << if lv; %{#{Ax[:tab]*1}\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}} + else %{#{Ax[:tab]*1}\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}} # main text, contents, body KEEP + end + @@xml[:body] << @endnotes if @endnotes + ##@@xml[:body] << "#{Ax[:tab]*1}#{dob[@regx,2]}" if dob[@regx,2] # old unwrapped main text, contents, body KEEP + @@xml[:body] << "#{Ax[:tab]*0}" + @endnotes=[] + end + def block_structure(dob='') + extract_endnotes(dob) + dob.obj.gsub!(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'\1') #footnote/endnote clean + dob.obj.gsub!(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'\1') #footnote/endnote clean + dob=@trans.markup_block(dob) + dob.obj.strip! + @@xml[:body] << %{#{Ax[:tab]*0}} + @@xml[:body] << %{#{Ax[:tab]*1}#{dob.ocn}} + @@xml[:body] << %{#{Ax[:tab]*1}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*1}} + @@xml[:body] << "#{Ax[:tab]*0}" + @@xml[:body] << @endnotes if @endnotes + @endnotes=[] + end + def group_structure(dob='') + extract_endnotes(dob) + dob.obj.gsub!(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'\1') #footnote/endnote clean + dob.obj.gsub!(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'\1') #footnote/endnote clean + dob=@trans.markup_group(dob) + dob.obj.strip! + @@xml[:body] << %{#{Ax[:tab]*0}} + @@xml[:body] << %{#{Ax[:tab]*1}#{dob.ocn}} + @@xml[:body] << %{#{Ax[:tab]*1}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*1}} + @@xml[:body] << "#{Ax[:tab]*0}" + @@xml[:body] << @endnotes if @endnotes + @endnotes=[] + end + def poem_structure(dob='') + dob=@trans.markup_group(dob) + #dob.obj.gsub!(/\s\s/,'  ') + dob.obj.strip! + @@xml[:body] << %{#{Ax[:tab]*0}} + @@xml[:body] << %{#{Ax[:tab]*1}#{dob.ocn}} + @@xml[:body] << %{#{Ax[:tab]*1}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*1}} + @@xml[:body] << "#{Ax[:tab]*0}" + end + def code_structure(dob='') + dob=@trans.markup_group(dob) + dob.obj.gsub!(/\s\s/,'  ') + dob.obj.strip! + @@xml[:body] << %{#{Ax[:tab]*0}} + @@xml[:body] << %{#{Ax[:tab]*1}#{dob.ocn}} + @@xml[:body] << %{#{Ax[:tab]*1}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*1}} + @@xml[:body] << "#{Ax[:tab]*0}" + end + def table_structure(dob) + table=SiSU_XHTML_shared::Table_xhtml.new(dob) + @@xml[:body] << %{#{Ax[:tab]*0}} + @@xml[:body] << %{#{Ax[:tab]*1}#{dob.ocn}} + @@xml[:body] << %{#{Ax[:tab]*1}#{Ax[:tab]*1}} + @@xml[:body] << %{#{Ax[:tab]*2}#{table.table.obj}} + @@xml[:body] << %{#{Ax[:tab]*1}} + #@@xml[:body] << %{#{tab*1}} + @@xml[:body] << "#{Ax[:tab]*0}" + #@@xml[:body] << %{#{Ax[:tab]*0}} + #@@xml[:body] << %{#{Ax[:tab]*1}#{table}\n#{Ax[:tab]*1}} # unless lv # main text, contents, body KEEP + #@@xml[:body] << "#{Ax[:tab]*0}" + #@endnotes=[] + end + def markup(data) + xml_sc(@md) + @endnotes,@level,@cont,@copen,@xml_contents_close=[],[],[],[],[] + @rcdc=false + xml_head + (0..6).each { |x| @cont[x]=@level[x]=false } + (4..6).each { |x| @xml_contents_close[x]='' } + data.each do |dob| + @trans.char_enc.utf8(dob) if @sys.locale =~/utf-?8/i #% utf8 + dob=@trans.markup(dob) + if @rcdc==false \ + and (dob.is =~/^meta/ \ + and dob.obj =~/Document Information/) + @rcdc=true + end + if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ + if defined? dob.ocn #look to move to format section + ocn=((dob.ocn.to_s =~/\d+/) ? dob.ocn : nil) + @p_num=SiSU_XML_format::Paragraph_number.new(@md,ocn) + end + if not @rcdc + if defined? dob.ocn \ + and dob.ocn.to_s =~/\d+/ + x=SiSU_XML_format::Format_seg.new(@md,dob) + if dob.is=='heading' + xml_structure(dob) + dob.obj=case dob.ln + when 1; x.heading_body1 + when 2; x.heading_body2 + when 3; x.heading_body3 + when 4; x.heading_body4 + when 5; x.heading_body5 + when 6; x.heading_body6 + end + else + if dob.is=='verse' + poem_structure(dob) + elsif dob.is=='group' + group_structure(dob) + elsif dob.is=='block' + block_structure(dob) + elsif dob.is=='code' + code_structure(dob) + elsif dob.is=='table' # FIX, check css, will need to modify + table_structure(dob) + elsif dob.is =~ /^para/ \ + and dob.indent.to_s =~/[1-9]/ \ + and dob.bullet_==true + xml_structure(dob,"indent_bullet#{dob.indent}") + elsif dob.is =~ /^para/ \ + and dob.indent.to_s =~/[1-9]/ \ + and dob.indent == dob.hang + xml_structure(dob,"indent#{dob.indent}") + elsif dob.is =~ /^para/ \ + and dob.hang.to_s =~/[0-9]/ \ + and dob.indent != dob.hang + xml_structure(dob,"hang#{dob.hang.to_s}_indent#{dob.indent.to_s}") + else xml_structure(dob) + end + end + elsif dob.obj =~/(#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ + elsif dob.obj =~/MetaData/ + txt_obj={ txt: '
MetaData' } + format_scroll=Format_scroll.new(@md,txt_obj) + dob.obj=format_scroll.bold_para + elsif dob.obj =~/(Owner Details)/ +# txt_obj={ txt: '
Owner Details' } +# format_scroll=Format_scroll.new(@md,txt_obj) +# @@xml[:owner_details]=format_scroll.bold_para + dob.obj='' + end + if dob.obj =~// \ + and dob.obj =~/^(-\{{2}~\d+|)/ # -endnote + dob.obj='' + end + if dob.obj =~/.*<:#>.*$/ #investigate removal + dob.obj=if dob.obj =~ /#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}/ + txt_obj={ txt: dob } + format_text=Format_text_object.new(@md,txt_obj) + format_text.scr_inden_ocn_e_no_paranum + end + end + else # + end + dob.obj.gsub!(/#{Mx[:pa_o]}:\S+#{Mx[:pa_c]}/,'') if dob.obj + end + end + 6.downto(4) do |x| + y=x - 1; v=x - 3 + @@xml[:body] << "#{Ax[:tab]*5}\n#{Ax[:tab]*y}" if @level[x]==true + end + 3.downto(1) do |x| + y=x - 1 + @@xml[:body] << "#{Ax[:tab]*y}" if @level[x]==true + end + #6.downto(1) { |x| y=x - 1; @@xml[:body] << "#{Ax[:tab]*y}" if @level[x]==true } + end + def pre + rdf=SiSU_XML_tags::RDF.new(@md) + dir=SiSU_Env::Info_env.new + @@xml[:head],@@xml[:body]=[],[] + css=SiSU_Env::CSS_stylesheet.new(@md) + encoding=if @sys.locale =~/utf-?8/i; '' + else '' + end + @@xml[:open] =< +WOK + @@xml[:head] << '' + @@xml[:body] << '' + end + def post + @@xml[:head] << @@xml[:sc] + @@xml[:head] << '' + @@xml[:body] << '' + @@xml[:close] = '' + end + def publish + content=[] + content << @@xml[:open] << @@xml[:head] << @@xml[:body] << @@xml[:metadata] + content << @@xml[:owner_details] if @md.stmp =~/\w\w/ + content << @@xml[:tail] << @@xml[:close] + content.flatten!.compact! + Output.new(content,@md).xml + @@xml={} + end + end + class Output + def initialize(data,md) + @data,@md=data,md + @file=SiSU_Env::SiSU_file.new(@md) + end + def xml + SiSU_Env::SiSU_file.new(@md).mkdir + filename_xml=@file.write_file.xml_sax + @data.each do |str| + str.gsub!(/\A\s+\Z/m,'') #str.gsub!(/^\s+$/,'') + filename_xml.puts str unless str.empty? + end + filename_xml.close + end + end + class Tidy + def initialize(md,file) + @md,@file=md,file + @prog=SiSU_Env::Info_program.new + end + def xml + if @prog.tidy !=false #note values can be other than true + if @md.opt.cmd =~/[VM]/ + unless @md.opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@md.opt.cmd,'invert','Using XML Tidy','check document structure').colorize + tell=SiSU_Screen::Ansi.new(@md.opt.cmd,'invert','','') + tell.grey_open + end + tidyfile='/dev/null' #don't want one or screen output, check for alternative flags + tidy=SiSU_Env::System_call.new(@file,tidyfile) + tidy.well_formed? + tell.p_off unless @md.opt.cmd =~/q/ + end + end + end + end + end +end +__END__ -- cgit v1.2.3 From 51ba2d70af41137ddc3323d79e01b28fbcb40082 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 10 Jan 2012 22:44:24 -0500 Subject: v3dv: module names, use more CamelCase --- lib/sisu/v3dv/xml.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/sisu/v3dv/xml.rb') diff --git a/lib/sisu/v3dv/xml.rb b/lib/sisu/v3dv/xml.rb index 9ed3e871..972d3ef0 100644 --- a/lib/sisu/v3dv/xml.rb +++ b/lib/sisu/v3dv/xml.rb @@ -64,9 +64,9 @@ module SiSU_XML_SAX require_relative 'sysenv' # sysenv.rb include SiSU_Env require_relative 'shared_xml' # shared_xml.rb - include SiSU_XML_munge + include SiSU_XML_Munge require_relative 'xml_format' # xml_format.rb - include SiSU_XML_format + include SiSU_XML_Format require_relative 'rexml' # rexml.rb include SiSU_Rexml require_relative 'shared_metadata' # shared_metadata.rb @@ -116,14 +116,14 @@ module SiSU_XML_SAX end class Scroll require_relative 'shared_txt' # shared_txt.rb - include SiSU_text_utils + include SiSU_TextUtils 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 - @trans=SiSU_XML_munge::Trans.new(@md) + @trans=SiSU_XML_Munge::Trans.new(@md) @sys=SiSU_Env::System_call.new end def songsheet @@ -145,7 +145,7 @@ module SiSU_XML_SAX notes=dob.obj.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+\s+.+?)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/) notes.flatten.each do |e| s=e.to_s - util=SiSU_text_utils::Wrap.new(s,70) + util=SiSU_TextUtils::Wrap.new(s,70) wrap=util.line_wrap wrap.gsub!(/^(\d+)\s+(.+?)\s*\Z/m, < @@ -215,7 +215,7 @@ WOK dob.obj.gsub!(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'\1') #footnote/endnote clean #if defined? dob.obj #t_ograph="#{dob.obj}" - util=SiSU_text_utils::Wrap.new(dob.obj,70) + util=SiSU_TextUtils::Wrap.new(dob.obj,70) wrapped=util.line_wrap #end @@xml[:body] << if defined? dob.ocn; %{#{Ax[:tab]*0}} @@ -283,7 +283,7 @@ WOK @@xml[:body] << "#{Ax[:tab]*0}" end def table_structure(dob) - table=SiSU_XHTML_shared::Table_xhtml.new(dob) + table=SiSU_XHTML_Shared::Table_xhtml.new(dob) @@xml[:body] << %{#{Ax[:tab]*0}} @@xml[:body] << %{#{Ax[:tab]*1}#{dob.ocn}} @@xml[:body] << %{#{Ax[:tab]*1}#{Ax[:tab]*1}} @@ -314,12 +314,12 @@ WOK if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ if defined? dob.ocn #look to move to format section ocn=((dob.ocn.to_s =~/\d+/) ? dob.ocn : nil) - @p_num=SiSU_XML_format::Paragraph_number.new(@md,ocn) + @p_num=SiSU_XML_Format::Paragraph_number.new(@md,ocn) end if not @rcdc if defined? dob.ocn \ and dob.ocn.to_s =~/\d+/ - x=SiSU_XML_format::Format_seg.new(@md,dob) + x=SiSU_XML_Format::Format_seg.new(@md,dob) if dob.is=='heading' xml_structure(dob) dob.obj=case dob.ln @@ -394,7 +394,7 @@ WOK #6.downto(1) { |x| y=x - 1; @@xml[:body] << "#{Ax[:tab]*y}" if @level[x]==true } end def pre - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) dir=SiSU_Env::Info_env.new @@xml[:head],@@xml[:body]=[],[] css=SiSU_Env::CSS_stylesheet.new(@md) -- cgit v1.2.3 From 732dca2b21d2261349e639c37e6ed1431e65250c Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 10 Jan 2012 22:47:40 -0500 Subject: v3dv: class names, remove "SiSU_" (reserve for module names for consistency) --- lib/sisu/v3dv/xml.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/sisu/v3dv/xml.rb') diff --git a/lib/sisu/v3dv/xml.rb b/lib/sisu/v3dv/xml.rb index 972d3ef0..27a57f4e 100644 --- a/lib/sisu/v3dv/xml.rb +++ b/lib/sisu/v3dv/xml.rb @@ -102,7 +102,7 @@ module SiSU_XML_SAX class Songsheet def initialize(particulars) @env,@md,@dal_array,@particulars=particulars.env,particulars.md,particulars.dal_array,particulars - @file=SiSU_Env::SiSU_file.new(@md) + @file=SiSU_Env::FileOp.new(@md) end def song begin @@ -429,10 +429,10 @@ WOK class Output def initialize(data,md) @data,@md=data,md - @file=SiSU_Env::SiSU_file.new(@md) + @file=SiSU_Env::FileOp.new(@md) end def xml - SiSU_Env::SiSU_file.new(@md).mkdir + SiSU_Env::FileOp.new(@md).mkdir filename_xml=@file.write_file.xml_sax @data.each do |str| str.gsub!(/\A\s+\Z/m,'') #str.gsub!(/^\s+$/,'') -- cgit v1.2.3 From df67ee1079d074dc2af54aa87187c6538e73d5d7 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 10 Jan 2012 22:50:12 -0500 Subject: v3dv: class names, use more CamelCase --- lib/sisu/v3dv/xml.rb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'lib/sisu/v3dv/xml.rb') diff --git a/lib/sisu/v3dv/xml.rb b/lib/sisu/v3dv/xml.rb index 27a57f4e..095a1fe2 100644 --- a/lib/sisu/v3dv/xml.rb +++ b/lib/sisu/v3dv/xml.rb @@ -75,7 +75,7 @@ module SiSU_XML_SAX class Source def initialize(opt) @opt=opt - @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt) + @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt) end def read begin @@ -93,7 +93,7 @@ module SiSU_XML_SAX SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}").flow if @opt.cmd =~/[MV]/ end SiSU_XML_SAX::Source::Songsheet.new(@particulars).song - rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error + rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error ensure #file closed in songsheet end @@ -109,7 +109,7 @@ module SiSU_XML_SAX SiSU_XML_SAX::Source::Scroll.new(@particulars).songsheet SiSU_XML_SAX::Source::Tidy.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use SiSU_Rexml::Rexml.new(@md,@file.place_file.xml_sax.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug - rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error + rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error ensure end end @@ -122,9 +122,9 @@ module SiSU_XML_SAX @@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 + @vz=SiSU_Env::GetInit.instance.skin @trans=SiSU_XML_Munge::Trans.new(@md) - @sys=SiSU_Env::System_call.new + @sys=SiSU_Env::SystemCall.new end def songsheet pre @@ -283,7 +283,7 @@ WOK @@xml[:body] << "#{Ax[:tab]*0}" end def table_structure(dob) - table=SiSU_XHTML_Shared::Table_xhtml.new(dob) + table=SiSU_XHTML_Shared::TableXHTML.new(dob) @@xml[:body] << %{#{Ax[:tab]*0}} @@xml[:body] << %{#{Ax[:tab]*1}#{dob.ocn}} @@xml[:body] << %{#{Ax[:tab]*1}#{Ax[:tab]*1}} @@ -314,12 +314,12 @@ WOK if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ if defined? dob.ocn #look to move to format section ocn=((dob.ocn.to_s =~/\d+/) ? dob.ocn : nil) - @p_num=SiSU_XML_Format::Paragraph_number.new(@md,ocn) + @p_num=SiSU_XML_Format::ParagraphNumber.new(@md,ocn) end if not @rcdc if defined? dob.ocn \ and dob.ocn.to_s =~/\d+/ - x=SiSU_XML_Format::Format_seg.new(@md,dob) + x=SiSU_XML_Format::FormatSeg.new(@md,dob) if dob.is=='heading' xml_structure(dob) dob.obj=case dob.ln @@ -359,11 +359,11 @@ WOK elsif dob.obj =~/(#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ elsif dob.obj =~/MetaData/ txt_obj={ txt: '
MetaData' } - format_scroll=Format_scroll.new(@md,txt_obj) + format_scroll=FormatScroll.new(@md,txt_obj) dob.obj=format_scroll.bold_para elsif dob.obj =~/(Owner Details)/ # txt_obj={ txt: '
Owner Details' } -# format_scroll=Format_scroll.new(@md,txt_obj) +# format_scroll=FormatScroll.new(@md,txt_obj) # @@xml[:owner_details]=format_scroll.bold_para dob.obj='' end @@ -374,7 +374,7 @@ WOK if dob.obj =~/.*<:#>.*$/ #investigate removal dob.obj=if dob.obj =~ /#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}/ txt_obj={ txt: dob } - format_text=Format_text_object.new(@md,txt_obj) + format_text=FormatTextObject.new(@md,txt_obj) format_text.scr_inden_ocn_e_no_paranum end end @@ -395,9 +395,9 @@ WOK end def pre rdf=SiSU_XML_Tags::RDF.new(@md) - dir=SiSU_Env::Info_env.new + dir=SiSU_Env::InfoEnv.new @@xml[:head],@@xml[:body]=[],[] - css=SiSU_Env::CSS_stylesheet.new(@md) + css=SiSU_Env::CSS_Stylesheet.new(@md) encoding=if @sys.locale =~/utf-?8/i; '' else '' end @@ -444,7 +444,7 @@ WOK class Tidy def initialize(md,file) @md,@file=md,file - @prog=SiSU_Env::Info_program.new + @prog=SiSU_Env::InfoProgram.new end def xml if @prog.tidy !=false #note values can be other than true @@ -455,7 +455,7 @@ WOK tell.grey_open end tidyfile='/dev/null' #don't want one or screen output, check for alternative flags - tidy=SiSU_Env::System_call.new(@file,tidyfile) + tidy=SiSU_Env::SystemCall.new(@file,tidyfile) tidy.well_formed? tell.p_off unless @md.opt.cmd =~/q/ end -- cgit v1.2.3 From 16db2c678def1a011efb4935b26ef89f37939f53 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 10 Jan 2012 23:16:46 -0500 Subject: v3dv: SiSU_DAL_ for module names in dal, & module Metadata is SiSU_Metadata * v3dv: modify.rb script (& its artifact) removed (after use) from lib/sisu modify.rb script remains available (in generic form) under: data/sisu/v3/conf/convert/modify.rb data/sisu/v3dv/conf/convert/modify.rb --- lib/sisu/v3dv/xml.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sisu/v3dv/xml.rb') diff --git a/lib/sisu/v3dv/xml.rb b/lib/sisu/v3dv/xml.rb index 095a1fe2..a0755375 100644 --- a/lib/sisu/v3dv/xml.rb +++ b/lib/sisu/v3dv/xml.rb @@ -178,7 +178,7 @@ WOK end end def xml_head - metadata=Metadata::Summary.new(@md).xml_sax.metadata + metadata=SiSU_Metadata::Summary.new(@md).xml_sax.metadata @@xml[:head] << metadata end def xml_sc(md='') -- cgit v1.2.3