diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-05-12 19:30:03 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-05-12 19:30:03 -0400 |
| commit | 5774f08063724011fc90eaa7627e6f8660bc690e (patch) | |
| tree | e8f7be4187ab6ee99d34f9863777b22e02d90e51 /lib/sisu/v3/xhtml.rb | |
| parent | debian/changelog (3.2.7-1) (diff) | |
| parent | v3: sisupod make, re-fixed, check again (diff) | |
Merge tag 'sisu_3.2.8' into debian/sid
Diffstat (limited to 'lib/sisu/v3/xhtml.rb')
| -rw-r--r-- | lib/sisu/v3/xhtml.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/sisu/v3/xhtml.rb b/lib/sisu/v3/xhtml.rb index c537275c..9aa8f107 100644 --- a/lib/sisu/v3/xhtml.rb +++ b/lib/sisu/v3/xhtml.rb @@ -87,7 +87,7 @@ module SiSU_XHTML "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}" elsif @opt.cmd =~/v/ "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}" - else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" + else "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}" end @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize @@ -95,7 +95,10 @@ module SiSU_XHTML SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"/#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}").flow if @opt.cmd =~/[MV]/ end SiSU_XHTML::Source::Songsheet.new(@particulars).song - rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error + rescue + SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do + __LINE__.to_s + ':' + __FILE__ + end ensure end end @@ -110,7 +113,10 @@ module SiSU_XHTML SiSU_XHTML::Source::Scroll.new(@particulars).songsheet SiSU_XHTML::Source::Tidy.new(@md,@file.place_file.xhtml.dir).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use SiSU_Rexml::Rexml.new(@md,@file.place_file.xhtml.dir).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug - rescue; SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error + rescue + SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do + __LINE__.to_s + ':' + __FILE__ + end ensure end end |