diff -Nru sisu-3.1.5/CHANGELOG_v3 sisu-3.1.8/CHANGELOG_v3
--- sisu-3.1.5/CHANGELOG_v3 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/CHANGELOG_v3 2011-12-14 03:08:36.000000000 +0000
@@ -13,13 +13,74 @@
%% Development branch UNSTABLE
v3 branch once stable will supersede & replace current stable v2 branch
+%% 3.1.8.orig.tar.xz (2011-12-13:50/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.8
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.8-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.8.orig.tar.xz
+ sisu_3.1.8.orig.tar.xz
+ sisu_3.1.8-1.dsc
+ sisu_3.1.8-1.debian.tar.gz
+
+ * texpdf, output by filetype, fix, produce pdf files with language code as
+ part of filename (previously written over)
+
+ * odf:odt, codeblocks, a match fix, affects e.g. "<<"
+
+%% 3.1.7.orig.tar.xz (2011-12-08:49/4)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.7
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.7-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.7.orig.tar.xz
+ 26d1159304c0874240e2244842f671555b67d7db07dc0122ee81a44f4b05e8e4 1649336 sisu_3.1.7.orig.tar.xz
+ 9f500794d809bc0f69dc0d0a06f610a652d67a678980fa22337af4b7f14b1284 1382 sisu_3.1.7-1.dsc
+ 3a862f6993b2dd7aa970d654684d3ffe907b83b27b86455aec9f5ca077f8a7d5 290465 sisu_3.1.7-1.debian.tar.gz
+
+ * dal, codeblocks
+ * internal document identifier tags removed, consider
+ * markup of greater than & less than, fix (but watch)
+
+ * epub, css, codeblock, grey box
+
+ * texpdf, use package listings for box around codeblocks (retain boites
+ option)
+
+ * sysenv, external images directory copied only if it exists
+
+ * documentation, add --configure & use ascii characters for dir tree
+ correction of a few typos
+ * manpage
+ * html
+
+%% 3.1.6.orig.tar.xz (2011-12-02:48/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.6
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.6-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.6.orig.tar.xz
+ c50fd6eda712ae090e9b16242d468aab8b8ecd6c1ee9b2798b317f9eb40b529c 1647512 sisu_3.1.6.orig.tar.xz
+ d5a165144d55d553e62c7fcee3b881d6525f238cc5184f284955307a955efb56 1382 sisu_3.1.6-1.dsc
+ 8e088fc702158a233d870e1b55928063d8e52b5931a51b5143b674052335793e 290179 sisu_3.1.6-1.debian.tar.gz
+
+ * dal, codeblocks, start flush left (no buffer spaces at start of line) to
+ allow cut & paste [requested by chals irc.oftc] (fixed issue, numbering of
+ (flush left) codeblocks; preliminary tests suggest this should be ok), need
+ distinguishing marks for plaintext (& fix grey background in xetex/pdfs)
+
+ * texpdf, use boites for box around codeblocks, use and adapt 'boitecoloriee'
+ (found in boites_examples.sty)
+ * in boitebox as setup normal tex hardspaces at start of line are removed,
+ hack required to fix
+ * [attempt to reconfigure boitebox: as setup normal tex hardspaces at start
+ of line are removed;backround color not set (incompatible);keep box once
+ background color is set?;remove first line indent of paragraph?]
+
+ * require iconv (depreciated), use String#encode instead
+ * removed iconv, required a number of places without being used, watch
+
%% 3.1.5.orig.tar.xz (2011-11-21:47/1)
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.5
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.5.orig.tar.xz
- sisu_3.1.5.orig.tar.xz
- sisu_3.1.5-1.dsc
- sisu_3.1.5-1.debian.tar.gz
+ 2d4c5320f526fb69165326f83babd7e96c8b553fbebe9c6dfe851d78f750e26b 1646676 sisu_3.1.5.orig.tar.xz
+ 0a3080b9f5368d6d55449cdcd38b9f7b4b6360f415a130b328c9b58cfc911343 1382 sisu_3.1.5-1.dsc
+ 3b945c9463725421c7398cda283fe94076e7b587b3cf1e06ad75c98b57fff744 290044 sisu_3.1.5-1.debian.tar.gz
* images, embedded symbol (previously overlooked, pre use of utf-8)
* param, sisu markup image regex match
diff -Nru sisu-3.1.5/data/doc/sisu/CHANGELOG_v3 sisu-3.1.8/data/doc/sisu/CHANGELOG_v3
--- sisu-3.1.5/data/doc/sisu/CHANGELOG_v3 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/data/doc/sisu/CHANGELOG_v3 2011-12-14 03:08:36.000000000 +0000
@@ -13,13 +13,74 @@
%% Development branch UNSTABLE
v3 branch once stable will supersede & replace current stable v2 branch
+%% 3.1.8.orig.tar.xz (2011-12-13:50/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.8
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.8-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.8.orig.tar.xz
+ sisu_3.1.8.orig.tar.xz
+ sisu_3.1.8-1.dsc
+ sisu_3.1.8-1.debian.tar.gz
+
+ * texpdf, output by filetype, fix, produce pdf files with language code as
+ part of filename (previously written over)
+
+ * odf:odt, codeblocks, a match fix, affects e.g. "<<"
+
+%% 3.1.7.orig.tar.xz (2011-12-08:49/4)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.7
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.7-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.7.orig.tar.xz
+ 26d1159304c0874240e2244842f671555b67d7db07dc0122ee81a44f4b05e8e4 1649336 sisu_3.1.7.orig.tar.xz
+ 9f500794d809bc0f69dc0d0a06f610a652d67a678980fa22337af4b7f14b1284 1382 sisu_3.1.7-1.dsc
+ 3a862f6993b2dd7aa970d654684d3ffe907b83b27b86455aec9f5ca077f8a7d5 290465 sisu_3.1.7-1.debian.tar.gz
+
+ * dal, codeblocks
+ * internal document identifier tags removed, consider
+ * markup of greater than & less than, fix (but watch)
+
+ * epub, css, codeblock, grey box
+
+ * texpdf, use package listings for box around codeblocks (retain boites
+ option)
+
+ * sysenv, external images directory copied only if it exists
+
+ * documentation, add --configure & use ascii characters for dir tree
+ correction of a few typos
+ * manpage
+ * html
+
+%% 3.1.6.orig.tar.xz (2011-12-02:48/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.6
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.6-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.6.orig.tar.xz
+ c50fd6eda712ae090e9b16242d468aab8b8ecd6c1ee9b2798b317f9eb40b529c 1647512 sisu_3.1.6.orig.tar.xz
+ d5a165144d55d553e62c7fcee3b881d6525f238cc5184f284955307a955efb56 1382 sisu_3.1.6-1.dsc
+ 8e088fc702158a233d870e1b55928063d8e52b5931a51b5143b674052335793e 290179 sisu_3.1.6-1.debian.tar.gz
+
+ * dal, codeblocks, start flush left (no buffer spaces at start of line) to
+ allow cut & paste [requested by chals irc.oftc] (fixed issue, numbering of
+ (flush left) codeblocks; preliminary tests suggest this should be ok), need
+ distinguishing marks for plaintext (& fix grey background in xetex/pdfs)
+
+ * texpdf, use boites for box around codeblocks, use and adapt 'boitecoloriee'
+ (found in boites_examples.sty)
+ * in boitebox as setup normal tex hardspaces at start of line are removed,
+ hack required to fix
+ * [attempt to reconfigure boitebox: as setup normal tex hardspaces at start
+ of line are removed;backround color not set (incompatible);keep box once
+ background color is set?;remove first line indent of paragraph?]
+
+ * require iconv (depreciated), use String#encode instead
+ * removed iconv, required a number of places without being used, watch
+
%% 3.1.5.orig.tar.xz (2011-11-21:47/1)
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.5
http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.5.orig.tar.xz
- sisu_3.1.5.orig.tar.xz
- sisu_3.1.5-1.dsc
- sisu_3.1.5-1.debian.tar.gz
+ 2d4c5320f526fb69165326f83babd7e96c8b553fbebe9c6dfe851d78f750e26b 1646676 sisu_3.1.5.orig.tar.xz
+ 0a3080b9f5368d6d55449cdcd38b9f7b4b6360f415a130b328c9b58cfc911343 1382 sisu_3.1.5-1.dsc
+ 3b945c9463725421c7398cda283fe94076e7b587b3cf1e06ad75c98b57fff744 290044 sisu_3.1.5-1.debian.tar.gz
* images, embedded symbol (previously overlooked, pre use of utf-8)
* param, sisu markup image regex match
diff -Nru sisu-3.1.5/data/doc/sisu/html/sisu.1.html sisu-3.1.8/data/doc/sisu/html/sisu.1.html
--- sisu-3.1.5/data/doc/sisu/html/sisu.1.html 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/data/doc/sisu/html/sisu.1.html 2011-12-14 03:08:36.000000000 +0000
@@ -200,6 +200,16 @@
colour). Alias -c
+
--configure
+configure/initialise shared output directory
+files initialize shared output directory (config files such as css and
+dtd files are not updated if they already exist unless modifier is used).
+The equivalent of: -C --init-site configure/initialise site, more extensive
+than -C on its own, shared output directory files/force update, existing
+shared output config files such as css and dtd files are updated if -CC
+is used.
+
+
--concordance [filename/wildcard]
produces concordance (wordmap)
a rudimentary index of all the words in a document. (Concordance files are
@@ -207,10 +217,10 @@
increased in the file sisurc.yml). Alias -w
--C [--init-site]
-configure/initialise
-shared output directory files initialize shared output directory (config
-files such as css and dtd files are not updated if they already exist unless
+-C
+configure/initialise shared
+output directory files initialize shared output directory (config files
+such as css and dtd files are not updated if they already exist unless
modifier is used). -C --init-site configure/initialise site more extensive than
-C on its own, shared output directory files/force update, existing shared
output config files such as css and dtd files are updated if this modifier
@@ -218,82 +228,75 @@
-CC
-configure/initialise shared output directory files initialize
-shared output directory (config files such as css and dtd files are not
-updated if they already exist unless modifier is used). The equivalent of:
--C --init-site configure/initialise site, more extensive than -C on its own,
-shared output directory files/force update, existing shared output config
-files such as css and dtd files are updated if -CC is used.
+see --configure
+
+
+-c [filename/wildcard]
+see --color-toggle
--c [filename/wildcard]
+--dal [filename/wildcard/url]
-
-see --color-toggle
+
assumed for most other flags, creates new intermediate files for processing
+(document abstraction) that is used in all subsequent processing of other
+output. This step is assumed for most processing flags. To skip it see -n.
+
+Alias -m
---dal [filename/wildcard/url]
-assumed for most other flags,
-creates new intermediate files for processing (document abstraction) that
-is used in all subsequent processing of other output. This step is assumed
-for most processing flags. To skip it see -n. Alias -m
+--delete [filename/wildcard]
+see --zap
---delete [filename/wildcard]
+-D [instruction] [filename]
-see --zap
+
see --pg
--D [instruction] [filename]
-see --pg
-
-
--d [--db-[database type (sqlite|pg)]]
---[instruction] [filename]
+-d [--db-[database type (sqlite|pg)]] --[instruction] [filename]
see --sqlite
+
--epub [filename/wildcard]
-produces
-an epub document, [sisu version >=2 ] (filename.epub). Alias -e
+produces an epub document, [sisu version >=2 ]
+(filename.epub). Alias -e
--e [filename/wildcard]
-
-
-see --epub
+
-e [filename/wildcard]
+see --epub
---find [optional string part of filename]
-without match string,
-glob all .sst .ssm files in directory (including language subdirectories).
-With match string, find files that match given string in directory (including
-language subdirectories). Alias -f, --glob, -G
+--find [optional
+ string part of filename]
+without match string, glob all .sst .ssm files in
+directory (including language subdirectories). With match string, find files
+that match given string in directory (including language subdirectories).
+Alias -f, --glob, -G
-F [--webserv=webrick]
see --sample-search-form
-
--f [optional string part of filename]
+-f [optional
+ string part of filename]
see --find
---git [filename/wildcard]
-
-produces or updates markup source file structure in a git repo (experimental
-and subject to change). Alias -g
+--git [filename/wildcard]
+produces or
+updates markup source file structure in a git repo (experimental and subject
+to change). Alias -g
---glob [optional string part of filename]
-
-
-see --find
+
--glob [optional string part of filename]
+see --find
--G [optional string part of filename]
+-G
+[optional string part of filename]
see --find
@@ -304,19 +307,19 @@
--harvest *.ss[tm]
-makes two lists of sisu output based on the sisu
-markup documents in a directory: list of author and authors works (year
-and titles), and; list by topic with titles and author. Makes use of header
-metadata fields (author, title, date, topic_register). Can be used with
-maintenance (-M) and remote placement (-R) flags.
+makes two lists of sisu output based on the sisu markup
+documents in a directory: list of author and authors works (year and titles),
+and; list by topic with titles and author. Makes use of header metadata
+fields (author, title, date, topic_register). Can be used with maintenance
+(-M) and remote placement (-R) flags.
--help [topic]
-provides help
-on the selected topic, where topics (keywords) include: list, (com)mands,
-short(cuts), (mod)ifiers, (env)ironment, markup, syntax, headers, headings,
-endnotes, tables, example, customise, skin, (dir)ectories, path, (lang)uage,
-db, install, setup, (conf)igure, convert, termsheet, search, sql, features,
+provides help on the selected
+topic, where topics (keywords) include: list, (com)mands, short(cuts),
+(mod)ifiers, (env)ironment, markup, syntax, headers, headings, endnotes,
+tables, example, customise, skin, (dir)ectories, path, (lang)uage, db,
+install, setup, (conf)igure, convert, termsheet, search, sql, features,
license
@@ -676,7 +679,8 @@
-Y [filename/wildcard]
-produces a short sitemap entry for the document, based on html output and the sisu_manifest.
+produces
+a short sitemap entry for the document, based on html output and the sisu_manifest.
--sitemaps generates/updates the sitemap index of existing sitemaps. (Experimental,
[g,y,m announcement this week])
@@ -1486,7 +1490,7 @@
markup example:
normal text _http://www.sisudoc.org/ continues
- deb http://www.jus.uio.no/sisu/archive unstable main non-free
+ deb _http://www.jus.uio.no/sisu/archive unstable main non-free
resulting output:
@@ -1555,6 +1559,13 @@
{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
+markup example:
+ { tux.png 64x80 }image
+ % various url linked images
+ {tux.png 64x80 "a better way" }http://www.sisudoc.org/
+ {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux,
+Debian and Ruby" }http://www.sisudoc.org/
+ {~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
resulting output:
@@ -1634,8 +1645,8 @@
320,000| 630,000
No. of articles, all languages | 25| 19,000| 138,000| 490,000|
862,000|1,600,000
- \* Contributed at least ten times; \** at least 5 times in last month;
-\*\** more than 100 times in last month.
+ * Contributed at least ten times; ** at least 5 times in last month;
+*** more than 100 times in last month.
resulting output:
@@ -2148,7 +2159,7 @@
the main term heading from each other by a pipe symbol.
Paragraph containing main term, second term and sub-term.
- ={Main term:sub-term+1|second sub-term
+ ={Main term:sub-term+1|second sub-term}
A paragraph that continues discussion of the first sub-term
@@ -2773,6 +2784,7 @@
structures of which there are 3 alternatives.
+
The document source directory is the directory in which sisu processing
@@ -2860,6 +2872,34 @@
output_dir_structure_by: language
+
|-- en
+ |-- epub
+ |-- hashes
+ |-- html
+ | |-- viral_spiral.david_bollier
+ | |-- manifest
+ | |-- qrcode
+ | |-- odt
+ | |-- pdf
+ | |-- sitemaps
+ | |-- txt
+ | |-- xhtml
+ | ‘-- xml
+ |-- po4a
+ | ‘-- live-manual
+ | |-- po
+ | |-- fr
+ | ‘-- pot
+ ‘-- _sisu
+ |-- css
+ |-- image
+ |-- image_sys -> ../../_sisu/image_sys
+ ‘-- xml
+ |-- rnc
+ |-- rng
+ ‘-- xsd
+
+
#by: language subject_dir/en/manifest/filename.html
@@ -2874,6 +2914,33 @@
output_dir_structure_by: filetype
+
|-- epub
+ |-- hashes
+ |-- html
+ |-- viral_spiral.david_bollier
+ |-- manifest
+ |-- qrcode
+ |-- odt
+ |-- pdf
+ |-- po4a
+ |-- live-manual
+ | |-- po
+ | |-- fr
+ | ‘-- pot
+ |-- _sisu
+ | |-- css
+ | |-- image
+ | |-- image_sys -> ../../_sisu/image_sys
+ | ‘-- xml
+ | |-- rnc
+ | |-- rng
+ | ‘-- xsd
+ |-- sitemaps
+ |-- txt
+ |-- xhtml
+ ‘-- xml
+
+
#by: filetype subject_dir/html/filename/manifest.en.html
@@ -2888,6 +2955,26 @@
output_dir_structure_by: filename
+
|-- epub
+ |-- po4a
+ |-- live-manual
+ | |-- po
+ | |-- fr
+ | ‘-- pot
+ |-- _sisu
+ | |-- css
+ | |-- image
+ | |-- image_sys -> ../../_sisu/image_sys
+ | ‘-- xml
+ | |-- rnc
+ | |-- rng
+ | ‘-- xsd
+ |-- sitemaps
+ |-- src
+ |-- pod
+ ‘-- viral_spiral.david_bollier
+
+
#by: filename subject_dir/filename/manifest.en.html
diff -Nru sisu-3.1.5/data/doc/sisu/html/sisu3.1.html sisu-3.1.8/data/doc/sisu/html/sisu3.1.html
--- sisu-3.1.5/data/doc/sisu/html/sisu3.1.html 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/data/doc/sisu/html/sisu3.1.html 2011-12-14 03:08:36.000000000 +0000
@@ -200,6 +200,16 @@
colour). Alias -c
+--configure
+configure/initialise shared output directory
+files initialize shared output directory (config files such as css and
+dtd files are not updated if they already exist unless modifier is used).
+The equivalent of: -C --init-site configure/initialise site, more extensive
+than -C on its own, shared output directory files/force update, existing
+shared output config files such as css and dtd files are updated if -CC
+is used.
+
+
--concordance [filename/wildcard]
produces concordance (wordmap)
a rudimentary index of all the words in a document. (Concordance files are
@@ -207,10 +217,10 @@
increased in the file sisurc.yml). Alias -w
--C [--init-site]
-configure/initialise
-shared output directory files initialize shared output directory (config
-files such as css and dtd files are not updated if they already exist unless
+-C
+configure/initialise shared
+output directory files initialize shared output directory (config files
+such as css and dtd files are not updated if they already exist unless
modifier is used). -C --init-site configure/initialise site more extensive than
-C on its own, shared output directory files/force update, existing shared
output config files such as css and dtd files are updated if this modifier
@@ -218,82 +228,75 @@
-CC
-configure/initialise shared output directory files initialize
-shared output directory (config files such as css and dtd files are not
-updated if they already exist unless modifier is used). The equivalent of:
--C --init-site configure/initialise site, more extensive than -C on its own,
-shared output directory files/force update, existing shared output config
-files such as css and dtd files are updated if -CC is used.
+see --configure
+
+
+-c [filename/wildcard]
+see --color-toggle
--c [filename/wildcard]
+--dal [filename/wildcard/url]
-
-see --color-toggle
+
assumed for most other flags, creates new intermediate files for processing
+(document abstraction) that is used in all subsequent processing of other
+output. This step is assumed for most processing flags. To skip it see -n.
+
+Alias -m
---dal [filename/wildcard/url]
-assumed for most other flags,
-creates new intermediate files for processing (document abstraction) that
-is used in all subsequent processing of other output. This step is assumed
-for most processing flags. To skip it see -n. Alias -m
+--delete [filename/wildcard]
+see --zap
---delete [filename/wildcard]
+-D [instruction] [filename]
-see --zap
+
see --pg
--D [instruction] [filename]
-see --pg
-
-
--d [--db-[database type (sqlite|pg)]]
---[instruction] [filename]
+-d [--db-[database type (sqlite|pg)]] --[instruction] [filename]
see --sqlite
+
--epub [filename/wildcard]
-produces
-an epub document, [sisu version >=2 ] (filename.epub). Alias -e
+produces an epub document, [sisu version >=2 ]
+(filename.epub). Alias -e
--e [filename/wildcard]
-
-
-see --epub
+
-e [filename/wildcard]
+see --epub
---find [optional string part of filename]
-without match string,
-glob all .sst .ssm files in directory (including language subdirectories).
-With match string, find files that match given string in directory (including
-language subdirectories). Alias -f, --glob, -G
+--find [optional
+ string part of filename]
+without match string, glob all .sst .ssm files in
+directory (including language subdirectories). With match string, find files
+that match given string in directory (including language subdirectories).
+Alias -f, --glob, -G
-F [--webserv=webrick]
see --sample-search-form
-
--f [optional string part of filename]
+-f [optional
+ string part of filename]
see --find
---git [filename/wildcard]
-
-produces or updates markup source file structure in a git repo (experimental
-and subject to change). Alias -g
+--git [filename/wildcard]
+produces or
+updates markup source file structure in a git repo (experimental and subject
+to change). Alias -g
---glob [optional string part of filename]
-
-
-see --find
+
--glob [optional string part of filename]
+see --find
--G [optional string part of filename]
+-G
+[optional string part of filename]
see --find
@@ -304,19 +307,19 @@
--harvest *.ss[tm]
-makes two lists of sisu output based on the sisu
-markup documents in a directory: list of author and authors works (year
-and titles), and; list by topic with titles and author. Makes use of header
-metadata fields (author, title, date, topic_register). Can be used with
-maintenance (-M) and remote placement (-R) flags.
+makes two lists of sisu output based on the sisu markup
+documents in a directory: list of author and authors works (year and titles),
+and; list by topic with titles and author. Makes use of header metadata
+fields (author, title, date, topic_register). Can be used with maintenance
+(-M) and remote placement (-R) flags.
--help [topic]
-provides help
-on the selected topic, where topics (keywords) include: list, (com)mands,
-short(cuts), (mod)ifiers, (env)ironment, markup, syntax, headers, headings,
-endnotes, tables, example, customise, skin, (dir)ectories, path, (lang)uage,
-db, install, setup, (conf)igure, convert, termsheet, search, sql, features,
+provides help on the selected
+topic, where topics (keywords) include: list, (com)mands, short(cuts),
+(mod)ifiers, (env)ironment, markup, syntax, headers, headings, endnotes,
+tables, example, customise, skin, (dir)ectories, path, (lang)uage, db,
+install, setup, (conf)igure, convert, termsheet, search, sql, features,
license
@@ -676,7 +679,8 @@
-Y [filename/wildcard]
-produces a short sitemap entry for the document, based on html output and the sisu_manifest.
+produces
+a short sitemap entry for the document, based on html output and the sisu_manifest.
--sitemaps generates/updates the sitemap index of existing sitemaps. (Experimental,
[g,y,m announcement this week])
@@ -1486,7 +1490,7 @@
markup example:
normal text _http://www.sisudoc.org/ continues
- deb http://www.jus.uio.no/sisu/archive unstable main non-free
+ deb _http://www.jus.uio.no/sisu/archive unstable main non-free
resulting output:
@@ -1555,6 +1559,13 @@
{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
+markup example:
+ { tux.png 64x80 }image
+ % various url linked images
+ {tux.png 64x80 "a better way" }http://www.sisudoc.org/
+ {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux,
+Debian and Ruby" }http://www.sisudoc.org/
+ {~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
resulting output:
@@ -1634,8 +1645,8 @@
320,000| 630,000
No. of articles, all languages | 25| 19,000| 138,000| 490,000|
862,000|1,600,000
- \* Contributed at least ten times; \** at least 5 times in last month;
-\*\** more than 100 times in last month.
+ * Contributed at least ten times; ** at least 5 times in last month;
+*** more than 100 times in last month.
resulting output:
@@ -2148,7 +2159,7 @@
the main term heading from each other by a pipe symbol.
Paragraph containing main term, second term and sub-term.
- ={Main term:sub-term+1|second sub-term
+ ={Main term:sub-term+1|second sub-term}
A paragraph that continues discussion of the first sub-term
@@ -2773,6 +2784,7 @@
structures of which there are 3 alternatives.
+
The document source directory is the directory in which sisu processing
@@ -2860,6 +2872,34 @@
output_dir_structure_by: language
+
|-- en
+ |-- epub
+ |-- hashes
+ |-- html
+ | |-- viral_spiral.david_bollier
+ | |-- manifest
+ | |-- qrcode
+ | |-- odt
+ | |-- pdf
+ | |-- sitemaps
+ | |-- txt
+ | |-- xhtml
+ | ‘-- xml
+ |-- po4a
+ | ‘-- live-manual
+ | |-- po
+ | |-- fr
+ | ‘-- pot
+ ‘-- _sisu
+ |-- css
+ |-- image
+ |-- image_sys -> ../../_sisu/image_sys
+ ‘-- xml
+ |-- rnc
+ |-- rng
+ ‘-- xsd
+
+
#by: language subject_dir/en/manifest/filename.html
@@ -2874,6 +2914,33 @@
output_dir_structure_by: filetype
+
|-- epub
+ |-- hashes
+ |-- html
+ |-- viral_spiral.david_bollier
+ |-- manifest
+ |-- qrcode
+ |-- odt
+ |-- pdf
+ |-- po4a
+ |-- live-manual
+ | |-- po
+ | |-- fr
+ | ‘-- pot
+ |-- _sisu
+ | |-- css
+ | |-- image
+ | |-- image_sys -> ../../_sisu/image_sys
+ | ‘-- xml
+ | |-- rnc
+ | |-- rng
+ | ‘-- xsd
+ |-- sitemaps
+ |-- txt
+ |-- xhtml
+ ‘-- xml
+
+
#by: filetype subject_dir/html/filename/manifest.en.html
@@ -2888,6 +2955,26 @@
output_dir_structure_by: filename
+
|-- epub
+ |-- po4a
+ |-- live-manual
+ | |-- po
+ | |-- fr
+ | ‘-- pot
+ |-- _sisu
+ | |-- css
+ | |-- image
+ | |-- image_sys -> ../../_sisu/image_sys
+ | ‘-- xml
+ | |-- rnc
+ | |-- rng
+ | ‘-- xsd
+ |-- sitemaps
+ |-- src
+ |-- pod
+ ‘-- viral_spiral.david_bollier
+
+
#by: filename subject_dir/filename/manifest.en.html
diff -Nru sisu-3.1.5/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst sisu-3.1.8/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
--- sisu-3.1.5/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst 2011-12-14 03:08:36.000000000 +0000
@@ -66,14 +66,17 @@
!_ --color-toggle [filename/wildcard] \\
screen toggle ansi screen colour on or off depending on default set (unless -c flag is used: if sisurc colour default is set to 'true', output to screen will be with colour, if sisurc colour default is set to 'false' or is undefined screen output will be without colour). Alias -c
+!_ --configure \\
+configure/initialise shared output directory files initialize shared output directory (config files such as css and dtd files are not updated if they already exist unless modifier is used). The equivalent of: -C --init-site configure/initialise site, more extensive than -C on its own, shared output directory files/force update, existing shared output config files such as css and dtd files are updated if -CC is used.
+
!_ --concordance [filename/wildcard] \\
produces concordance (wordmap) a rudimentary index of all the words in a document. (Concordance files are not generated for documents of over 260,000 words unless this limit is increased in the file sisurc.yml). Alias -w
-!_ -C [--init-site] \\
+!_ -C \\
configure/initialise shared output directory files initialize shared output directory (config files such as css and dtd files are not updated if they already exist unless modifier is used). -C --init-site configure/initialise site more extensive than -C on its own, shared output directory files/force update, existing shared output config files such as css and dtd files are updated if this modifier is used.
!_ -CC \\
-configure/initialise shared output directory files initialize shared output directory (config files such as css and dtd files are not updated if they already exist unless modifier is used). The equivalent of: -C --init-site configure/initialise site, more extensive than -C on its own, shared output directory files/force update, existing shared output config files such as css and dtd files are updated if -CC is used.
+see --configure
!_ -c [filename/wildcard] \\
see --color-toggle
diff -Nru sisu-3.1.5/data/doc/sisu/markup-samples/sisu_manual/sisu_content_directories.ssi sisu-3.1.8/data/doc/sisu/markup-samples/sisu_manual/sisu_content_directories.ssi
--- sisu-3.1.5/data/doc/sisu/markup-samples/sisu_manual/sisu_content_directories.ssi 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/data/doc/sisu/markup-samples/sisu_manual/sisu_content_directories.ssi 2011-12-14 03:08:36.000000000 +0000
@@ -95,32 +95,32 @@
code{
- ├── en
- │ ├── epub
- │ ├── hashes
- │ ├── html
- │ │ └── viral_spiral.david_bollier
- │ ├── manifest
- │ │ └── qrcode
- │ ├── odt
- │ ├── pdf
- │ ├── sitemaps
- │ ├── txt
- │ ├── xhtml
- │ └── xml
- ├── po4a
- │ └── live-manual
- │ ├── po
- │ │ └── fr
- │ └── pot
- └── _sisu
- ├── css
- ├── image
- ├── image_sys -> ../../_sisu/image_sys
- └── xml
- ├── rnc
- ├── rng
- └── xsd
+ |-- en
+ |-- epub
+ |-- hashes
+ |-- html
+ | |-- viral_spiral.david_bollier
+ | |-- manifest
+ | |-- qrcode
+ | |-- odt
+ | |-- pdf
+ | |-- sitemaps
+ | |-- txt
+ | |-- xhtml
+ | `-- xml
+ |-- po4a
+ | `-- live-manual
+ | |-- po
+ | |-- fr
+ | `-- pot
+ `-- _sisu
+ |-- css
+ |-- image
+ |-- image_sys -> ../../_sisu/image_sys
+ `-- xml
+ |-- rnc
+ |-- rng
+ `-- xsd
}code
@@ -139,31 +139,31 @@
code{
- ├── epub
- ├── hashes
- ├── html
- │ └── viral_spiral.david_bollier
- ├── manifest
- │ └── qrcode
- ├── odt
- ├── pdf
- ├── po4a
- │ └── live-manual
- │ ├── po
- │ │ └── fr
- │ └── pot
- ├── _sisu
- │ ├── css
- │ ├── image
- │ ├── image_sys -> ../../_sisu/image_sys
- │ └── xml
- │ ├── rnc
- │ ├── rng
- │ └── xsd
- ├── sitemaps
- ├── txt
- ├── xhtml
- └── xml
+ |-- epub
+ |-- hashes
+ |-- html
+ |-- viral_spiral.david_bollier
+ |-- manifest
+ |-- qrcode
+ |-- odt
+ |-- pdf
+ |-- po4a
+ |-- live-manual
+ | |-- po
+ | |-- fr
+ | `-- pot
+ |-- _sisu
+ | |-- css
+ | |-- image
+ | |-- image_sys -> ../../_sisu/image_sys
+ | `-- xml
+ | |-- rnc
+ | |-- rng
+ | `-- xsd
+ |-- sitemaps
+ |-- txt
+ |-- xhtml
+ `-- xml
}code
@@ -182,24 +182,24 @@
code{
- ├── epub
- ├── po4a
- │ └── live-manual
- │ ├── po
- │ │ └── fr
- │ └── pot
- ├── _sisu
- │ ├── css
- │ ├── image
- │ ├── image_sys -> ../../_sisu/image_sys
- │ └── xml
- │ ├── rnc
- │ ├── rng
- │ └── xsd
- ├── sitemaps
- ├── src
- │ └── pod
- └── viral_spiral.david_bollier
+ |-- epub
+ |-- po4a
+ |-- live-manual
+ | |-- po
+ | |-- fr
+ | `-- pot
+ |-- _sisu
+ | |-- css
+ | |-- image
+ | |-- image_sys -> ../../_sisu/image_sys
+ | `-- xml
+ | |-- rnc
+ | |-- rng
+ | `-- xsd
+ |-- sitemaps
+ |-- src
+ |-- pod
+ `-- viral_spiral.david_bollier
}code
diff -Nru sisu-3.1.5/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst sisu-3.1.8/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst
--- sisu-3.1.5/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst 2011-12-14 03:08:36.000000000 +0000
@@ -567,7 +567,7 @@
normal text _http://www.sisudoc.org/ continues
-deb http://www.jus.uio.no/sisu/archive unstable main non-free
+deb _http://www.jus.uio.no/sisu/archive unstable main non-free
}code
@@ -765,7 +765,7 @@
No. of English language articles| 25| 16,000| 101,000| 190,000| 320,000| 630,000
No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,000|1,600,000
-\* Contributed at least ten times; \** at least 5 times in last month; \*\** more than 100 times in last month.
+* Contributed at least ten times; ** at least 5 times in last month; *** more than 100 times in last month.
}code
@@ -782,7 +782,7 @@
No. of English language articles| 25| 16,000| 101,000| 190,000| 320,000| 630,000
No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,000|1,600,000
-\* Contributed at least ten times; \** at least 5 times in last month; \*\** more than 100 times in last month.
+* Contributed at least ten times; ** at least 5 times in last month; *** more than 100 times in last month.
% code{
@@ -1239,7 +1239,7 @@
code{
Paragraph containing main term, second term and sub-term.
- ={Main term:sub-term+1|second sub-term
+ ={Main term:sub-term+1|second sub-term}
A paragraph that continues discussion of the first sub-term
diff -Nru sisu-3.1.5/data/sisu/v3/v/version.yml sisu-3.1.8/data/sisu/v3/v/version.yml
--- sisu-3.1.5/data/sisu/v3/v/version.yml 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/data/sisu/v3/v/version.yml 2011-12-14 03:08:36.000000000 +0000
@@ -1,5 +1,5 @@
---
-:version: 3.1.5
-:date_stamp: 2011w47/1
-:date: "2011-11-21"
+:version: 3.1.8
+:date_stamp: 2011w50/2
+:date: "2011-12-13"
:project: SiSU
diff -Nru sisu-3.1.5/debian/changelog sisu-3.1.8/debian/changelog
--- sisu-3.1.5/debian/changelog 2011-11-21 05:19:33.000000000 +0000
+++ sisu-3.1.8/debian/changelog 2011-12-14 03:13:21.000000000 +0000
@@ -1,3 +1,53 @@
+sisu (3.1.8-1) unstable; urgency=medium
+
+ [ Ralph Amissah ]
+ * [a6aadc4] sha256 (3.1.7)
+ * [59a52e3] v3: 3.1.8 version & changelog "opened"
+ * [0607a1b] v3: odf:odt, codeblocks, a match fix, affects e.g. "<<"
+ * [b77338f] v3: texpdf, output_by: filetype, fix, language code part of
+ filename, fix
+ * files previously given same name and written over
+ * [reported by chals (live-manual) on irc oftc #sisu]
+ * [output_by language and filename ok]
+
+ -- Ralph Amissah Tue, 13 Dec 2011 22:11:38 -0500
+
+sisu (3.1.7-1) unstable; urgency=low
+
+ [ Ralph Amissah ]
+ * [5989174] sha256 (3.1.6)
+ * [858fc0b] v3: 3.1.7 version & changelog "opened"
+ * [9cdd523] v3: dal, codeblocks, removed identifier tags, changed markup of
+ "<" & ">"
+ * [9ea7b7f] v3: epub, css, codeblock, grey box
+ * [595970f] v3: texpdf, codeblocks, use listings package (for grey box)
+ * (internally retain possibility to use boites package)
+ * [4c67b33] v3: sysenv, only copy external images directory if it exists
+ * [cda92b5] v3: documentation, add --configure, use ascii chars for dir tree,
+ correct typos
+ * [0260753] v3: documentation, manpage & html (man2html)
+
+ -- Ralph Amissah Thu, 08 Dec 2011 21:32:49 -0500
+
+sisu (3.1.6-1) unstable; urgency=low
+
+ [ Ralph Amissah ]
+ * [a4295e2] sha256 (3.1.5)
+ * [fc90866] v3: 3.1.6 version & changelog "opened"
+ * [83f669a] v3, require iconv (removed), should use String#encode instead,
+ watch
+ * removed iconv, required a number of places without being used, watch
+ * [acd2e81] v3: dal, codeblocks, start flush left (no buffer spaces at start
+ of line)
+ * allows cut & paste of codeblocks (from some output formats)
+ [requested by chals irc.oftc]
+ * [d513733] v3: texpdf, use boites for box round codeblocks
+ * use and adapt 'boitecoloriee' (found in boites_examples.sty)
+ * in boitebox as setup normal tex hardspaces at start of line are removed,
+ hack required to fix
+
+ -- Ralph Amissah Fri, 02 Dec 2011 04:08:40 -0500
+
sisu (3.1.5-1) unstable; urgency=low
[ Ralph Amissah ]
diff -Nru sisu-3.1.5/lib/sisu/v3/dal_character_check.rb sisu-3.1.8/lib/sisu/v3/dal_character_check.rb
--- sisu-3.1.5/lib/sisu/v3/dal_character_check.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/dal_character_check.rb 2011-12-14 03:08:36.000000000 +0000
@@ -64,7 +64,6 @@
@endnote_array=[]
end
def character_check_and_oldstyle_endnote_array
- require 'iconv'
data=@data
@tuned_file,@endnote_array=[],[]
endnote_no=1
diff -Nru sisu-3.1.5/lib/sisu/v3/dal_doc_str.rb sisu-3.1.8/lib/sisu/v3/dal_doc_str.rb
--- sisu-3.1.5/lib/sisu/v3/dal_doc_str.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/dal_doc_str.rb 2011-12-14 03:08:36.000000000 +0000
@@ -376,7 +376,8 @@
if @@flag['code']
if t_o =~/^\}code/
@@flag['code']=false
- obj,tags=extract_tags(@tuned_code.join("\n"))
+ obj=@tuned_code.join("\n")
+ tags=[]
h={ obj: obj, tags: tags, number_: @codeblock_numbered }
t_o=SiSU_document_structure::Object_block_txt.new.code(h)
@tuned_code=[]
@@ -863,7 +864,7 @@
parent=node1=node2=node3=node4=node5=node6=nil
data.each do |dob|
h={}
- if dob.obj !~ regex_exclude_ocn_and_node \
+ if (dob.obj !~ regex_exclude_ocn_and_node || dob.is =='code') \
and dob.of !~/(?:comment|layout|meta)/ \
and dob.obj !~/#{Mx[:pa_non_object_no_heading]}|#{Mx[:pa_non_object_dummy_heading]}/ \
and dob.ocn_
diff -Nru sisu-3.1.5/lib/sisu/v3/dal_syntax.rb sisu-3.1.8/lib/sisu/v3/dal_syntax.rb
--- sisu-3.1.5/lib/sisu/v3/dal_syntax.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/dal_syntax.rb 2011-12-14 03:08:36.000000000 +0000
@@ -332,7 +332,7 @@
and defined? @md.creator \
and @md.creator
if dob.is =='heading'
- dob.obj.gsub!(/^\s*@title\s*$/,@md.title.full) if dob.lv =~/1/ #
+ dob.obj.gsub!(/^\s*@title\s*$/,@md.title.full) if dob.lv =~/1/
if dob.lv =~/[23]/ \
and defined? @md.creator.author \
and @md.creator.author
@@ -432,9 +432,6 @@
dob=fontface(dob)
elsif dob.is =='code'
dob.obj.gsub!(/#{Mx[:meta_o]}(\S+?)#{Mx[:meta_c]}\s*/,'@\1: ')
- dob.obj.gsub!(/([<>])/,'_\1')
- dob.obj.gsub!(/_<:(\S+?)_>/,'<:\1>') #convert <:\S+> back, clumsy
- dob.obj.gsub!(/_<(br(?: \/)?)_>/,'<\1>') #convert
back, clumsy
dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s)<(br(?: \/)?)>([\s,.]|$)/,'\1<\2>\3') #convert
back, clumsy
if dob.number_
codeline=[]
@@ -443,7 +440,7 @@
unless i == 0
cl.gsub!(Mx[:br_nl],'')
w=3-ln.to_s.length
- cl = "#{ln}#{Mx[:nbsp]*w}#{Mx[:vline]}#{Mx[:nbsp]}#{Mx[:nbsp]}#{cl}#{Mx[:br_nl]}"
+ cl = "#{ln}#{Mx[:nbsp]*w}#{Mx[:vline]}#{cl}#{Mx[:br_nl]}"
ln +=1
end
codeline << cl
@@ -451,8 +448,7 @@
codeline= codeline.join("")
dob.obj=codeline
else
- dob.obj.gsub!(/#{Mx[:gr_o]}codeline#{Mx[:gr_c]}/,
- "\n#{Mx[:nbsp]}#{Mx[:nbsp]}") #temporary fix, prefer: #line.gsub!(/<:codeline>/,"\n")
+ dob.obj.gsub!(/#{Mx[:gr_o]}codeline#{Mx[:gr_c]}/,"\n")
end
dob
else # @\S+?:
diff -Nru sisu-3.1.5/lib/sisu/v3/epub_format.rb sisu-3.1.8/lib/sisu/v3/epub_format.rb
--- sisu-3.1.5/lib/sisu/v3/epub_format.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/epub_format.rb 2011-12-14 03:08:36.000000000 +0000
@@ -674,6 +674,7 @@
font-family: inconsolata, andale mono, courier new, courier, monospace;
font-size: 90%;
text-align: left;
+ background-color: #eeeeee;
}
p.caption {
diff -Nru sisu-3.1.5/lib/sisu/v3/odf.rb sisu-3.1.8/lib/sisu/v3/odf.rb
--- sisu-3.1.5/lib/sisu/v3/odf.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/odf.rb 2011-12-14 03:08:36.000000000 +0000
@@ -535,10 +535,12 @@
unless dob =~/^(?:#{Rx[:meta]}|%+ )/m
w.gsub!(/&#(?:126|152);/,'~') #126 usual
w.gsub!(/ /,' ')
- if w !~/&\S{2,7}?;/
+ if w !~/(?:&\S{2,7}?;)+/
w.gsub!(/&/,'&')
end
- w.gsub!(/(&\S{1,7};)+&/,'\1&') #could break things
+ if w !~/&\S{1,7}?;(?:&\S{1,7}?;)+/ #imperfect
+ w.gsub!(/(&\S{1,7};)+&/,'\1&')
+ end
end
para_array << w
end
diff -Nru sisu-3.1.5/lib/sisu/v3/shared_xml.rb sisu-3.1.8/lib/sisu/v3/shared_xml.rb
--- sisu-3.1.5/lib/sisu/v3/shared_xml.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/shared_xml.rb 2011-12-14 03:08:36.000000000 +0000
@@ -109,7 +109,7 @@
end
def char_enc #character encode
def utf8(dob='')
- if @sys.locale =~/utf-?8/i # instead ucs for utf8 #require 'iconv' ? Iñtërnâtiônàlizætiøn
+ if @sys.locale =~/utf-?8/i # instead ucs for utf8 # String#encode Iñtërnâtiônàlizætiøn
str=if defined? dob.obj; dob.obj
elsif dob.class==String; dob
end
@@ -224,7 +224,7 @@
end
end
def html(dob='')
- if @sys.locale =~/utf-?8/i # instead ucs for utf8 #require 'iconv' ? Iñtërnâtiônàlizætiøn
+ if @sys.locale =~/utf-?8/i # instead ucs for utf8 # String#encode Iñtërnâtiônàlizætiøn
dob.obj.gsub!(/ /u,' ') # space identify
dob.obj.gsub!(/ /u,' ') # space identify
else
diff -Nru sisu-3.1.5/lib/sisu/v3/sst_do_inline_footnotes.rb sisu-3.1.8/lib/sisu/v3/sst_do_inline_footnotes.rb
--- sisu-3.1.5/lib/sisu/v3/sst_do_inline_footnotes.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/sst_do_inline_footnotes.rb 2011-12-14 03:08:36.000000000 +0000
@@ -217,7 +217,6 @@
tuned_file
end
def character_check
- require 'iconv'
reset
data=@data
@tuned_file=[]
diff -Nru sisu-3.1.5/lib/sisu/v3/sysenv.rb sisu-3.1.8/lib/sisu/v3/sysenv.rb
--- sisu-3.1.5/lib/sisu/v3/sysenv.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/sysenv.rb 2011-12-14 03:08:36.000000000 +0000
@@ -3818,15 +3818,13 @@
end
end
def pdf_p
- if @env.output_dir_structure.by_language_code? \
- or @env.output_dir_structure.by_filetype?
+ if @env.output_dir_structure.by_language_code?
@md.fnb + '.portrait.'
else 'portrait' + @md.lang_code_insert + '.'
end
end
def pdf_l
- if @env.output_dir_structure.by_language_code? \
- or @env.output_dir_structure.by_filetype?
+ if @env.output_dir_structure.by_language_code?
@md.fnb + '.landscape.'
else 'landscape' + @md.lang_code_insert + '.'
end
@@ -5207,7 +5205,9 @@
def cp_external_images
src="#{@env.processing_path.processing}/external_document/image"
dest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external"
- cp_images(src,dest)
+ if FileTest.directory?(src)
+ cp_images(src,dest)
+ end
end
def cp_webserver_images
src=@env.path.image_source
diff -Nru sisu-3.1.5/lib/sisu/v3/texpdf_format.rb sisu-3.1.8/lib/sisu/v3/texpdf_format.rb
--- sisu-3.1.5/lib/sisu/v3/texpdf_format.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/texpdf_format.rb 2011-12-14 03:08:36.000000000 +0000
@@ -80,7 +80,6 @@
end
end
class Format_text_object
- require 'iconv'
require_relative 'defaults' # defaults.rb
attr_accessor :string,:string1,:orientation,:url,:dir,:tex
@@sys=SiSU_Env::System_call.new
@@ -180,7 +179,7 @@
textwidth=tw.to_i - 20
colW=[]
colW << '{'
- @dob.widths.each do |x|
+ @dob.widths.each do |x|
x=(x.to_i * textwidth)/100 #x=(x.to_i/100.0 * 160)
col_w=x.to_s # x.gsub(/.+/,'l\|') #unless x.nil?
colW << "p{#{col_w}mm}" if col_w
@@ -556,7 +555,7 @@
map_nametags[url][:ocn]
else nil
end
- ocn_lnk=(url=~/^\d+$/ ? url : ocn_lnk)
+ ocn_lnk=(url=~/^\d+$/ ? url : ocn_lnk)
if ocn_lnk and not ocn_lnk.empty?
idx \
? (str.sub!(rgx_url_internal,"\\hyperlink{#{ocn_lnk}}{#{link}}"))
@@ -768,6 +767,21 @@
@tex2pdf=@@tex3pdf ||=SiSU_Env::System_call.new.tex2pdf_engine
@ps=@txt if @txt=~/(?:a4|letter|legal|book|a5|b5)/i
@lang ||=SiSU_i18n::Languages.new #.list[@md.opt.lng][:xlp]
+ @author=if defined? @md.creator.author \
+ and @md.creator.author=~/\S+/
+ SiSU_TeX_Pdf::Special_characters.new(@md,@md.creator.author).special_characters_safe
+ else ''
+ end
+ @subject=if defined? @md.classify.subject \
+ and @md.classify.subject=~/\S+/
+ SiSU_TeX_Pdf::Special_characters.new(@md,@md.classify.subject).special_characters_safe
+ else ''
+ end
+ @keywords=if defined? @md.classify.keywords \
+ and @md.classify.keywords=~/\S+/
+ SiSU_TeX_Pdf::Special_characters.new(@md,@md.classify.keywords).special_characters_safe
+ else ''
+ end
end
def tex_head_lang #babel 18n
lang_char_arr=@md.i18n
@@ -842,7 +856,7 @@
end
end
def tex_head_info
- generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})" if @md.sisu_version[:version]
+ generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})" if @md.sisu_version[:version]
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
<')
+ w.gsub!(/[\\]?~/,'~')
+ w.gsub!(/[#{Mx[:br_line]}#{Mx[:br_paragraph]}]/,"\n") #watch
+ w.gsub!(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/,'~') #126 usual
+ w.gsub!(/\\?\||#{Mx[:gl_o]}#124#{Mx[:gl_c]}/,'|') #unless is=='code' #unless w=~/<~\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+>/ # | SiSU not really special sisu character but done, also LaTeX
+ para_array << w
+ end
+ str=para_array.join(' ')
+ str=str.strip unless is=='code'
+ str
+ else ''
+ end
+ str.gsub(/\s*#{Mx[:mk_o]}:name#\S+?#{Mx[:mk_c]}\s*/,' ')
+ str.gsub!(/.+?<-#>/,'')
+ str.gsub!(/#{Mx[:br_eof]}/,'')
+ str.gsub!(/#{Mx[:br_endnotes]}/,'')
+ #problem sequence ->
+ str.gsub!(/&(?:lt|#060);/,'<') # < SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#(?:gt|062)#{Mx[:gl_c]}/,'>') # > SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{') # { SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'}') # } SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/,'~') # ~ SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'#') # # SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!') # ! SiSU not really special sisu character but done, also LaTeX
+ #str.gsub!(/(^|\s)\*\s/,'\1\asterisk ') # * should you wish to escape astrisk e.g. describing \*{bold}*
+ str.gsub!(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*') # * should you wish to escape astrisk e.g. describing \*{bold}*
+ str.gsub!(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-') # - SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#043#{Mx[:gl_c]}/,'+') # + SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#044#{Mx[:gl_c]}/,',') # + SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#038#{Mx[:gl_c]}/,'&') #unless @txt=~/<:code>/ # / SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/') # / SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'\\') # \ SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_') # _ SiSU special character also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#124#{Mx[:gl_c]}/,'|') # | SiSU not really special sisu character but done, also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#058#{Mx[:gl_c]}/,':') # : SiSU not really special sisu character but done, also LaTeX
+ str.gsub!(/#{Mx[:gl_o]}#094#{Mx[:gl_c]}|\^/,'^') # ^ SiSU not really special sisu character but done, also LaTeX
+ ##watch placement, problem sequence ^
+ str.gsub!(/&atild;<\/font><\/sup>/,' ')
+ str.gsub!(/\\copy(right|mark)?/,'<=copymark>') # ok problem with superscript
+ str
+ end
def xetex_special_characters_1(str,is='') # ~ ^ $ & % _ { } #LaTeX special characters - KEEP list
- #str=Iconv.conv('ISO-8859-1', 'UTF-8', @txt)
+ #str=Iconv.conv('ISO-8859-1', 'UTF-8', @txt) # `require': iconv will be deprecated in the future, use String#encode instead.
word=str.scan(/\S+|\n/) #unless line =~/^(?:@\S|%+\s)/
para_array=[]
str=if word
@@ -1326,6 +1400,11 @@
str=xetex_special_characters_2(str,is) unless str.nil? # remove this to start with, causes issues
@txt=str
end
+ def characters_code_listings #special characters - some substitutions are sequence sensitive, rearrange with care.
+ str,is=@txt,@is
+ str=xetex_code_listings(str,is) unless str.nil?
+ @txt=str
+ end
def special_characters_code
str=@txt
str.gsub!(/ \\\\([ #{Mx[:br_nl]}]+|$)/,' \textbackslash\textbackslash\hardspace\1')
@@ -1369,7 +1448,7 @@
end
def header
"\\lhead[ ]{ }\n" +
- "\\chead[ \\fancyplain{} \\bfseries \\footnotesize \\leftmark ]{ \\fancyplain{} \\bfseries \\footnotesize \\rightmark }\n" +
+ "\\chead[ \\fancyplain{} \\bfseries \\footnotesize \\leftmark ]{ \\fancyplain{} \\bfseries \\footnotesize \\rightmark }\n" +
"\\rhead[ ]{ }\n"
end
def footer
@@ -1500,13 +1579,13 @@
\"Support Open Standards and Software Libré for the Information Technology Infrastructure\" RA\\subsubsection*{Information on this document copy #{site}}
\\addcontentsline{toc}{subsection}{Information on this document copy}
{\\begin{footnotesize}
-\\\\ Generated by \\href{http://www.jus.uio.no/sisu/}{SiSU} found at \\href{http://www.jus.uio.no/sisu/}{www.jus.uio.no/sisu} \\begin{tiny}[ #{v[:project]} #{v[:version]} #{v[:date_stamp]} ]\\end{tiny} \\href{http://www.sisudoc.org}{www.sisudoc.org}. SiSU is software for document structuring, publishing and search (using SiSU: object citation numbering, markup, meta-markup, and system) Copyright #{@copymark} 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved.
+\\\\ Generated by \\href{http://www.jus.uio.no/sisu/}{SiSU} found at \\href{http://www.jus.uio.no/sisu/}{www.jus.uio.no/sisu} \\begin{tiny}[ #{v[:project]} #{v[:version]} #{v[:date_stamp]} ]\\end{tiny} \\href{http://www.sisudoc.org}{www.sisudoc.org}. SiSU is software for document structuring, publishing and search (using SiSU: object citation numbering, markup, meta-markup, and system) Copyright #{@copymark} 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved.
\\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later (\\href{http://www.fsf.org/licenses/gpl.html}{www.fsf.org/licenses/gpl.html}). {\\end{footnotesize}
{\\begin{small}
-\\\\ W3 since October 3 1993 \\href{http://www.jus.uio.no/sisu/}{#{sisu_ico}}SiSU 1997, current #{@date.year_static}. \\\\ #{sitename} presentations at \\begin{scriptsize}#{site}\\end{scriptsize} \\\\ \\\\ #{@md.title.full} \\textbf{pdf} versions can be found at: \\\\
+\\\\ W3 since October 3 1993 \\href{http://www.jus.uio.no/sisu/}{#{sisu_ico}}SiSU 1997, current #{@date.year_static}. \\\\ #{sitename} presentations at \\begin{scriptsize}#{site}\\end{scriptsize} \\\\ \\\\ #{@md.title.full} \\textbf{pdf} versions can be found at: \\\\
{\\end{small}
-\\\\ #{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_p]}}\\end{scriptsize}#{@brace_url.tex_close} \\\\
-#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_l]}}\\end{scriptsize}#{@brace_url.tex_close} \\\\
+\\\\ #{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_p]}}\\end{scriptsize}#{@brace_url.tex_close} \\\\
+#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:pdf_l]}}\\end{scriptsize}#{@brace_url.tex_close} \\\\
\\\\\n#{@md.title.full} \\textbf{html} versions may be found at: \\\\
#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:toc]}}\\end{scriptsize}#{@brace_url.tex_close} or \\\\
#{@brace_url.tex_open}\\begin{scriptsize}\\url{#{@vz.url_root_http}/#{url}/#{@md.fn[:doc]}}\\end{scriptsize}#{@brace_url.tex_close}
diff -Nru sisu-3.1.5/lib/sisu/v3/texpdf.rb sisu-3.1.8/lib/sisu/v3/texpdf.rb
--- sisu-3.1.5/lib/sisu/v3/texpdf.rb 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/lib/sisu/v3/texpdf.rb 2011-12-14 03:08:36.000000000 +0000
@@ -294,6 +294,7 @@
true
else false
end
+ @codeblock_box='listings' #alternative 'boites'
end
def songsheet
begin
@@ -352,7 +353,11 @@
dob.tmp=SiSU_TeX_Pdf::Format_text_object.new(@md,dob.tmp).url_str_internal(dob.tmp)
end
elsif dob.is =='code'
- dob.tmp=SiSU_TeX_Pdf::Special_characters.new(@md,dob.tmp).special_characters_code
+ dob.tmp=if @codeblock_box=='listings'
+ dob.tmp
+ else
+ SiSU_TeX_Pdf::Special_characters.new(@md,dob.tmp).special_characters_code
+ end
elsif dob.is =='break'
if dob.obj==Mx[:br_page]; dob.tmp='\newpage'
elsif dob.obj==Mx[:br_page_new]; dob.tmp='\clearpage'
@@ -408,6 +413,53 @@
def enclose(dob)
dob
end
+ def box_boites(dob,ocn)
+ sp_char=SiSU_TeX_Pdf::Special_characters.new(@md,dob.tmp,dob.is)
+ dob.tmp=sp_char.special_characters_safe
+ dob.tmp.gsub!(/(#{Mx[:nbsp]})/m,'{\color{mywhite}\1}')
+ #dob.tmp.gsub!(/#{Mx[:nbsp]}/m,'{~}') # dob.tmp.gsub!(/#{Mx[:nbsp]}\s*/m,'{~}')
+ dob.tmp.gsub!(/#{Mx[:vline]}/m,'\vline')
+ dob.tmp.gsub!(/ \\( |#{Mx[:br_nl]})/,' {\textbackslash}\1')
+ dob.tmp.gsub!(/#{Mx[:br_nl]}\s*\Z/m,'')
+ dob.tmp.gsub!(/#{Mx[:br_nl]}{2}/,'\newline \\\\\\ ')
+ dob.tmp.gsub!(/#{Mx[:br_nl]}/,' \\\\\\ ')
+ dob.tmp.gsub!(/\n\n\n/m," \\newline\n\n")
+ ocn=SiSU_TeX_Pdf::Format_text_object.new(@md).ocn_display(dob)
+ dob.tmp = ocn \
+ + @tex_ml.paraskip_small \
+ + '\begin{Codeblock}' \
+ + '\begin{codeblockboitebox} \hardspace \newline ' \
+ + dob.tmp \
+ + '\end{codeblockboitebox}' \
+ + '\end{Codeblock}' \
+ + "\n" \
+ + @tex_ml.paraskip_normal
+ dob
+ end
+ def box_listings(dob,ocn)
+ sp_char=SiSU_TeX_Pdf::Special_characters.new(@md,dob.tmp,dob.is)
+ dob.tmp=sp_char.characters_code_listings
+ dob.tmp.gsub!(/^\s+/m,'') #bug, fix earlier, should be made unecessary
+ dob.tmp.gsub!(/#{Mx[:nbsp]}/m,' ')
+ dob.tmp.gsub!(/#{Mx[:vline]}/m,'|')
+ dob.tmp.gsub!(/#{Mx[:br_nl]}(?:\s?\n)?/m,"\n")
+ dob.tmp.gsub!(/\n\n\n/m," \n\n")
+ ocn=SiSU_TeX_Pdf::Format_text_object.new(@md).ocn_display(dob)
+ dob.tmp = ocn \
+ + @tex_ml.paraskip_small \
+ + '\begin{Codeblock}' \
+ + "\n" \
+ + '\begin{lstlisting} ' \
+ + "\n" \
+ + dob.tmp \
+ + "\n" \
+ + '\end{lstlisting} ' \
+ + "\n" \
+ + '\end{Codeblock}' \
+ + "\n" \
+ + @tex_ml.paraskip_normal
+ dob
+ end
def markup_common(dob)
tex_f=nil
txt_obj={ dal: dob }
@@ -430,7 +482,7 @@
+ '\\end{footnotesize}' \
+ "\n" \
+ @tex_ml.paraskip_normal
- elsif dob.is=~/verse/
+ elsif dob.is=~/verse/
ocn \
+ @tex_ml.paraskip_tiny \
+ "\n" \
@@ -444,23 +496,13 @@
end
dob
when /code/
- sp_char=SiSU_TeX_Pdf::Special_characters.new(@md,dob.tmp,dob.is)
- dob.tmp=sp_char.special_characters_safe
- dob.tmp.gsub!(/#{Mx[:nbsp]}/,'{~}') #dob.tmp.gsub!(/#{Mx[:nbsp]}\s*/,'{~}')
- dob.tmp.gsub!(/#{Mx[:vline]}/m,'\vline')
- dob.tmp.gsub!(/ \\( |#{Mx[:br_nl]})/,' {\textbackslash}\1')
- dob.tmp.gsub!(/#{Mx[:br_nl]}\s*\Z/m,'')
- dob.tmp.gsub!(/#{Mx[:br_nl]}{2}/,'\newline \\\\\\ ')
- dob.tmp.gsub!(/#{Mx[:br_nl]}/,' \\\\\\ ')
- dob.tmp.gsub!(/\n\n\n/m," \\newline\n\n")
- ocn=SiSU_TeX_Pdf::Format_text_object.new(@md).ocn_display(dob)
- dob.tmp = ocn \
- + @tex_ml.paraskip_small \
- + '\begin{Codeblock}' \
- + dob.tmp \
- + ' \end{Codeblock}' \
- + "\n" \
- + @tex_ml.paraskip_normal
+ dob=if @codeblock_box == 'listings'
+ box_listings(dob,ocn)
+ elsif @codeblock_box == 'boites'
+ box_boites(dob,ocn)
+ else
+ box_boites(dob,ocn)
+ end
dob
else 'error' #should never occur
end
@@ -530,7 +572,7 @@
dob=enclose(dob) unless dob.tmp =~/^$/
end
else
- dob.tmp.strip!
+ dob.tmp.strip! unless dob.is=='code'
dob=enclose(dob) unless dob.tmp =~/^$/
end
if dob.class==String
@@ -540,22 +582,83 @@
dob
end
if dob.tmp =~/(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image\b)/m \
- and dob.is !='code'
+ && dob.is !='code'
dob=SiSU_TeX_Pdf::Bare_urls.new(@md,dob).bare_urls
tst=SiSU_TeX_Pdf::Format_text_object.new(@md,dob)
dob=tst.urls_txt_and_images
dob
elsif dob.tmp =~/https?:\/\/\S+\b/m \
- and dob.is =='code'
+ && dob.is =='code' \
+ && @codeblock_box !='listings'
dob=SiSU_TeX_Pdf::Bare_urls.new(@md,dob).bare_urls_in_code
dob
end
- if dob.class !=Hash and dob.tmp =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}image\b/ \
- and dob.is !='code'
+ if dob.class !=Hash \
+ && dob.tmp =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}image\b/ \
+ && dob.is !='code'
tst=SiSU_TeX_Pdf::Format_text_object.new(@md,dob)
end
dob
end
+ def tex_box_listings
+ < \../../_sisu/image_sys
+ `\-\- xml
+ |\-\- rnc
+ |\-\- rng
+ `\-\- xsd
+.fi
+
.br
#by: language subject_dir/en/manifest/filename.html
@@ -3092,6 +3133,34 @@
.br
output_dir_structure_by: filetype
+.nf
+ |\-\- epub
+ |\-\- hashes
+ |\-\- html
+ |\-\- viral_spiral.david_bollier
+ |\-\- manifest
+ |\-\- qrcode
+ |\-\- odt
+ |\-\- pdf
+ |\-\- po4a
+ |\-\- live\-manual
+ | |\-\- po
+ | |\-\- fr
+ | `\-\- pot
+ |\-\- _sisu
+ | |\-\- css
+ | |\-\- image
+ | |\-\- image_sys \-> \../../_sisu/image_sys
+ | `\-\- xml
+ | |\-\- rnc
+ | |\-\- rng
+ | `\-\- xsd
+ |\-\- sitemaps
+ |\-\- txt
+ |\-\- xhtml
+ `\-\- xml
+.fi
+
.br
#by: filetype subject_dir/html/filename/manifest.en.html
@@ -3107,6 +3176,27 @@
.br
output_dir_structure_by: filename
+.nf
+ |\-\- epub
+ |\-\- po4a
+ |\-\- live\-manual
+ | |\-\- po
+ | |\-\- fr
+ | `\-\- pot
+ |\-\- _sisu
+ | |\-\- css
+ | |\-\- image
+ | |\-\- image_sys \-> \../../_sisu/image_sys
+ | `\-\- xml
+ | |\-\- rnc
+ | |\-\- rng
+ | `\-\- xsd
+ |\-\- sitemaps
+ |\-\- src
+ |\-\- pod
+ `\-\- viral_spiral.david_bollier
+.fi
+
.br
#by: filename subject_dir/filename/manifest.en.html
diff -Nru sisu-3.1.5/man/man1/sisu2.1 sisu-3.1.8/man/man1/sisu2.1
--- sisu-3.1.5/man/man1/sisu2.1 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/man/man1/sisu2.1 2011-12-14 03:08:36.000000000 +0000
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2011-10-03" "3.1.0" "SiSU"
+.TH "sisu" "1" "2011-12-08" "3.1.7" "SiSU"
.br
.SH NAME
.br
@@ -221,13 +221,22 @@
screen output will be without colour). Alias \-c
.TP
+.B \-\-configure
+configure/initialise shared output directory files initialize shared output
+directory (config files such as css and dtd files are not updated if they
+already exist unless modifier is used). The equivalent of: \-C \-\-init\-site
+configure/initialise site, more extensive than \-C on its own, shared output
+directory files/force update, existing shared output config files such as css
+and dtd files are updated if \-CC is used.
+
+.TP
.B \-\-concordance [filename/wildcard]
produces concordance (wordmap) a rudimentary index of all the words in a
document. (Concordance files are not generated for documents of over 260,000
words unless this limit is increased in the file sisurc.yml). Alias \-w
.TP
-.B \-C [\-\-init\-site]
+.B \-C
configure/initialise shared output directory files initialize shared output
directory (config files such as css and dtd files are not updated if they
already exist unless modifier is used). \-C \-\-init\-site configure/initialise
@@ -237,12 +246,7 @@
.TP
.B \-CC
-configure/initialise shared output directory files initialize shared output
-directory (config files such as css and dtd files are not updated if they
-already exist unless modifier is used). The equivalent of: \-C \-\-init\-site
-configure/initialise site, more extensive than \-C on its own, shared output
-directory files/force update, existing shared output config files such as css
-and dtd files are updated if \-CC is used.
+see \-\-configure
.TP
.B \-c [filename/wildcard]
@@ -1520,7 +1524,7 @@
.nf
normal text _http://www.sisudoc.org/ continues
- deb http://www.jus.uio.no/sisu/archive unstable main non\-free
+ deb _http://www.jus.uio.no/sisu/archive unstable main non\-free
.fi
.br
@@ -1597,6 +1601,14 @@
{~^ ruby_logo.png "Ruby" }http://www.ruby\-lang.org/en/
.br
.br
+.B markup example:
+
+.nf
+ { tux.png 64x80 }image
+ % various url linked images
+ {tux.png 64x80 "a better way" }http://www.sisudoc.org/
+ {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better \- with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/
+ {~^ ruby_logo.png "Ruby" }http://www.ruby\-lang.org/en/
.fi
.br
@@ -1677,7 +1689,7 @@
Very active contributors*** | 0| 31| 190| 692| 1,639| 3,016
No. of English language articles| 25| 16,000| 101,000| 190,000| 320,000| 630,000
No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,000|1,600,000
- \e* Contributed at least ten times; \e** at least 5 times in last month; \e*\e** more than 100 times in last month.
+ * Contributed at least ten times; ** at least 5 times in last month; *** more than 100 times in last month.
.fi
.br
@@ -2223,7 +2235,7 @@
.nf
Paragraph containing main term, second term and sub\-term.
- ={Main term:sub\-term+1|second sub\-term
+ ={Main term:sub\-term+1|second sub\-term}
A paragraph that continues discussion of the first sub\-term
.fi
@@ -3076,6 +3088,35 @@
.br
output_dir_structure_by: language
+.nf
+ |\-\- en
+ |\-\- epub
+ |\-\- hashes
+ |\-\- html
+ | |\-\- viral_spiral.david_bollier
+ | |\-\- manifest
+ | |\-\- qrcode
+ | |\-\- odt
+ | |\-\- pdf
+ | |\-\- sitemaps
+ | |\-\- txt
+ | |\-\- xhtml
+ | `\-\- xml
+ |\-\- po4a
+ | `\-\- live\-manual
+ | |\-\- po
+ | |\-\- fr
+ | `\-\- pot
+ `\-\- _sisu
+ |\-\- css
+ |\-\- image
+ |\-\- image_sys \-> \../../_sisu/image_sys
+ `\-\- xml
+ |\-\- rnc
+ |\-\- rng
+ `\-\- xsd
+.fi
+
.br
#by: language subject_dir/en/manifest/filename.html
@@ -3092,6 +3133,34 @@
.br
output_dir_structure_by: filetype
+.nf
+ |\-\- epub
+ |\-\- hashes
+ |\-\- html
+ |\-\- viral_spiral.david_bollier
+ |\-\- manifest
+ |\-\- qrcode
+ |\-\- odt
+ |\-\- pdf
+ |\-\- po4a
+ |\-\- live\-manual
+ | |\-\- po
+ | |\-\- fr
+ | `\-\- pot
+ |\-\- _sisu
+ | |\-\- css
+ | |\-\- image
+ | |\-\- image_sys \-> \../../_sisu/image_sys
+ | `\-\- xml
+ | |\-\- rnc
+ | |\-\- rng
+ | `\-\- xsd
+ |\-\- sitemaps
+ |\-\- txt
+ |\-\- xhtml
+ `\-\- xml
+.fi
+
.br
#by: filetype subject_dir/html/filename/manifest.en.html
@@ -3107,6 +3176,27 @@
.br
output_dir_structure_by: filename
+.nf
+ |\-\- epub
+ |\-\- po4a
+ |\-\- live\-manual
+ | |\-\- po
+ | |\-\- fr
+ | `\-\- pot
+ |\-\- _sisu
+ | |\-\- css
+ | |\-\- image
+ | |\-\- image_sys \-> \../../_sisu/image_sys
+ | `\-\- xml
+ | |\-\- rnc
+ | |\-\- rng
+ | `\-\- xsd
+ |\-\- sitemaps
+ |\-\- src
+ |\-\- pod
+ `\-\- viral_spiral.david_bollier
+.fi
+
.br
#by: filename subject_dir/filename/manifest.en.html
diff -Nru sisu-3.1.5/man/man1/sisu3.1 sisu-3.1.8/man/man1/sisu3.1
--- sisu-3.1.5/man/man1/sisu3.1 2011-11-21 05:13:54.000000000 +0000
+++ sisu-3.1.8/man/man1/sisu3.1 2011-12-14 03:08:36.000000000 +0000
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2011-10-03" "3.1.0" "SiSU"
+.TH "sisu" "1" "2011-12-08" "3.1.7" "SiSU"
.br
.SH NAME
.br
@@ -221,13 +221,22 @@
screen output will be without colour). Alias \-c
.TP
+.B \-\-configure
+configure/initialise shared output directory files initialize shared output
+directory (config files such as css and dtd files are not updated if they
+already exist unless modifier is used). The equivalent of: \-C \-\-init\-site
+configure/initialise site, more extensive than \-C on its own, shared output
+directory files/force update, existing shared output config files such as css
+and dtd files are updated if \-CC is used.
+
+.TP
.B \-\-concordance [filename/wildcard]
produces concordance (wordmap) a rudimentary index of all the words in a
document. (Concordance files are not generated for documents of over 260,000
words unless this limit is increased in the file sisurc.yml). Alias \-w
.TP
-.B \-C [\-\-init\-site]
+.B \-C
configure/initialise shared output directory files initialize shared output
directory (config files such as css and dtd files are not updated if they
already exist unless modifier is used). \-C \-\-init\-site configure/initialise
@@ -237,12 +246,7 @@
.TP
.B \-CC
-configure/initialise shared output directory files initialize shared output
-directory (config files such as css and dtd files are not updated if they
-already exist unless modifier is used). The equivalent of: \-C \-\-init\-site
-configure/initialise site, more extensive than \-C on its own, shared output
-directory files/force update, existing shared output config files such as css
-and dtd files are updated if \-CC is used.
+see \-\-configure
.TP
.B \-c [filename/wildcard]
@@ -1520,7 +1524,7 @@
.nf
normal text _http://www.sisudoc.org/ continues
- deb http://www.jus.uio.no/sisu/archive unstable main non\-free
+ deb _http://www.jus.uio.no/sisu/archive unstable main non\-free
.fi
.br
@@ -1597,6 +1601,14 @@
{~^ ruby_logo.png "Ruby" }http://www.ruby\-lang.org/en/
.br
.br
+.B markup example:
+
+.nf
+ { tux.png 64x80 }image
+ % various url linked images
+ {tux.png 64x80 "a better way" }http://www.sisudoc.org/
+ {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better \- with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/
+ {~^ ruby_logo.png "Ruby" }http://www.ruby\-lang.org/en/
.fi
.br
@@ -1677,7 +1689,7 @@
Very active contributors*** | 0| 31| 190| 692| 1,639| 3,016
No. of English language articles| 25| 16,000| 101,000| 190,000| 320,000| 630,000
No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,000|1,600,000
- \e* Contributed at least ten times; \e** at least 5 times in last month; \e*\e** more than 100 times in last month.
+ * Contributed at least ten times; ** at least 5 times in last month; *** more than 100 times in last month.
.fi
.br
@@ -2223,7 +2235,7 @@
.nf
Paragraph containing main term, second term and sub\-term.
- ={Main term:sub\-term+1|second sub\-term
+ ={Main term:sub\-term+1|second sub\-term}
A paragraph that continues discussion of the first sub\-term
.fi
@@ -3076,6 +3088,35 @@
.br
output_dir_structure_by: language
+.nf
+ |\-\- en
+ |\-\- epub
+ |\-\- hashes
+ |\-\- html
+ | |\-\- viral_spiral.david_bollier
+ | |\-\- manifest
+ | |\-\- qrcode
+ | |\-\- odt
+ | |\-\- pdf
+ | |\-\- sitemaps
+ | |\-\- txt
+ | |\-\- xhtml
+ | `\-\- xml
+ |\-\- po4a
+ | `\-\- live\-manual
+ | |\-\- po
+ | |\-\- fr
+ | `\-\- pot
+ `\-\- _sisu
+ |\-\- css
+ |\-\- image
+ |\-\- image_sys \-> \../../_sisu/image_sys
+ `\-\- xml
+ |\-\- rnc
+ |\-\- rng
+ `\-\- xsd
+.fi
+
.br
#by: language subject_dir/en/manifest/filename.html
@@ -3092,6 +3133,34 @@
.br
output_dir_structure_by: filetype
+.nf
+ |\-\- epub
+ |\-\- hashes
+ |\-\- html
+ |\-\- viral_spiral.david_bollier
+ |\-\- manifest
+ |\-\- qrcode
+ |\-\- odt
+ |\-\- pdf
+ |\-\- po4a
+ |\-\- live\-manual
+ | |\-\- po
+ | |\-\- fr
+ | `\-\- pot
+ |\-\- _sisu
+ | |\-\- css
+ | |\-\- image
+ | |\-\- image_sys \-> \../../_sisu/image_sys
+ | `\-\- xml
+ | |\-\- rnc
+ | |\-\- rng
+ | `\-\- xsd
+ |\-\- sitemaps
+ |\-\- txt
+ |\-\- xhtml
+ `\-\- xml
+.fi
+
.br
#by: filetype subject_dir/html/filename/manifest.en.html
@@ -3107,6 +3176,27 @@
.br
output_dir_structure_by: filename
+.nf
+ |\-\- epub
+ |\-\- po4a
+ |\-\- live\-manual
+ | |\-\- po
+ | |\-\- fr
+ | `\-\- pot
+ |\-\- _sisu
+ | |\-\- css
+ | |\-\- image
+ | |\-\- image_sys \-> \../../_sisu/image_sys
+ | `\-\- xml
+ | |\-\- rnc
+ | |\-\- rng
+ | `\-\- xsd
+ |\-\- sitemaps
+ |\-\- src
+ |\-\- pod
+ `\-\- viral_spiral.david_bollier
+.fi
+
.br
#by: filename subject_dir/filename/manifest.en.html