diff options
| -rw-r--r-- | conf/sisu/sisurc.yml | 3 | ||||
| -rw-r--r-- | data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml | 3 | ||||
| -rw-r--r-- | lib/sisu/v0/sysenv.rb | 6 | ||||
| -rw-r--r-- | lib/sisu/v0/urls.rb | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/conf/sisu/sisurc.yml b/conf/sisu/sisurc.yml index c5409774..3ed56c96 100644 --- a/conf/sisu/sisurc.yml +++ b/conf/sisu/sisurc.yml @@ -103,10 +103,11 @@ program_set: #program_select: # editor: 'gvim -c :R -c :S' # pdf_viewer: 'evince' -# web_browser: 'kazehakase' #'galeon' +# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase' # console_www_browser: 'links2' #'elinks' # odf_viewer: 'oowriter' # xml_viewer: 'xml-viewer' +# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man' #promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby #search: # sisu: diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml index 876c338a..c54594ca 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml @@ -107,10 +107,11 @@ program_set: program_select: editor: 'gvim -c :R' pdf_viewer: 'evince' - web_browser: 'kazehakase' + web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase' console_web_browser: 'links2' odf_viewer: 'oowriter' xml_viewer: 'xml-viewer' + man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man' #promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby search: sisu: diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 58ad1bf8..8bf805be 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -1596,6 +1596,12 @@ WOK else 'oowriter' #'odf-viewer','oowriter' end end + def manpage_generator + if defined? @rc['program_select']['man'] and @rc['program_select']['man'] =~/\S\S+/ + @rc['program_select']['man'] + else 'nroff -man' #'nroff -man' #'groff -man -Tascii' + end + end def file_encoding #file encoding is='' if defined? @rc['program_set']['file_encoding']; is=@rc['program_set']['encoding'] diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb index 5d5d8795..7f087b95 100644 --- a/lib/sisu/v0/urls.rb +++ b/lib/sisu/v0/urls.rb @@ -95,6 +95,7 @@ module SiSU_urls @console_browser=@env.program.console_web_browser @pdf_viewer=@env.program.pdf_viewer @odf_viewer=@env.program.odf_viewer + @manpage_gen=@env.program.manpage_generator source=if @opt.fns =~/\.sst$/; @opt.fns elsif @opt.fns =~/\._sst/; "#@fnb.composite.sst" else 'not recognised file' @@ -206,7 +207,7 @@ module SiSU_urls @opt.cmd.gsub!(/d[iu]/,'') end if x=~/^i/ and @opt.cmd =~/i/ - tell=SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","nroff -man #{@path.path.manpage}/#@fnb.1 |most") + tell=SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#@manpage_gen #{@path.path.manpage}/#@fnb.1 |most") tell.result unless @opt.cmd =~/q/ @opt.cmd.gsub!(/I/,'') end |