From fed01af686fb007454eafff9127b16a6516b50c0 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 17 Jun 2012 22:38:31 -0400
Subject: v3: shared_sisupod_source, common build for sisu (markup) source
 representations

* to be used by sisupod.txz, git, (and src)
  * sisupod_make (--sisupod)
  * share_source (--source)
  NOTE not used git at present
* changed representation of shared sisu source, include related files in
  directory rather than just markup file [reason for version bump]
  NOTE there are no changes to sisu markup (only the sharing of source files)
---
 lib/sisu/v3/urls.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/sisu/v3/urls.rb')

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)
-- 
cgit v1.2.3