diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-06-17 22:55:11 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-06-17 22:55:11 -0400 |
commit | 2970a5d30e3d59f60af9f96c258c84d138027e07 (patch) | |
tree | d2e972aebae388b847576ce368cf41ef80672840 /lib/sisu/v3/urls.rb | |
parent | debian/changelog (3.2.12-1) (diff) | |
parent | v3: shared_sisupod_source, common build for sisu (markup) source representations (diff) |
Merge tag 'sisu_3.3.0' into debian/sid
Diffstat (limited to 'lib/sisu/v3/urls.rb')
-rw-r--r-- | lib/sisu/v3/urls.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index 29c2f791..1dcf988f 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -90,10 +90,6 @@ module SiSU_Urls @fn=SiSU_Env::EnvCall.new(@opt.fns).lang(fn_set_lang[:c]) @m_regular=/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/ @prog=@env.program - source=if @opt.fns =~/\.sst$/; @opt.fns - elsif @opt.fns =~/\.ssm\.sst/; "#{@fnb}.ssm.sst" - else 'not recognised file' - end @u ||= { 'b --xhtml (XHTML)'=>@fn[:xhtml], 'D[iu] --psql (DBI import/update postgresql)'=>'dbi psql', @@ -111,7 +107,7 @@ module SiSU_Urls 'p --pdf (PDF landscape)'=>@fn[:pdf_l], 'p --pdf (PDF portrait)'=>@fn[:pdf_p], 'E --profile (Ruby profiler)'=>'profile', - 's --source (sisu markup)'=>source, + 's --source (sisu markup)'=>@opt.fno, 'S --sisupod (sisupod)'=>@fn[:sisupod], 't --txt (Plain-text (endnotes))'=>@fn[:plain], 'x --xml-sax (XML sax type)'=>@fn[:sax], @@ -361,7 +357,7 @@ module SiSU_Urls end if x=~/--sisupod\b/ \ and @opt.act[:sisupod][:set]==:on - (@opt.fns =~/\.ssm\.sst$/) \ + (@opt.fno =~/\.ssm$/) \ ? y.gsub(/(?:\~\S{2,3})?(\.ssm.sst\.txz)$/,'.ssm.txz') : y.gsub(/(?:\~\S{2,3})?(\.sst\.txz)$/,'\1') show.source.pod(x,y) |