diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-02-03 20:45:52 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-02-03 20:45:52 -0500 |
commit | 7db7a01a7d86e95159bdef47162dc180accf1acb (patch) | |
tree | 156013cdb28b483ac122c26b9f2e199c9a7d9d12 /lib/sisu/v3dv/html.rb | |
parent | debian/changelog (3.1.12-1) (diff) | |
parent | v3dv, dal +, use symbols to identify document objects type (is) and group (of) (diff) |
Merge tag 'sisu_3.1.13' into debian/sid
Diffstat (limited to 'lib/sisu/v3dv/html.rb')
-rw-r--r-- | lib/sisu/v3dv/html.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/v3dv/html.rb b/lib/sisu/v3dv/html.rb index 2c249348..ec7b0573 100644 --- a/lib/sisu/v3dv/html.rb +++ b/lib/sisu/v3dv/html.rb @@ -146,7 +146,7 @@ module SiSU_HTML @md.opt.cmd=@md.opt.cmd.gsub(/H/,'h') @md.file_type='html' if @md.opt.cmd =~/[hon]/ directories - newfilename=%{#{@env.path.output}/#{@md.fnb}/#{@md.fn[:index]}} if @md.file_type =~/html/ + newfilename=%{#{@md.file.output_path.html_scroll.dir}/#{@md.file.base_filename.html_segtoc}} if @md.file_type =~/html/ dal_array=@particulars.dal_array # dal file drawn here @tuned_file_array=SiSU_HTML_Tune::Tune.new(dal_array,@md).songsheet @tuned_file_array @@ -195,7 +195,7 @@ module SiSU_HTML format_head_scroll=SiSU_HTML_Format::HeadScroll.new(@md) @data.each do |dob| pg=dob.dup - unless pg.is =~/^code/ + unless pg.is ==:code if pg.obj =~/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})[\d*+]+ / endnote_array=[] if pg.obj=~/#{Mx[:en_a_o]}[\d*+].+?#{Mx[:en_a_c]}/m @@ -233,11 +233,11 @@ module SiSU_HTML @@firstseg=nil @@toc={ seg: [], seg_mini: [], scr: [] } @data.each do |dob| - if dob.is=='heading' \ - or dob.is=='heading_insert' + if dob.is==:heading \ + || dob.is==:heading_insert dob_toc=dob.dup - toc=if dob_toc.is =='heading' \ - or dob.is=='heading_insert' + toc=if dob_toc.is ==:heading \ + || dob.is==:heading_insert toc=case dob_toc.ln when 1; SiSU_HTML::Source::Toc.new(@md,dob_toc).level_1 when 2; SiSU_HTML::Source::Toc.new(@md,dob_toc).level_2 |