diff options
Diffstat (limited to 'lib/sisu/v6/xml_sax.rb')
| -rw-r--r-- | lib/sisu/v6/xml_sax.rb | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/lib/sisu/v6/xml_sax.rb b/lib/sisu/v6/xml_sax.rb index 88a8929b..9e236d1c 100644 --- a/lib/sisu/v6/xml_sax.rb +++ b/lib/sisu/v6/xml_sax.rb @@ -46,9 +46,6 @@ <http://www.jus.uio.no/sisu> <http://www.sisudoc.org> - * Download: - <http://www.sisudoc.org/sisu/en/SiSU/download.html> - * Git <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary> <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml.rb;hb=HEAD> @@ -83,13 +80,24 @@ module SiSU_XML_SAX end def read begin - @env,@md,@ao_array=@particulars.env,@particulars.md,@particulars.ao_array + @env, @md, @ao_arr= + @particulars.env,@particulars.md,@particulars.ao_array unless @opt.act[:quiet][:set]==:on tool=if (@opt.act[:verbose_plus][:set]==:on \ || @opt.act[:maintenance][:set]==:on) - "#{@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}" + @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.act[:verbose][:set]==:on - "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}" + @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.fno}" end (@opt.act[:verbose][:set]==:on \ @@ -110,7 +118,9 @@ module SiSU_XML_SAX SiSU_Screen::Ansi.new( @opt.act[:color_state][:set], @opt.fns, - "file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}" + 'file://' \ + + @md.file.output_path.xml_sax.dir + '/' \ + + @md.file.base_filename.xml_sax ).flow end end @@ -128,7 +138,8 @@ module SiSU_XML_SAX private class Songsheet def initialize(particulars) - @env,@md,@ao_array,@particulars=particulars.env,particulars.md,particulars.ao_array,particulars + @env, @md, @ao_arr, @particulars= + particulars.env,particulars.md,particulars.ao_array,particulars @file=SiSU_Env::FileOp.new(@md) end def song @@ -155,14 +166,15 @@ module SiSU_XML_SAX require_relative 'xhtml_shared' # decide use, whether xml rather than xhtml @@xml={ body: [], open: [], close: [], head: [] } def initialize(particulars) - @env,@md,@ao_array=particulars.env,particulars.md,particulars.ao_array + @env, @md, @ao_arr= + particulars.env,particulars.md,particulars.ao_array @vz=SiSU_Viz::Defaults.new @trans=SiSU_XML_Munge::Trans.new(@md) @sys=SiSU_Env::SystemCall.new end def songsheet pre - @data=markup(@ao_array) + @data=markup(@ao_arr) post publish end @@ -302,7 +314,7 @@ WOK @@xml[:body] << %{#{Ax[:tab]*1}<text class="verse">#{Ax[:tab]*1}} @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}} @@xml[:body] << %{#{Ax[:tab]*1}</text>} - @@xml[:body] << "#{Ax[:tab]*0}</object>" + @@xml[:body] << %{#{Ax[:tab]*0}</object>} end def code_structure(dob='') dob=@trans.markup_group(dob) |