aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v5/manpage.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-10-23 23:59:57 -0400
committerRalph Amissah <ralph@amissah.com>2013-10-23 23:59:57 -0400
commit8605801052c23ea408951b4d4054cb90d9caf1f6 (patch)
treeee82b5108ccc570222ba3f0fd72418a85ca70344 /lib/sisu/v5/manpage.rb
parentdebian/changelog (4.2.7-1) (diff)
parentv4 v5: dal, collapsed levels implemented (diff)
Merge tag 'sisu_4.2.8' into debian/sid
SiSU 4.2.8
Diffstat (limited to 'lib/sisu/v5/manpage.rb')
-rw-r--r--lib/sisu/v5/manpage.rb17
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index dc0d6203..3e430b55 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -85,14 +85,21 @@ module SiSU_Manpage
begin
@md=SiSU_Param::Parameters.new(@opt).get
@env=SiSU_Env::InfoEnv.new(@opt.fns)
- tool=(@opt.cmd =~/[MVv]/) \
+ tool=(@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on) \
? "#{@env.program.text_editor} #{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}"
: "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
- @opt.cmd=~/[MVvz]/ \
+ (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on) \
&& @opt.cmd !~/q/ \
- ? SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_hi_blue
- : SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_title_hi
- SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").flow if @opt.cmd =~/[MV]/
+ ? SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Manpage',tool).green_hi_blue
+ : SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Manpage',tool).green_title_hi
+ if (@opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").flow
+ end
@dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet
rescue