diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-05-03 19:09:54 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-05-03 19:09:54 -0400 |
| commit | 67e49a2b278b1512fb39a33a779f68a1389f9849 (patch) | |
| tree | b53682f4508b7a2a4a0c3042592b4f9f53f83975 /lib/sisu/v2/epub.rb | |
| parent | dal_numbering, heading auto-numbering, a fix (diff) | |
ansi, screen info related, arranging
Diffstat (limited to 'lib/sisu/v2/epub.rb')
| -rw-r--r-- | lib/sisu/v2/epub.rb | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/sisu/v2/epub.rb b/lib/sisu/v2/epub.rb index ecc30424..fa8b61ab 100644 --- a/lib/sisu/v2/epub.rb +++ b/lib/sisu/v2/epub.rb @@ -84,16 +84,16 @@ module SiSU_EPUB @fnb=@md.fnb @env=@particulars.env loc=@env.path.url.output_tell - tool=if @opt.cmd =~/z/; "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub" - elsif @opt.cmd =~/[MVv]/; "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub" - else @opt.fns - end unless @opt.cmd =~/q/ + tool=if @opt.cmd =~/z/; "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub" + elsif @opt.cmd =~/[MVv]/; "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub" + else @opt.fns + end @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_hi_blue \ : SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_title_hi + SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{loc}/epub/#{@fnb}.epub").flow if @opt.cmd =~/[MV]/ end - SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{loc}/epub/#{@fnb}.epub").flow if @opt.cmd =~/[MV]/ @env.path.epub_bld #(@md) @env.path.epub_cp_images(@md) dir_epub=@env.path.epub @@ -199,9 +199,7 @@ module SiSU_EPUB @tell=SiSU_Screen::Ansi.new(@md.cmd) if @md end def songsheet #extracts toc for scroll & seg - unless @md.cmd =~/q/ - SiSU_Screen::Ansi.new(@md.cmd,'Toc').txt_grey if @md.cmd =~/[MVv]/ - end + SiSU_Screen::Ansi.new(@md.cmd,'Toc').txt_grey if @md.cmd =~/[MVv]/ toc=nil @@firstseg=nil @@toc={ :seg=>[],:seg_mini=>[],:scr=>[],:ncx=>[],:opf=>[] } @@ -497,9 +495,7 @@ module SiSU_EPUB def in_common toc_shared=[] segtoc=[] - unless @md.cmd =~/q/ - SiSU_Screen::Ansi.new(@md.cmd,'Scroll & Segtoc').txt_grey if @md.cmd =~/[MVv]/ - end + SiSU_Screen::Ansi.new(@md.cmd,'Scroll & Segtoc').txt_grey if @md.cmd =~/[MVv]/ format_head_toc=SiSU_EPUB_Format::Head_toc.new(@md) dochead=format_head_toc.head dochead.gsub!(/toc\.(html)/,'doc.\1') #kludge |