Merge tag 'sisu_4.0.6' into debian/sid

6 files changed, 124 insertions, 24 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 81ccd058..9cd95b77 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -29,6 +29,14 @@ v1 branch is removed; it is available in sisu =< 2.7
 
 %% Reverse Chronological:
 
+%% 3.3.9.orig.tar.xz (2013-02-06:05/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.9
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.9.orig.tar.xz
+  sisu_3.3.9.orig.tar.xz
+  sisu_3.3.9-1.dsc
+
+* v3: utils (debug renamed), Utils::CodeMarker (from Debug::Mark)
+
 %% 3.3.8.orig.tar.xz (2013-02-03:04/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.8
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.8.orig.tar.xz
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 739b4ba5..8be362c4 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -17,6 +17,46 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.0.6.orig.tar.xz (2013-02-07:05/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.6
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.6-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.6.orig.tar.xz
+  sisu_4.0.6.orig.tar.xz
+  sisu_4.0.6-1.dsc
+
+* v4: html, screen reporting for --html-scroll, correctly identify output file
+
+* v4: pdf
+  * pdf (options, hub, urls), orientation, portrait & landscape optionally
+    discrete, individually callable
+    * --pdf-l (--pdf-landscape), --pdf-p (--pdf-portrait)
+    * sisu latex output & xetex generation
+  * pdf (options, param), papersize, command-line options to override sisurc
+    settings, [a4,a5,b5,letter,legal] when --pdf* used:
+    * --papersize-a4 --papersize-letter (also --a4 --letter)
+    * --papersize=a4,letter
+    * --pdf-a4 --pdf-letter (for portrait only --pdf-p-a4 --pdf-p-letter)
+      [orientation & papersize options are set independently so calling
+      --pdf-p-a4 & --pdf-l-letter would result in landscapes and portraits of
+      both a4 & letter (rather than an individual request for a portrait A4 & a
+      landscape letter size)]
+  * texpdf, cosmetic code
+
+* v4: utils (debug renamed)
+  * SiSU_Utils::CodeMarker (from Debug::Mark)
+  * SiSU_Utils::Path.new.base_markup provides base markup directory that
+    contains sisu markup files, any language sub-directories (with sisu markup
+    files) and sisu resource configuration sub-directory, if any (./_sisu)
+    (identifies when needed in runtime)
+
+* v4: sysenv, webserv dir (output dir), ensure it is determined from base markup
+    dir where relative path provided (remove possibility of it being done from a
+    language sub-directory), fix
+
+* v4: documentation
+  * sisu_manual/sisu_commands
+  * manpage & html
+
 %% 4.0.5.orig.tar.xz (2013-02-03:04/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.5
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.5-1
@@ -24,7 +64,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.5.orig.tar.xz
   sisu_4.0.5.orig.tar.xz
   sisu_4.0.5-1.dsc
 
-* v4: html (urls), scroll & seg optionally discrete, individually callable
+* v4: html (options, hub, urls), scroll & seg optionally discrete, individually
+    callable
   * --html (both), --html-scroll, --html-seg
   * [possibly of interest where only one form of html of interest for use &/or
      to cut generation time (roughly to 63% for --html-scroll only)]
diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html
index 2063c021..3d852a3e 100644
--- a/data/doc/sisu/html/sisu.1.html
+++ b/data/doc/sisu/html/sisu.1.html
@@ -365,9 +365,6 @@ invoked by --dump &amp; redirect). </dd>
 <dt><b>--keep-processing-files [filename/wildcard/url]</b> </dt>
 <dd>see --maintenance </dd>
 
-<dt><b>-L</b> </dt>
-<dd>prints license information. </dd>
-
 <dt><b>-M [filename/wildcard/url]</b> </dt>
 <dd>see --maintenance </dd>
 
@@ -429,18 +426,57 @@ Alias --by-* </dd>
 [filename/wildcard]</b> </dt>
 <dd>see --pdf </dd>
 
+<dt><b>--papersize-(a4|a5|b5|letter|legal)</b> </dt>
+<dd>in conjunction
+with --pdf set pdf papersize, overriding any configuration settings, to set
+more than one papersize repeat the option --pdf --papersize-a4 --papersize-letter.
+See also --papersize=*
+<p>
+<p> <b>--papersize=a4,a5,b5,letter,legal</b> in conjunction
+with --pdf set pdf papersize, overriding any configuration settings, to set
+more than one papersize list after the equal sign with a comma separator
+--papersize=a4,letter. See also --papersize-* </dd>
+
 <dt><b>--pdf [filename/wildcard]</b> </dt>
 <dd>produces <i>LaTeX</i> pdf
-(portrait.pdf &amp; landscape.pdf). Default paper size is set in config file, or
-document header, or provided with additional command line parameter, e.g.
---papersize-a4 preset sizes include: &rsquo;A4&rsquo;, U.S. &rsquo;letter&rsquo; and &rsquo;legal&rsquo; and book sizes
-&rsquo;A5&rsquo; and &rsquo;B5&rsquo; (system defaults to A4). Alias -p </dd>
-
-<dt><b>--pg [instruction] [filename]</b> </dt>
-<dd>database
-<i>PostgreSQL</i> ( --pgsql may be used instead) possible instructions, include:
---createdb; --create; --dropall; --import [filename]; --update [filename]; --remove
-[filename]; see database section below. Alias -D </dd>
+(portrait.pdf &amp; landscape.pdf). Orientation and papersize may be
+set on the command-line. Default paper size is set in config file, or document
+header, or provided with additional command line parameter, e.g. --papersize-a4
+preset sizes include: &rsquo;A4&rsquo;, U.S. &rsquo;letter&rsquo; and &rsquo;legal&rsquo; and book sizes &rsquo;A5&rsquo; and &rsquo;B5&rsquo;
+(system defaults to A4), and; --landscape or --portrait, so: e.g. "sisu --pdf-a4
+--pdf-letter --landscape --verbose [filename/wildcard]" or "sisu --pdf --landscape
+--a4 --letter --verbose [filename/wildcard]". --pdf defaults to both landscape &amp;
+portrait output, and a4 if no other papersizes are configured. Related options
+--pdf-landscape --pdf-portrait --pdf-papersize-* --pdf-papersize=[list]. Alias -p </dd>
+
+<dt><b>--pdf-l
+[filename/wildcard]</b> </dt>
+<dd>See --pdf-landscape </dd>
+
+<dt><b>--pdf-landscape [filename/wildcard]</b> </dt>
+<dd>sets
+orientation, produces <i>LaTeX</i> pdf landscape.pdf. Default paper size is set
+in config file, or document header, or provided with additional command
+line parameter, e.g. --papersize-a4 preset sizes include: &rsquo;A4&rsquo;, U.S. &rsquo;letter&rsquo; and
+&rsquo;legal&rsquo; and book sizes &rsquo;A5&rsquo; and  --papersize-* or --papersize=[list]. Alias --pdf-l
+or in conjunction with --pdf --landscape </dd>
+
+<dt><b>--pdf-p [filename/wildcard]</b> </dt>
+<dd>See --pdf-portrait
+</dd>
+
+<dt><b>--pdf-portrait [filename/wildcard]</b> </dt>
+<dd>sets orientation, produces <i>LaTeX</i> pdf portrait.pdf.pdf.
+Default paper size is set in config file, or document header, or provided
+with additional command line parameter, e.g. --papersize-a4 preset sizes include:
+&rsquo;A4&rsquo;, U.S. &rsquo;letter&rsquo; and &rsquo;legal&rsquo; and book sizes &rsquo;A5&rsquo; and  --papersize-* or --papersize=[list].
+Alias --pdf-p or in conjunction with --pdf --portrait </dd>
+
+<dt><b>--pg [instruction] [filename]</b>
+</dt>
+<dd>database <i>PostgreSQL</i> ( --pgsql may be used instead) possible instructions,
+include: --createdb; --create; --dropall; --import [filename]; --update [filename];
+--remove [filename]; see database section below. Alias -D </dd>
 
 <dt><b>--po [language_directory/filename
 language_directory]</b> </dt>
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_commands.sst b/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_commands.sst
index 86f818f6..1c5c1cec 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_commands.sst
@@ -169,9 +169,6 @@ see --color-off
 !_ --keep-processing-files [filename/wildcard/url] \\
 see --maintenance
 
-!_ -L \\
-prints license information.
-
 !_ -M [filename/wildcard/url] \\
 see --maintenance
 
@@ -218,8 +215,26 @@ see --po4a
 !_ -p [filename/wildcard] \\
 see --pdf
 
+!_ --papersize-(a4|a5|b5|letter|legal) \\
+in conjunction with --pdf set pdf papersize, overriding any configuration settings, to set more than one papersize repeat the option --pdf --papersize-a4 --papersize-letter. See also --papersize=*
+
+!_ --papersize=a4,a5,b5,letter,legal
+in conjunction with --pdf set pdf papersize, overriding any configuration settings, to set more than one papersize list after the equal sign with a comma separator --papersize=a4,letter. See also --papersize-*
+
 !_ --pdf [filename/wildcard] \\
-produces LaTeX pdf (portrait.pdf & landscape.pdf). Default paper size is set in config file, or document header, or provided with additional command line parameter, e.g. --papersize-a4 preset sizes include: 'A4', U.S. 'letter' and 'legal' and book sizes 'A5' and 'B5' (system defaults to A4). Alias -p
+produces LaTeX pdf (portrait.pdf & landscape.pdf). Orientation and papersize may be set on the command-line. Default paper size is set in config file, or document header, or provided with additional command line parameter, e.g. --papersize-a4 preset sizes include: 'A4', U.S. 'letter' and 'legal' and book sizes 'A5' and 'B5' (system defaults to A4), and; --landscape or --portrait, so: e.g. "sisu --pdf-a4 --pdf-letter --landscape --verbose [filename/wildcard]" or "sisu --pdf --landscape --a4 --letter --verbose [filename/wildcard]". --pdf defaults to both landscape & portrait output, and a4 if no other papersizes are configured. Related options --pdf-landscape --pdf-portrait --pdf-papersize-* --pdf-papersize=[list]. Alias -p
+
+!_ --pdf-l [filename/wildcard] \\
+See --pdf-landscape
+
+!_ --pdf-landscape [filename/wildcard] \\
+sets orientation, produces LaTeX pdf landscape.pdf. Default paper size is set in config file, or document header, or provided with additional command line parameter, e.g. --papersize-a4 preset sizes include: 'A4', U.S. 'letter' and 'legal' and book sizes 'A5' and 'B5' (system defaults to A4). Related options --pdf --pdf-portrait. See also --papersize-* or --papersize=[list]. Alias --pdf-l or in conjunction with --pdf --landscape
+
+!_ --pdf-p [filename/wildcard] \\
+See --pdf-portrait
+
+!_ --pdf-portrait [filename/wildcard] \\
+sets orientation, produces LaTeX pdf portrait.pdf.pdf. Default paper size is set in config file, or document header, or provided with additional command line parameter, e.g. --papersize-a4 preset sizes include: 'A4', U.S. 'letter' and 'legal' and book sizes 'A5' and 'B5' (system defaults to A4). Related options --pdf --pdf-landscape. See also --papersize-* or --papersize=[list]. Alias --pdf-p or in conjunction with --pdf --portrait
 
 !_ --pg [instruction] [filename] \\
 database PostgreSQL ( --pgsql may be used instead) possible instructions, include: --createdb; --create; --dropall; --import [filename]; --update [filename]; --remove [filename]; see database section below. Alias -D
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 7c0f9b6d..a69a13bb 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.3.8
-:date_stamp: 2013w04/7
-:date: "2013-02-03"
+:version: 3.3.9
+:date_stamp: 2013w05/3
+:date: "2013-02-06"
 :project: SiSU
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index a81c8c01..564c26c3 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.0.5
-:date_stamp: 2013w04/7
-:date: "2013-02-03"
+:version: 4.0.6
+:date_stamp: 2013w05/4
+:date: "2013-02-07"
 :project: SiSU