From 965fe1f68c5fb8814a5d5ab0286282ff71a63ace Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 28 May 2012 03:53:23 -0400
Subject: v3: code headers mainly copyright

---
 lib/sisu/v3/param.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index 0f721468..d8aa3e8a 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -7,7 +7,8 @@
 
  * Author: Ralph Amissah
 
- * Copyright: (C) 1997 - 2012, Ralph Amissah, All Rights Reserved.
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -33,9 +34,7 @@
    <http://www.fsf.org/licensing/licenses/gpl.html>
    <http://www.gnu.org/licenses/gpl.html>
 
-   <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
-   <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
-   <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
+   <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
 
  * SiSU uses:
    * Standard SiSU markup syntax,
@@ -47,7 +46,7 @@
    <http://www.sisudoc.org>
 
  * Download:
-   <http://www.jus.uio.no/sisu/SiSU/download.html>
+   <http://www.sisudoc.org/sisu/en/SiSU/download.html>
 
  * Ralph Amissah
    <ralph@amissah.com>
-- 
cgit v1.2.3


From ba278b927a8127efaa27725ca2bcb416a2c5d25d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 28 May 2012 04:28:52 -0400
Subject: v3: options, command line control of output directory structure

* --output-by-language; --output-by-filetype; --output-by-filename, or
  --by-language; --by-filetype; --by-filename
---
 lib/sisu/v3/param.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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

diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index d8aa3e8a..77b4e8e7 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -1063,9 +1063,16 @@ module SiSU_Param
         @flv,@lang,@seg_names,@tags,@tag_array,@tag_a,@ec[:image],@ec[:audio],@ec[:multimedia]=Array.new(9){[]}
         @authors,@topic_register_array,@papersize_array=[],[],[]
         @lvs=[nil,0,0,0,0,0,0]
-        @lang_code_insert=(@opt.dir_structure_by ==:language) \
-        ? ''
-        : ".#{@opt.lng}"
+        @lang_code_insert=if @opt.act[:output_by][:set]==:language
+          ''
+        elsif @opt.act[:output_by][:set]==:filetype \
+        or @opt.act[:output_by][:set]==:filename
+          ".#{@opt.lng}"
+        elsif @opt.dir_structure_by ==:language
+          ''
+        else
+          ".#{@opt.lng}"
+        end
         @rgx_image=/(?:^|[^_\\])\{(?:\s*|\~\^\s+)(\S+?\.(?:png|jpg|gif)\b)/m
         @rgx_audio=/\{\s*(\S+?\.(?:mp3|ogg))/
         @rgx_mm=/\{\s*(\S+?\.(?:ogg|mpeg))/ #expand and distinguish ogg
-- 
cgit v1.2.3


From 45a35b75f4196bbf30e65b64b4463ab4fb620846 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 28 May 2012 05:25:04 -0400
Subject: v3: sisupod.txz processing

* BUG image copying/processing for sisupod
---
 lib/sisu/v3/param.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index 77b4e8e7..f1c4aa3a 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -90,6 +90,7 @@ module SiSU_Param
       and @opt.f_pth[:pth] != Dir.pwd #BUG check
         # you may need to change Dir.pwd to @opt.f_pth[:pth] where the latter
         # has a path value that is different, however, f_pth is not always set!
+        Dir.chdir(@opt.f_pth[:pth])
         p '-- bug alert -- '
         p __FILE__ + ':' + __LINE__.to_s
         p 'f_pth ' + @opt.f_pth[:pth]
@@ -1076,6 +1077,7 @@ module SiSU_Param
         @rgx_image=/(?:^|[^_\\])\{(?:\s*|\~\^\s+)(\S+?\.(?:png|jpg|gif)\b)/m
         @rgx_audio=/\{\s*(\S+?\.(?:mp3|ogg))/
         @rgx_mm=/\{\s*(\S+?\.(?:ogg|mpeg))/ #expand and distinguish ogg
+        Dir.chdir(@opt.f_pth[:pth])
         begin
         rescue
           SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@fns).error do
@@ -1469,7 +1471,6 @@ module SiSU_Param
         end
         @papersize_array=@papersize.scan(/(?:a4|letter|legal|book|a5|b5)/i)
         fn=@opt.fno #decide what to do a filesize on .ssm tells very little about actual document size
-        #fn=@fns=~/\.ssm\.sst$/ ? @fns.gsub(/.sst/,'') : @fns #decide what to do a filesize on .ssm tells very little about actual document size
         @filesize=(File.size(fn)).to_s
         if @sys.openssl !=false
           skin=@doc_skin \
-- 
cgit v1.2.3