diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-06-26 22:42:15 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-06-26 22:42:15 -0400 |
commit | 3faddcd7728f76626f0ae324ca3c7efac0697a85 (patch) | |
tree | 1424fcaa4fb9afaec4d5149b8a8602f5dae55eb7 /lib/sisu/v3/sysenv.rb | |
parent | debian/changelog (3.0.12-1) (diff) | |
parent | v3: documentation, on additional breaks in document, (remove some old info) (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/sysenv.rb')
-rw-r--r-- | lib/sisu/v3/sysenv.rb | 134 |
1 files changed, 93 insertions, 41 deletions
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index d0c88deb..d709cd52 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -2253,14 +2253,10 @@ WOK web_browser end def epub_viewer - if defined? @rc['program_select']['epub_viewer'] \ - and @rc['program_select']['epub_viewer'] =~/\S\S+/ - @rc['program_select']['epub_viewer'] - elsif defined? @rc['program_select']['epub_viewer'] \ - and @rc['program_select']['epub_viewer'] =~/\S\S+/ - @rc['program_select']['epub_viewer'] - else 'ebook-viewer' #'calibre' 'fbreader' - end + ((defined? @rc['program_select']['epub_viewer']) \ + && @rc['program_select']['epub_viewer'] =~/\S\S+/) \ + ? @rc['program_select']['epub_viewer'] \ + : 'ebook-viewer' #'calibre' 'fbreader' end def xml_viewer ((defined? @rc['program_select']['xml_viewer']) \ @@ -2286,6 +2282,12 @@ WOK ? @rc['program_select']['man'] \ : 'nroff -man' #'nroff -man' #'groff -man -Tascii' end + def texinfo + ((defined? @rc['program_select']['info_viewer']) \ + && @rc['program_select']['info_viewer'] =~/\S\S+/) \ + ? @rc['program_select']['info_viewer'] \ + : 'pinfo -f' #'pinfo -f' 'info' 'tkinfo' + end def file_encoding is=(defined? @rc['program_set']['file_encoding']) ? @rc['program_set']['encoding'] : '' (is.nil? || is==true) ? 'encoding' : is @@ -3262,6 +3264,12 @@ WOK fn=base_filename.manpage file=make_file(path,fn) end + def texinfo + path=output_path.texinfo.dir + make_path(path) + fn=base_filename.texinfo + file=make_file(path,fn) + end def hash_digest path=output_path.hash_digest.dir make_path(path) @@ -3457,6 +3465,24 @@ WOK end self end + def manpage + def dir + output_path.manpage.dir + '/' + base_filename.manpage + end + def rel + output_path.manpage.rel + '/' + base_filename.manpage + end + self + end + def texinfo + def dir + output_path.texinfo.dir + '/' + base_filename.texinfo + end + def rel + output_path.texinfo.rel + '/' + base_filename.texinfo + end + self + end def manifest def dir output_path.manifest.dir + '/' + base_filename.manifest @@ -3614,11 +3640,19 @@ WOK pdf_l + @md.fn[:pdf_l_legal] end def manpage - ft='.1' + ft='1' if @env.output_dir_structure.by_language_code? - @md.fnb + ft + @md.fnb + '.' + ft else - @md.fnb + @md.lang_code_insert + ft + @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft + end + end + def texinfo + ft='info' + if @env.output_dir_structure.by_language_code? + @md.fnb + '.' + ft + else + @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft end end def hash_digest @@ -3692,9 +3726,9 @@ WOK end def ab_src if @env.output_dir_structure.by_language_code? - "#{output_path.base.url}/#{@ft}/#{@md.opt.lng}" + "#{output_path.base.dir}/#{@ft}/#{@md.opt.lng}" else - "#{output_path.base.url}/#{@ft}" + "#{output_path.base.dir}/#{@ft}" end end self @@ -3718,9 +3752,9 @@ WOK end def ab_src if @env.output_dir_structure.by_language_code? - "#{output_path.base.dir}/#{@ft}/#{@md.opt.lng}" + "#{output_path.base.url}/#{@ft}/#{@md.opt.lng}" else - "#{output_path.base.dir}/#{@ft}" + "#{output_path.base.url}/#{@ft}" end end self @@ -3744,7 +3778,7 @@ WOK end def ab_src if @env.output_dir_structure.by_language_code? - "#{@ft}/#{@md.opt.lng}" + "../../#{@ft}/#{@md.opt.lng}" else "#{@ft}" end @@ -3828,24 +3862,6 @@ WOK end self end - def sisupod - def dir - "#{output_path.base.dir}/pod" - end - def url - "#{output_path.base.url}/pod" - end - def rel - "#{output_path.base.rel}/pod" - end - def rcp - "#{output_path.base.rcp}/pod" - end - def rel_sm - #"#{output_path.base.rel}/pod" - end - self - end def sisugit def dir "#{output_path.base.dir}/git" @@ -3895,6 +3911,27 @@ WOK end self end + def sisupod + def ft + Gt[:src] + '/' + Gt[:pod] + end + def dir + set_path(ft).dir.ab_src + end + def url + set_path(ft).url.ab_src + end + def rel + set_path(ft).rel.ab_src + end + def rcp + set_path(ft).rcp.ab_src + end + def rel_sm + #"#{output_path.base.rel}/pod" + end + self + end def po def dir "#{output_path.base.dir}/po4a/#{@md.fnb}/po/#{@md.opt.lng}" @@ -4224,13 +4261,28 @@ WOK set_path(ft).rcp.ab end def rel_sm - if @env.output_dir_structure.by_language_code? - '' - elsif @env.output_dir_structure.by_filetype? - '' - else - '' - end + set_path(ft).rel_sm.ab + end + self + end + def texinfo + def ft + 'texinfo' + end + def dir + set_path(ft).dir.ab + end + def url + set_path(ft).url.ab + end + def rel + set_path(ft).rel.ab + end + def rcp + set_path(ft).rcp.ab + end + def rel_sm + set_path(ft).rel_sm.ab end self end |