From f6f89c95513d33f60cdfaedce19c4de3f45dd387 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 26 Jun 2011 15:59:13 -0400
Subject: v3: sysenv, fix some output paths (markup source); accommodate
 manpage

* shared source markup (.sst .ssm & sisupod.zip) fix some paths
  * placement of markup source, output_path.src.dir, fix
  * output_path.src.url, fix
* manifest info
* (epub viewer cosmetic rearrangement)
---
 data/doc/sisu/CHANGELOG_v3 |  5 ++++
 lib/sisu/v3/sysenv.rb      | 61 +++++++++++++++++++++++-----------------------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 23f078c6..f02f7bac 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -53,8 +53,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz
     * info tool setting prompt
 
   * sysenv, accomodate
+    * manifest
     * manpage
     * info (texinfo)
+    * sisupod
+    * shared source markup (.sst .ssm & sisupod.zip) fix some paths
+      * placement of markup source, output_path.src.dir, fix
+      * output_path.src.url, fix
 
   * constants, a sisupod & an xml related addition
 
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index e89d77c5..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']) \
@@ -3730,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
@@ -3756,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
@@ -3782,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
@@ -3866,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"
@@ -3933,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}"
-- 
cgit v1.2.3