aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v2/concordance.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-05-03 19:09:54 -0400
committerRalph Amissah <ralph@amissah.com>2010-05-03 19:09:54 -0400
commit67e49a2b278b1512fb39a33a779f68a1389f9849 (patch)
treeb53682f4508b7a2a4a0c3042592b4f9f53f83975 /lib/sisu/v2/concordance.rb
parentdal_numbering, heading auto-numbering, a fix (diff)
ansi, screen info related, arranging
Diffstat (limited to 'lib/sisu/v2/concordance.rb')
-rw-r--r--lib/sisu/v2/concordance.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/sisu/v2/concordance.rb b/lib/sisu/v2/concordance.rb
index 3546b002..d8da2005 100644
--- a/lib/sisu/v2/concordance.rb
+++ b/lib/sisu/v2/concordance.rb
@@ -76,8 +76,8 @@ module SiSU_Concordance
begin
@env,@md=@particulars.env,@particulars.md
loc=@env.url.output_tell
- tool=(@md.cmd =~/[MVv]/) ? "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:concordance]}" : @md.fns
unless @md.cmd =~/q/
+ tool=(@md.cmd =~/[MVv]/) ? "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:concordance]}" : @md.fns
@md.cmd=~/[MVvz]/ \
? SiSU_Screen::Ansi.new(@md.cmd,"Concordance",tool).grey_title_hi \
: SiSU_Screen::Ansi.new(@md.cmd,'Concordance',tool).green_title_hi
@@ -87,12 +87,10 @@ module SiSU_Concordance
if @md.wc_words < wordmax
SiSU_Concordance::Source::Words.new(@particulars).songsheet
else
- tell=SiSU_Screen::Ansi.new(@md.cmd,"concordance skipped, large document has over #{wordmax} words (#{@md.wc_words})")
- tell.warn unless @md.cmd =~/q/
+ SiSU_Screen::Ansi.new(@md.cmd,"concordance skipped, large document has over #{wordmax} words (#{@md.wc_words})").warn unless @md.cmd =~/q/
end
else
- tell=SiSU_Screen::Ansi.new(@md.cmd,"wc (word count) is off, concordance will be processed for all files including those over the max set size of: #{wordmax} words")
- tell.warn unless @md.cmd =~/q/
+ SiSU_Screen::Ansi.new(@md.cmd,"wc (word count) is off, concordance will be processed for all files including those over the max set size of: #{wordmax} words").warn unless @md.cmd =~/q/
SiSU_Concordance::Source::Words.new(@particulars).songsheet
end
rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
@@ -334,8 +332,7 @@ WOK
end
credits=@vz.credits_sisu
@file_concordance << %{</div><div class="content">#{credits}<div></body>\n</html>} # footer
- tell=SiSU_Screen::Ansi.new(@md.cmd,@md.fns,"#{@env.path.output_tell}/#{@md.fn[:concordance]}")
- tell.flow if @md.cmd =~/[MV]/
+ SiSU_Screen::Ansi.new(@md.cmd,@md.fns,"#{@env.path.output_tell}/#{@md.fn[:concordance]}").flow if @md.cmd =~/[MV]/
end
end
end