aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README71
-rw-r--r--data/doc/sisu/CHANGELOG_v511
-rw-r--r--data/doc/sisu/CHANGELOG_v611
-rw-r--r--data/doc/sisu/markup-samples/manual/README6
-rw-r--r--data/doc/sisu/markup-samples/manual/en/sisu_commands.sst25
-rw-r--r--data/sisu/v5/v/version.yml6
-rw-r--r--data/sisu/v6/v/version.yml6
-rw-r--r--lib/sisu/v5/options.rb22
-rw-r--r--lib/sisu/v5/sysenv.rb4
-rw-r--r--lib/sisu/v6/options.rb22
-rw-r--r--lib/sisu/v6/sysenv.rb4
-rw-r--r--man/man1/sisu.161
-rw-r--r--rbuild4
13 files changed, 139 insertions, 114 deletions
diff --git a/README b/README
index 16c4cadb..2fbe3bf8 100644
--- a/README
+++ b/README
@@ -253,7 +253,7 @@ paragraph --unix for unix linefeed (default) --msdos for msdos linefeed)
assumed for most other flags, creates new intermediate files for processing
(abstract objects, 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. (sisu v5)
+skip it see -n. Alias -m.
*-b [filename/wildcard]*
see --xhtml
@@ -310,16 +310,14 @@ see --pg
see --sqlite
*--dal [filename/wildcard/url]*
-assumed for most other flags, creates new intermediate files for processing
-(abstract objects, 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. Renamed --ao (abstract objects) in sisu v5. Alias -m
+(abstract objects, document abstraction renamed abstract objects in sisu5) see
+--ao
*--delete [filename/wildcard]*
see --zap
*--docbook [filename/wildcard/url]*
-docbook smart text (sisu v5)
+docbook smart text (not available)
*--dump[=directory_path] [filename/wildcard]*
places output in directory specified, if none is specified in the current
@@ -333,23 +331,23 @@ see --epub
produces an epub document, [sisu version >=2 ] (filename.epub). Alias -e
*--exc-**
-exclude output feature, overrides configuration settings --exc-ocn, (exclude
-/object citation numbering/, (switches off /object citation numbering/) ,
-affects html (seg, scroll), epub, xhtml, xml, pdf) ; --exc-toc, (exclude table
-of contents, affects html (scroll), epub, pdf) ; --exc-links-to-manifest,
---exc-manifest-links, (exclude links to manifest, affects html (seg, scroll));
---exc-search-form, (exclude search form, affects html (seg, scroll), manifest);
---exc-minitoc, (exclude mini table of contents, affects html (seg),
-concordance, manifest); --exc-manifest-minitoc, (exclude mini table of
-contents, affects manifest); --exc-html-minitoc, (exclude mini table of
-contents, affects html (seg), concordance); --exc-html-navigation, (exclude
-navigation, affects html (seg)); --exc-html-navigation-bar, (exclude navigation
-bar, affects html (seg)); --exc-html-search-form, (exclude search form, affects
-html (seg, scroll)); --exc-html-right-pane, (exclude right pane/column, affects
-html (seg, scroll)); --exc-html-top-band, (exclude top band, affects html (seg,
-scroll), concordance (minitoc forced on to provide seg navigation));
---exc-segsubtoc (exclude sub table of contents, affects html (seg), epub) ; see
-also --inc-*
+exclude output feature, overrides configuration settings --exc-numbering, see
+--exc-ocn; --exc-ocn, (exclude "object citation numbering", (switches off
+object citation numbers), affects html (seg, scroll), epub, xhtml, xml, pdf) ;
+--exc-toc, (exclude table of contents, affects html (scroll), epub, pdf) ;
+--exc-links-to-manifest, --exc-manifest-links, (exclude links to manifest,
+affects html (seg, scroll)); --exc-search-form, (exclude search form, affects
+html (seg, scroll), manifest); --exc-minitoc, (exclude mini table of contents,
+affects html (seg), concordance, manifest); --exc-manifest-minitoc, (exclude
+mini table of contents, affects manifest); --exc-html-minitoc, (exclude mini
+table of contents, affects html (seg), concordance); --exc-html-navigation,
+(exclude navigation, affects html (seg)); --exc-html-navigation-bar, (exclude
+navigation bar, affects html (seg)); --exc-html-search-form, (exclude search
+form, affects html (seg, scroll)); --exc-html-right-pane, (exclude right
+pane/column, affects html (seg, scroll)); --exc-html-top-band, (exclude top
+band, affects html (seg, scroll), concordance (minitoc forced on to provide seg
+navigation)); --exc-segsubtoc (exclude sub table of contents, affects html
+(seg), epub) ; see also --inc-*
*-F [--webserv=webrick]*
see --sample-search-form
@@ -358,7 +356,7 @@ see --sample-search-form
see --find
*--fictionbook [filename/wildcard/url]*
-fictionbook smart text (sisu v5)
+fictionbook smart text (not available)
*--find [optional string part of filename]*
without match string, glob all .sst .ssm files in directory (including language
@@ -453,7 +451,7 @@ maintenance mode, interim processing files are preserved and their locations
indicated. (also see -V). Aliases -M and --keep-processing-files.
*--markdown [filename/wildcard/url]*
-markdown smart text (sisu v5)
+markdown smart text (not available)
*--manpage [filename/wildcard]*
produces man page of file, not suitable for all outputs. Alias -i
@@ -478,11 +476,14 @@ by most processing flags.
*--no-**
see --exc-*
+*--numbering*
+turn on "object citation numbers". See --inc-ocn and --exc-ocn
+
*-o [filename/wildcard/url]*
see --odt
*--ocn*
-see --inc-ocn and --exc-ocn
+"object citation numbers". See --inc-ocn and --exc-ocn
*--odf [filename/wildcard/url]*
see --odt
@@ -586,7 +587,7 @@ subdirectory under the current directory (pwd). Unlike using default settings
/HTML/ files have embedded css. Compare --dump
*--rst [filename/wildcard/url]*
-ReST (rST restructured text) smart text (sisu v5)
+ReST (rST restructured text) smart text (not available)
*--rsync [filename/wildcard]*
copies sisu output files to remote host using rsync. This requires that
@@ -679,7 +680,7 @@ see --txt
produces texinfo and info file, (view with pinfo). Alias -I
*--textile [filename/wildcard/url]*
-textile smart text (sisu v5)
+textile smart text (not available)
*--txt [filename/wildcard]*
produces /plaintext/ with Unix linefeeds and without markup, (object numbers
@@ -2206,13 +2207,13 @@ Configure substitution in _sisu/sisu_document_make
Filetype: SiSU text insert 5.0,
Source digest: SHA256(README.ssm.sst)=
- 5927789066d1eb9cf0321946d46e3ce2a66414557038d5c745bb009233611dd8
+ e9ee6379dcf3a05c2b0ae19f091f7e2b1579d7b8a683996a8c53eb57249497c4
- Generated by: Generated by: SiSU 6.0.1 of 2014w05/2 (2014-02-04)
+ Generated by: Generated by: SiSU 6.0.4 of 2014w06/5 (2014-02-14)
- Ruby version: ruby 2.0.0p353 (2013-11-22) [i386-linux-gnu]
+ Ruby version: ruby 2.1.0p0 (2013-12-25) [i386-linux-gnu]
- Document (ao) last generated: 2014-02-04 23:45:41 -0500
+ Document (ao) last generated: 2014-02-14 00:05:38 -0500
==============================================================================
@@ -2230,7 +2231,7 @@ at:
-* Generated by: SiSU 6.0.3 of 2014w05/4 (2014-02-06)
-* Ruby version: ruby 2.0.0p353 (2013-11-22) [i386-linux-gnu]
-* Last Generated on: 2014-02-08 20:38:31 -0500
+* Generated by: SiSU 6.0.4 of 2014w06/5 (2014-02-14)
+* Ruby version: ruby 2.1.0p0 (2013-12-25) [i386-linux-gnu]
+* Last Generated on: 2014-02-14 00:05:39 -0500
* SiSU http://www.sisudoc.org/
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 639d9d90..04a836fb 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,17 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 5.3.4.orig.tar.xz (2014-02-14:06/5)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.4-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.4.orig.tar.xz
+ sisu_5.3.4.orig.tar.xz
+ sisu_5.3.4-1.dsc
+
+* ocn, object citation numbering
+ * add perhaps less cryptic --numbering --no-numbering command-line options
+ * plaintext & odt switch default to ocn==true for consistency
+
%% 5.3.3.orig.tar.xz (2014-02-08:05/6)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.3
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.3-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 5cc8918e..922c84fd 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,17 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 6.0.4.orig.tar.xz (2014-02-14:06/5)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.4-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.4.orig.tar.xz
+ sisu_6.0.4.orig.tar.xz
+ sisu_6.0.4-1.dsc
+
+* ocn, object citation numbering
+ * add perhaps less cryptic --numbering --no-numbering command-line options
+ * plaintext & odt switch default to ocn==true for consistency
+
%% 6.0.3.orig.tar.xz (2014-02-08:05/6)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.3
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.3-1
diff --git a/data/doc/sisu/markup-samples/manual/README b/data/doc/sisu/markup-samples/manual/README
index 76b55552..dab91438 100644
--- a/data/doc/sisu/markup-samples/manual/README
+++ b/data/doc/sisu/markup-samples/manual/README
@@ -1,5 +1,5 @@
-ruby ../../../../../bin/sisu6 --txt -v en/README.ssm
-ruby ../../../../../bin/sisu6 --txt -v --no-manifest --dump='../../../../../..' en/README.ssm
+ruby ../../../../../bin/sisu6 --txt --no-ocn -v en/README.ssm
+ruby ../../../../../bin/sisu6 --txt --no-ocn -v --no-manifest --dump='../../../../../..' en/README.ssm
-ruby ../../../../../bin/sisu6 --manpage -v en/README.ssm
+ruby ../../../../../bin/sisu6 --manpage -v en/sisu.ssm
ruby ../../../../../bin/sisu6 --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
index be491bf8..c1a0788a 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
@@ -41,7 +41,7 @@ SiSU is a document publishing system, that from a simple single marked-up docume
produces plaintext with Unix linefeeds and without markup, (object numbers are omitted), has footnotes at end of each paragraph that contains them [ -A for equivalent dos (linefeed) output file] [see -e for endnotes]. (Options include: --endnotes for endnotes --footnotes for footnotes at the end of each paragraph --unix for unix linefeed (default) --msdos for msdos linefeed)
!_ --ao [filename/wildcard/url] \\
-assumed for most other flags, creates new intermediate files for processing (abstract objects, 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. (sisu v5)
+assumed for most other flags, creates new intermediate files for processing (abstract objects, 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.
!_ -b [filename/wildcard] \\
see --xhtml
@@ -83,13 +83,13 @@ see --pg
see --sqlite
!_ --dal [filename/wildcard/url] \\
-assumed for most other flags, creates new intermediate files for processing (abstract objects, 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. Renamed --ao (abstract objects) in sisu v5. Alias -m
+(abstract objects, document abstraction renamed abstract objects in sisu5) see --ao
!_ --delete [filename/wildcard] \\
see --zap
!_ --docbook [filename/wildcard/url] \\
-docbook smart text (sisu v5)
+docbook smart text (not available)
!_ --dump[=directory_path] [filename/wildcard] \\
places output in directory specified, if none is specified in the current directory (pwd). Unlike using default settings HTML files have embedded css. Compare --redirect
@@ -102,7 +102,8 @@ produces an epub document, [sisu version >=2 ] (filename.epub). Alias -e
!_ --exc-* \\
exclude output feature, overrides configuration settings
- --exc-ocn, (exclude object citation numbering, (switches off object citation numbering), affects html (seg, scroll), epub, xhtml, xml, pdf);
+ --exc-numbering, see --exc-ocn;
+ --exc-ocn, (exclude "object citation numbering", (switches off object citation numbers), affects html (seg, scroll), epub, xhtml, xml, pdf);
--exc-toc, (exclude table of contents, affects html (scroll), epub, pdf);
--exc-links-to-manifest, --exc-manifest-links, (exclude links to manifest, affects html (seg, scroll));
--exc-search-form, (exclude search form, affects html (seg, scroll), manifest);
@@ -124,7 +125,7 @@ see --sample-search-form
see --find
!_ --fictionbook [filename/wildcard/url] \\
-fictionbook smart text (sisu v5)
+fictionbook smart text (not available)
!_ --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
@@ -176,8 +177,7 @@ Where output is in one language only the language code may not be desired.
see also --output-by-*
!_ --inc-* \\
-include output feature, overrides configuration settings, (usually the default if none set), has precedence over --exc-* (exclude output feature). Some detail provided under --exc-*,
-see --exc-*
+include output feature, overrides configuration settings, (usually the default if none set), has precedence over --exc-* (exclude output feature). Some detail provided under --exc-*, see --exc-*
!_ -j [filename/wildcard] \\
copies images associated with a file for use by html, xhtml & xml outputs (automatically invoked by --dump & redirect).
@@ -201,7 +201,7 @@ see --dal (document abstraction level/layer)
maintenance mode, interim processing files are preserved and their locations indicated. (also see -V). Aliases -M and --keep-processing-files.
!_ --markdown [filename/wildcard/url] \\
-markdown smart text (sisu v5)
+markdown smart text (not available)
!_ --manpage [filename/wildcard] \\
produces man page of file, not suitable for all outputs. Alias -i
@@ -221,11 +221,14 @@ skip the creation of intermediate processing files (document abstraction) if the
!_ --no-* \\
see --exc-*
+!_ --numbering \\
+turn on "object citation numbers". See --inc-ocn and --exc-ocn
+
!_ -o [filename/wildcard/url] \\
see --odt
!_ --ocn \\
-see --inc-ocn and --exc-ocn
+"object citation numbers". See --inc-ocn and --exc-ocn
!_ --odf [filename/wildcard/url] \\
see --odt
@@ -298,7 +301,7 @@ see --scp
places output in subdirectory under specified directory, subdirectory uses the filename (without the suffix). If no output directory is specified places the subdirectory under the current directory (pwd). Unlike using default settings HTML files have embedded css. Compare --dump
!_ --rst [filename/wildcard/url] \\
-ReST (rST restructured text) smart text (sisu v5)
+ReST (rST restructured text) smart text (not available)
!_ --rsync [filename/wildcard] \\
copies sisu output files to remote host using rsync. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Note the behavior of rsync different if -R is used with other flags from if used alone. Alone the rsync --delete parameter is sent, useful for cleaning the remote directory (when -R is used together with other flags, it is not). Also see --scp. Alias -R
@@ -343,7 +346,7 @@ see --txt
produces texinfo and info file, (view with pinfo). Alias -I
!_ --textile [filename/wildcard/url] \\
-textile smart text (sisu v5)
+textile smart text (not available)
!_ --txt [filename/wildcard] \\
produces plaintext with Unix linefeeds and without markup, (object numbers are omitted), has footnotes at end of each paragraph that contains them [ -A for equivalent dos (linefeed) output file] [see -e for endnotes]. (Options include: --endnotes for endnotes --footnotes for footnotes at the end of each paragraph --unix for unix linefeed (default) --msdos for msdos linefeed). Alias -t
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 874b14b3..077b7e41 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
-:version: 5.3.3
-:date_stamp: 2014w05/6
-:date: "2014-02-08"
+:version: 5.3.4
+:date_stamp: 2014w06/5
+:date: "2014-02-14"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index 5cac813b..4c93b69d 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
-:version: 6.0.3
-:date_stamp: 2014w05/6
-:date: "2014-02-08"
+:version: 6.0.4
+:date_stamp: 2014w06/5
+:date: "2014-02-14"
diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb
index bce0a8a4..85e71f40 100644
--- a/lib/sisu/v5/options.rb
+++ b/lib/sisu/v5/options.rb
@@ -666,10 +666,10 @@ module SiSU_Commandline
{ set: :filetype }
else { set: :na }
end
- act[:ocn]=if mod.inspect =~/"--ocn"|"--inc-ocn"/
+ act[:ocn]=if mod.inspect =~/"--ocn"|"--inc-ocn"|"--numbering"|"--inc-numbering"/
{ bool: true, set: :on }
- elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"/ \
- || act[:switch][:off].inspect =~/"ocn"/
+ elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"|"--no-numbering"|"--exc-numbering"/ \
+ || act[:switch][:off].inspect =~/"ocn"|"--numbering"/
{ bool: false, set: :off }
else { bool: true, set: :na }
end
@@ -866,11 +866,11 @@ module SiSU_Commandline
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:odt]=if cmd =~/o/ \
- or mod.inspect =~/"--odt"|"--odf"|"--odt-ocn"|"--odf-ocn"/
- act[:odt_ocn]=if (mod.inspect =~/"--odt-ocn"|"--odf-ocn"/ \
- or mod.inspect =~/"--ocn"|"--inc-ocn"/)
+ or mod.inspect =~/"--odt"|"--odf"|"--odt-(?:ocn|numbering)"|"--odf-(?:ocn|numbering)"/
+ act[:odt_ocn]=if (mod.inspect =~/"--odt-(?:ocn|numbering)"|"--odf-(?:ocn|numbering)"/ \
+ or mod.inspect =~/"--ocn"|"--inc-ocn"|"--numbering"|"--inc-numbering"/)
{ bool: true, set: :on }
- elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"/
+ elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"|"--no-numbering"|"--exc-numbering"/
{ bool: false, set: :off }
else
{ bool: false, set: :na }
@@ -905,11 +905,11 @@ module SiSU_Commandline
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:txt]=if cmd =~/[at]/ \
- or mod.inspect =~/"--txt"|"--text"|"--plaintext"|"--txt-ocn"|"--text-ocn"|"--plaintext-ocn"/
- act[:txt_ocn]=if (mod.inspect =~/"--txt-ocn"|"--text-ocn"|"--plaintext-ocn"/ \
- or mod.inspect =~/"--ocn"|"--inc-ocn"/)
+ or mod.inspect =~/"--txt"|"--text"|"--plaintext"|"--txt-(?:ocn|numbering)"|"--text-(?:ocn|numbering)"|"--plaintext-(?:ocn|numbering)"/
+ act[:txt_ocn]=if (mod.inspect =~/"--txt-(?:ocn|numbering)"|"--text-(?:ocn|numbering)"|"--plaintext-(?:ocn|numbering)"/ \
+ or mod.inspect =~/"--ocn"|"--inc-ocn"|"--numbering"|"--inc-numbering"/)
{ bool: true, set: :on }
- elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"/
+ elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"|"--no-numbering"|"--exc-numbering"/
{ bool: false, set: :off }
else
{ bool: false, set: :na }
diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb
index 7d8a9766..491ca94f 100644
--- a/lib/sisu/v5/sysenv.rb
+++ b/lib/sisu/v5/sysenv.rb
@@ -3919,7 +3919,7 @@ WOK
elsif env_rc.build.ocn? ==:off
false
else
- false
+ true
end
end
def odt_ocn?
@@ -3936,7 +3936,7 @@ WOK
elsif env_rc.build.ocn? ==:off
false
else
- false
+ true
end
end
def html_strict?
diff --git a/lib/sisu/v6/options.rb b/lib/sisu/v6/options.rb
index 6f4cce37..aacfcbe6 100644
--- a/lib/sisu/v6/options.rb
+++ b/lib/sisu/v6/options.rb
@@ -666,10 +666,10 @@ module SiSU_Commandline
{ set: :filetype }
else { set: :na }
end
- act[:ocn]=if mod.inspect =~/"--ocn"|"--inc-ocn"/
+ act[:ocn]=if mod.inspect =~/"--ocn"|"--inc-ocn"|"--numbering"|"--inc-numbering"/
{ bool: true, set: :on }
- elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"/ \
- || act[:switch][:off].inspect =~/"ocn"/
+ elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"|"--no-numbering"|"--exc-numbering"/ \
+ || act[:switch][:off].inspect =~/"ocn"|"--numbering"/
{ bool: false, set: :off }
else { bool: true, set: :na }
end
@@ -866,11 +866,11 @@ module SiSU_Commandline
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:odt]=if cmd =~/o/ \
- or mod.inspect =~/"--odt"|"--odf"|"--odt-ocn"|"--odf-ocn"/
- act[:odt_ocn]=if (mod.inspect =~/"--odt-ocn"|"--odf-ocn"/ \
- or mod.inspect =~/"--ocn"|"--inc-ocn"/)
+ or mod.inspect =~/"--odt"|"--odf"|"--odt-(?:ocn|numbering)"|"--odf-(?:ocn|numbering)"/
+ act[:odt_ocn]=if (mod.inspect =~/"--odt-(?:ocn|numbering)"|"--odf-(?:ocn|numbering)"/ \
+ or mod.inspect =~/"--ocn"|"--inc-ocn"|"--numbering"|"--inc-numbering"/)
{ bool: true, set: :on }
- elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"/
+ elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"|"--no-numbering"|"--exc-numbering"/
{ bool: false, set: :off }
else
{ bool: false, set: :na }
@@ -905,11 +905,11 @@ module SiSU_Commandline
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:txt]=if cmd =~/[at]/ \
- or mod.inspect =~/"--txt"|"--text"|"--plaintext"|"--txt-ocn"|"--text-ocn"|"--plaintext-ocn"/
- act[:txt_ocn]=if (mod.inspect =~/"--txt-ocn"|"--text-ocn"|"--plaintext-ocn"/ \
- or mod.inspect =~/"--ocn"|"--inc-ocn"/)
+ or mod.inspect =~/"--txt"|"--text"|"--plaintext"|"--txt-(?:ocn|numbering)"|"--text-(?:ocn|numbering)"|"--plaintext-(?:ocn|numbering)"/
+ act[:txt_ocn]=if (mod.inspect =~/"--txt-(?:ocn|numbering)"|"--text-(?:ocn|numbering)"|"--plaintext-(?:ocn|numbering)"/ \
+ or mod.inspect =~/"--ocn"|"--inc-ocn"|"--numbering"|"--inc-numbering"/)
{ bool: true, set: :on }
- elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"/
+ elsif mod.inspect =~/"--no-ocn"|"--exc-ocn"|"--no-numbering"|"--exc-numbering"/
{ bool: false, set: :off }
else
{ bool: false, set: :na }
diff --git a/lib/sisu/v6/sysenv.rb b/lib/sisu/v6/sysenv.rb
index 16fbbf4c..ece3ca79 100644
--- a/lib/sisu/v6/sysenv.rb
+++ b/lib/sisu/v6/sysenv.rb
@@ -3921,7 +3921,7 @@ WOK
elsif env_rc.build.ocn? ==:off
false
else
- false
+ true
end
end
def odt_ocn?
@@ -3938,7 +3938,7 @@ WOK
elsif env_rc.build.ocn? ==:off
false
else
- false
+ true
end
end
def html_strict?
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index 478f1f6f..c3229e00 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2014-02-05" "6.0.3" "SiSU"
+.TH "sisu" "1" "2014-02-14" "6.0.4" "SiSU"
.br
.SH NAME
.br
@@ -141,7 +141,7 @@ linefeed (default) --msdos for msdos linefeed)
assumed for most other flags, creates new intermediate files for processing
(abstract objects, 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. (sisu v5)
+skip it see -n. Alias -m.
.TP
.B -b [filename/wildcard]
see --xhtml
@@ -198,16 +198,14 @@ see --pg
see --sqlite
.TP
.B --dal [filename/wildcard/url]
-assumed for most other flags, creates new intermediate files for processing
-(abstract objects, 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. Renamed --ao (abstract objects) in sisu v5. Alias -m
+(abstract objects, document abstraction renamed abstract objects in sisu5) see
+--ao
.TP
.B --delete [filename/wildcard]
see --zap
.TP
.B --docbook [filename/wildcard/url]
-docbook smart text (sisu v5)
+docbook smart text (not available)
.TP
.B --dump[=directory_path] [filename/wildcard]
places output in directory specified, if none is specified in the current
@@ -222,25 +220,23 @@ see --epub
produces an epub document, [sisu version >=2 ] (filename.epub). Alias -e
.TP
.B --exc-*
-exclude output feature, overrides configuration settings --exc-ocn, (exclude
-.I object citation numbering,
-(switches off
-.I object citation numbering
-) , affects html (seg, scroll), epub, xhtml, xml, pdf) ; --exc-toc, (exclude
-table of contents, affects html (scroll), epub, pdf) ; --exc-links-to-manifest,
---exc-manifest-links, (exclude links to manifest, affects html (seg, scroll));
---exc-search-form, (exclude search form, affects html (seg, scroll), manifest);
---exc-minitoc, (exclude mini table of contents, affects html (seg),
-concordance, manifest); --exc-manifest-minitoc, (exclude mini table of
-contents, affects manifest); --exc-html-minitoc, (exclude mini table of
-contents, affects html (seg), concordance); --exc-html-navigation, (exclude
-navigation, affects html (seg)); --exc-html-navigation-bar, (exclude navigation
-bar, affects html (seg)); --exc-html-search-form, (exclude search form, affects
-html (seg, scroll)); --exc-html-right-pane, (exclude right pane/column, affects
-html (seg, scroll)); --exc-html-top-band, (exclude top band, affects html (seg,
-scroll), concordance (minitoc forced on to provide seg navigation));
---exc-segsubtoc (exclude sub table of contents, affects html (seg), epub) ; see
-also --inc-*
+exclude output feature, overrides configuration settings --exc-numbering, see
+--exc-ocn; --exc-ocn, (exclude "object citation numbering", (switches off
+object citation numbers), affects html (seg, scroll), epub, xhtml, xml, pdf) ;
+--exc-toc, (exclude table of contents, affects html (scroll), epub, pdf) ;
+--exc-links-to-manifest, --exc-manifest-links, (exclude links to manifest,
+affects html (seg, scroll)); --exc-search-form, (exclude search form, affects
+html (seg, scroll), manifest); --exc-minitoc, (exclude mini table of contents,
+affects html (seg), concordance, manifest); --exc-manifest-minitoc, (exclude
+mini table of contents, affects manifest); --exc-html-minitoc, (exclude mini
+table of contents, affects html (seg), concordance); --exc-html-navigation,
+(exclude navigation, affects html (seg)); --exc-html-navigation-bar, (exclude
+navigation bar, affects html (seg)); --exc-html-search-form, (exclude search
+form, affects html (seg, scroll)); --exc-html-right-pane, (exclude right
+pane/column, affects html (seg, scroll)); --exc-html-top-band, (exclude top
+band, affects html (seg, scroll), concordance (minitoc forced on to provide seg
+navigation)); --exc-segsubtoc (exclude sub table of contents, affects html
+(seg), epub) ; see also --inc-*
.TP
.B -F [--webserv=webrick]
see --sample-search-form
@@ -249,7 +245,7 @@ see --sample-search-form
see --find
.TP
.B --fictionbook [filename/wildcard/url]
-fictionbook smart text (sisu v5)
+fictionbook smart text (not available)
.TP
.B --find [optional string part of filename]
without match string, glob all .sst .ssm files in directory (including language
@@ -344,7 +340,7 @@ maintenance mode, interim processing files are preserved and their locations
indicated. (also see -V). Aliases -M and --keep-processing-files.
.TP
.B --markdown [filename/wildcard/url]
-markdown smart text (sisu v5)
+markdown smart text (not available)
.TP
.B --manpage [filename/wildcard]
produces man page of file, not suitable for all outputs. Alias -i
@@ -369,11 +365,14 @@ by most processing flags.
.B --no-*
see --exc-*
.TP
+.B --numbering
+turn on "object citation numbers". See --inc-ocn and --exc-ocn
+.TP
.B -o [filename/wildcard/url]
see --odt
.TP
.B --ocn
-see --inc-ocn and --exc-ocn
+"object citation numbers". See --inc-ocn and --exc-ocn
.TP
.B --odf [filename/wildcard/url]
see --odt
@@ -490,7 +489,7 @@ subdirectory under the current directory (pwd). Unlike using default settings
files have embedded css. Compare --dump
.TP
.B --rst [filename/wildcard/url]
-ReST (rST restructured text) smart text (sisu v5)
+ReST (rST restructured text) smart text (not available)
.TP
.B --rsync [filename/wildcard]
copies sisu output files to remote host using rsync. This requires that
@@ -593,7 +592,7 @@ see --txt
produces texinfo and info file, (view with pinfo). Alias -I
.TP
.B --textile [filename/wildcard/url]
-textile smart text (sisu v5)
+textile smart text (not available)
.TP
.B --txt [filename/wildcard]
produces
diff --git a/rbuild b/rbuild
index 7e0946e7..82ce763f 100644
--- a/rbuild
+++ b/rbuild
@@ -37,8 +37,8 @@
#require 'mkmf'
#create_makefile("sisu")
#% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
-SiSU_version_next_stable = '5.3.3'
-SiSU_version_next_unstable = '6.0.3'
+SiSU_version_next_stable = '5.3.4'
+SiSU_version_next_unstable = '6.0.4'
#% rake file
SiSU_version_generic_next_stable = '5.3.x'
SiSU_version_generic_next_unstable = '6.0.x'
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 14:04:44 +0000