From e132337b5095718f14764b9db701729d811ba4da Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 20:27:19 -0400 Subject: v5 v6: version & changelog (& rakefile) --- data/doc/sisu/CHANGELOG_v5 | 7 +++++++ data/doc/sisu/CHANGELOG_v6 | 7 +++++++ data/sisu/v5/v/version.yml | 6 +++--- data/sisu/v6/v/version.yml | 6 +++--- 4 files changed, 20 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 04a836fb..a03b1b0e 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -31,6 +31,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 5.3.5.orig.tar.xz (2014-05-12:19/1) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.5 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.5-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz + sisu_5.3.5.orig.tar.xz + sisu_5.3.5-1.dsc + %% 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 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 922c84fd..a2541dc2 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -21,6 +21,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 6.0.5.orig.tar.xz (2014-05-12:19/1) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.5 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.5-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz + sisu_6.0.5.orig.tar.xz + sisu_6.0.5-1.dsc + %% 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 diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index 077b7e41..cbe3f4e0 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.3.4 -:date_stamp: 2014w06/5 -:date: "2014-02-14" +:version: 5.3.5 +:date_stamp: 2014w19/1 +:date: "2014-05-12" diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml index 4c93b69d..8ce3ad41 100644 --- a/data/sisu/v6/v/version.yml +++ b/data/sisu/v6/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 6.0.4 -:date_stamp: 2014w06/5 -:date: "2014-02-14" +:version: 6.0.5 +:date_stamp: 2014w19/1 +:date: "2014-05-12" -- cgit v1.2.3 From e38554e5acad9b3dd93b0e6e4cedd39d5ff2f1a2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 20:31:23 -0400 Subject: v5 v6: coding, various minor cosmetic --- data/doc/sisu/markup-samples/manual/en/sisu_markup.sst | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst index fbd6d1f4..be6d7b9d 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst @@ -1168,9 +1168,9 @@ To draw a dividing line dividing paragraphs, see the section on page breaks. Page breaks are only relevant and honored in some output formats. A page break or a new page may be inserted manually using the following markup on a line on its own: -page new =\\= or <:pn> breaks the page, starts a new page. +page new =\\= (or <:pn>) breaks the page, starts a new page. -page break -\\- or <:pb> breaks a column, starts a new column, if using columns, else breaks the page, starts a new page. +page break -\\- (or <:pb>) breaks a column, starts a new column, if using columns, else breaks the page, starts a new page. page break line across page -..- draws a dividing line, dividing paragraphs @@ -1180,10 +1180,6 @@ code{ -\\- -or - -<:pb> - }code page (break) new: @@ -1192,10 +1188,6 @@ code{ =\\= -or - -<:pn> - }code page (break) line across page (dividing paragraphs): -- cgit v1.2.3 From 388eef4bdb54053bcf6f0bf7fafc8cc2f9dc4481 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 20:35:13 -0400 Subject: sisu.org start using emacs:evil:org; update .gitignore * (emacs:evil mode gifts a "vim" of "alternative" powers! ;) heretic --- data/doc/sisu/CHANGELOG_v5 | 2 ++ data/doc/sisu/CHANGELOG_v6 | 2 ++ 2 files changed, 4 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index a03b1b0e..062b1e1b 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz sisu_5.3.5.orig.tar.xz sisu_5.3.5-1.dsc +* added sisu.org emacs:evil:org mode notes related to sisu development + %% 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 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index a2541dc2..a8250d21 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz sisu_6.0.5.orig.tar.xz sisu_6.0.5-1.dsc +* added sisu.org emacs:evil:org mode notes related to sisu development + %% 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 -- cgit v1.2.3 From 5b6073188a8859780b69c0300958dc7219dcc340 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 20:41:02 -0400 Subject: =?UTF-8?q?v5=20v6:=20ao=5Fsyntax,=20address=20possible=20manual?= =?UTF-8?q?=20use=20of=20url=20delimiters=E3=80=8C=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/doc/sisu/CHANGELOG_v5 | 2 ++ data/doc/sisu/CHANGELOG_v6 | 2 ++ 2 files changed, 4 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 062b1e1b..9cae41da 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz sisu_5.3.5.orig.tar.xz sisu_5.3.5-1.dsc +* ao_syntax, address possible manual use of url delimiters「」 + * added sisu.org emacs:evil:org mode notes related to sisu development %% 5.3.4.orig.tar.xz (2014-02-14:06/5) diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index a8250d21..a412da59 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz sisu_6.0.5.orig.tar.xz sisu_6.0.5-1.dsc +* ao_syntax, address possible manual use of url delimiters「」 + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From fbe2d78acfde858fbff2a7e153c303435c86f5ac Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 20:50:25 -0400 Subject: syntax hilighting, includes with files in subdirectories fix * (Closes: #744355) --- data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'data') diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim index bee822db..d88720f4 100644 --- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -30,9 +30,7 @@ if !exists("sisu_no_identifiers") syn match sisu_number contains=@NoSpell "[0-9a-f]\{32\}\|[0-9a-f]\{64\}" syn match sisu_link contains=@NoSpell "\(_\?https\?://\|\.\.\/\)\S\+" syn match sisu_link " \*\~\S\+" - syn match sisu_action "^<:insert\d\+>" - syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^._-]\+\.ss[it]$" - syn match sisu_require contains=@NoSpell "^<<{[a-zA-Z0-9^._-]\+\.ss[it]}$" + syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^./_-]\+\.ss[it]$" syn match sisu_structure "^:A\~$" "% "Document Sub Headers: -- cgit v1.2.3 From b28cf1c5cf4be19a5869ddfabf83e0b81f778860 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 20:54:28 -0400 Subject: v5 v6: composite, fix includes, provide extra newline after inserted comment * (Closes: #744360) [n|u] sisu: includes do not work properly --- data/doc/sisu/CHANGELOG_v5 | 3 +++ data/doc/sisu/CHANGELOG_v6 | 3 +++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 9cae41da..12c16c8a 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -40,6 +40,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz * ao_syntax, address possible manual use of url delimiters「」 +* composite, fix includes, provide extra newline after inserted comment + (Closes: #744360) "includes do not work properly" + * added sisu.org emacs:evil:org mode notes related to sisu development %% 5.3.4.orig.tar.xz (2014-02-14:06/5) diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index a412da59..92e8413e 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -30,6 +30,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * ao_syntax, address possible manual use of url delimiters「」 +* composite, fix includes, provide extra newline after inserted comment + (Closes: #744360) "includes do not work properly" + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From 90d3eab4409a446adfc16f23da215855cba7ea6b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:03:25 -0400 Subject: v5 v6: composite (inserts), missing includes doesn't give an error, fix * (Closes: #744379) see sisu.org for comment --- data/doc/sisu/CHANGELOG_v5 | 3 +++ data/doc/sisu/CHANGELOG_v6 | 3 +++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 12c16c8a..0b357d41 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -43,6 +43,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz * composite, fix includes, provide extra newline after inserted comment (Closes: #744360) "includes do not work properly" +* composite (inserts), missing includes doesn't give an error, fix + (Closes: #744379) see sisu.org for comment + * added sisu.org emacs:evil:org mode notes related to sisu development %% 5.3.4.orig.tar.xz (2014-02-14:06/5) diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 92e8413e..b4b0311d 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -33,6 +33,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * composite, fix includes, provide extra newline after inserted comment (Closes: #744360) "includes do not work properly" +* composite (inserts), missing includes doesn't give an error, fix + (Closes: #744379) see sisu.org for comment + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From d5b2fa8c360d4f790f72dbcf3058e7eaa06c60fd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:07:03 -0400 Subject: v5 v6: metadata, pdf, remove link to manifest page where --no-manifest is used * (Closes: #744378) --- data/doc/sisu/CHANGELOG_v5 | 3 +++ data/doc/sisu/CHANGELOG_v6 | 3 +++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 0b357d41..c25d71ee 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -46,6 +46,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz * composite (inserts), missing includes doesn't give an error, fix (Closes: #744379) see sisu.org for comment +* metadata, pdf, remove link to manifest page where --no-manifest is used + (Closes: #744378) + * added sisu.org emacs:evil:org mode notes related to sisu development %% 5.3.4.orig.tar.xz (2014-02-14:06/5) diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index b4b0311d..8eea049c 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -36,6 +36,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * composite (inserts), missing includes doesn't give an error, fix (Closes: #744379) see sisu.org for comment +* metadata, pdf, remove link to manifest page where --no-manifest is used + (Closes: #744378) + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From 58020c13d503a6c8724ac4a2f26b8d33f0a0c6f5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:10:22 -0400 Subject: v5: digests cleaning --- data/doc/sisu/CHANGELOG_v5 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index c25d71ee..41771585 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -49,6 +49,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz * metadata, pdf, remove link to manifest page where --no-manifest is used (Closes: #744378) +* digests, cleaning + * added sisu.org emacs:evil:org mode notes related to sisu development %% 5.3.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From 3ea16523f1a3cbbdcd451a3845725417ee2141d8 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:22:19 -0400 Subject: v6: digests sha512 option implemented * options sha512 sha256 md5 * command line --sha512 * rcconf.yml ['defsault']['digest'] = sha512 * (Closes: #744402) --- data/doc/sisu/CHANGELOG_v5 | 3 +++ data/doc/sisu/CHANGELOG_v6 | 6 ++++++ data/doc/sisu/markup-samples/manual/en/sisu_commands.sst | 6 ++++++ 3 files changed, 15 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 41771585..7c079186 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -49,6 +49,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz * metadata, pdf, remove link to manifest page where --no-manifest is used (Closes: #744378) +* constants, db table sizes synced with v6, not needed by v5 but keeps tables + compatible + * digests, cleaning * added sisu.org emacs:evil:org mode notes related to sisu development diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 8eea049c..4c2bf375 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -39,6 +39,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * metadata, pdf, remove link to manifest page where --no-manifest is used (Closes: #744378) +* digests, digests sha512 option implemented + * options sha512 sha256 md5 + * command line --sha512 + * rcconf.yml ['defsault']['digest'] = sha512 + (Closes: #744402) + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) 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 c1a0788a..19ce3db5 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst @@ -321,6 +321,12 @@ generate examples of (naive) cgi search form for SQLite or PgSQL depends on your !_ --scp [filename/wildcard] \\ copies sisu output files to remote host using scp. 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. Also see --rsync. Alias -r +!_ --sha256 \\ +set hash digest where used to sha256 + +!_ --sha512 \\ +set hash digest where used to sha512 + !_ --sqlite --[instruction] [filename] \\ database type set to SQLite, this produces one of two possible databases, without additional database related instructions it produces a discreet SQLite file for the document processed; with additional instructions it produces a common SQLite database of all processed documents that (come from the same document preparation directory and as a result) share the same output directory base path (possible instructions include: --createdb; --create; --dropall; --import [filename]; --update [filename]; --remove [filename]); see database section below. Alias -d -- cgit v1.2.3 From 369b764eb0eca1c2aae7b2dd8a53a7eadbeb902d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:27:06 -0400 Subject: v5 v6: param, metadata add 'Copyright:' tag to output related to copyright * (Closes: #744381) syntax: inconsistency \:copyright: and \:license: --- data/doc/sisu/CHANGELOG_v5 | 3 +++ data/doc/sisu/CHANGELOG_v6 | 3 +++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 7c079186..7447e4fc 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -46,6 +46,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz * composite (inserts), missing includes doesn't give an error, fix (Closes: #744379) see sisu.org for comment +* param, metadata add 'Copyright:' tag to output related to copyright + (Closes: #744381) syntax: inconsistency \:copyright: and \:license: + * metadata, pdf, remove link to manifest page where --no-manifest is used (Closes: #744378) diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 4c2bf375..3def58df 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -36,6 +36,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * composite (inserts), missing includes doesn't give an error, fix (Closes: #744379) see sisu.org for comment +* param, metadata add 'Copyright:' tag to output related to copyright + (Closes: #744381) syntax: inconsistency \:copyright: and \:license: + * metadata, pdf, remove link to manifest page where --no-manifest is used (Closes: #744378) -- cgit v1.2.3 From d5b13ca5b8d041c13ef8fa8f8fe4764a9e24166b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:32:33 -0400 Subject: v6: param, metadata rights, line-breaks instead of semicolons separating rights * (Closes: #744358) remove trailing semicolon after :copyright: --- data/doc/sisu/CHANGELOG_v6 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 3def58df..26f2bcef 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -39,6 +39,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * param, metadata add 'Copyright:' tag to output related to copyright (Closes: #744381) syntax: inconsistency \:copyright: and \:license: +* param, remove trailing semicolon after :copyright: + (Closes: #744358) + * metadata, pdf, remove link to manifest page where --no-manifest is used (Closes: #744378) -- cgit v1.2.3 From 1716ccd079dc399190804ede2b2b08bf19c0a3b3 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:38:34 -0400 Subject: v6: texpdf, (internal coding) use symbols to identify page orientation --- data/doc/sisu/CHANGELOG_v6 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 26f2bcef..0643255a 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -51,6 +51,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * rcconf.yml ['defsault']['digest'] = sha512 (Closes: #744402) +* texpdf, (internal coding) use symbols to identify page orientation + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From 09fc878f67e525519901fdf8aec9a615984bab95 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:41:53 -0400 Subject: v6: texpdf, (internal coding) fontface, rename texpdf_font texpdf_fontface --- data/doc/sisu/CHANGELOG_v6 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 0643255a..4ab122dd 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -51,7 +51,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * rcconf.yml ['defsault']['digest'] = sha512 (Closes: #744402) -* texpdf, (internal coding) use symbols to identify page orientation +* texpdf, (internal coding) + * use symbols to identify page orientation + * renaming related to fontface * added sisu.org emacs:evil:org mode notes related to sisu development -- cgit v1.2.3 From 2b2e66c1b6c44ecb55e98ea4316b51f32c51ee80 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:50:42 -0400 Subject: v6: texpdf, headings and table of contents representation * (Closes: #744386) 1~ and 2~ result in the same formatting 1~ 2~ & 3~ now differentiated, see discussion in sisu.org under #744383 * (Closes: #744399) :A smaller formatted than :B A~ B~ C~ now the same size, see discussion in sisu.org under #744383 * #744383 :B and :C result in the same formatting, issue explained see sisu.org --- data/doc/sisu/CHANGELOG_v6 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 4ab122dd..792cb089 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -55,6 +55,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * use symbols to identify page orientation * renaming related to fontface +* texpdf, headings and table of contents + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From df9e4219258cd799a11be6f2d18f2af5b88d8352 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 21:56:28 -0400 Subject: v6: texpdf, pdf default font size configurable (cli & sisurc.yml) (no fractions) * --pdf-fontsize-12 --pdf-fontsize-8 * default: texpdf_fontsize: 12 * (Closes: #744405) --- data/doc/sisu/CHANGELOG_v6 | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 792cb089..969ceb7e 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -57,6 +57,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * texpdf, headings and table of contents +* texpdf, pdf default font size configurable (cli & sisurc.yml) (no fractions) + --pdf-fontsize-12 --pdf-fontsize-8 + default: + texpdf_fontsize: 12 + (Closes: #744405) + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From 9d76329a6203dbb2b48b926d764b3429ac04ea5c Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 22:43:02 -0400 Subject: v6: texpdf, pdf colored hyperlinks configurable * --pdf-hyperlinks-color --pdf-hyperlinks-no-color or --pdf-hyperlinks-monochrome * ['default']['pdf_hyperlinks']='color' (other options switch hyperlink color off 'no-color' 'color-off' 'monochrome') * (Closes: #744391) no color on a4 portrait see discussion in sisu.org --- data/doc/sisu/CHANGELOG_v6 | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 969ceb7e..c75ad615 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -55,6 +55,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * use symbols to identify page orientation * renaming related to fontface +* texpdf, pdf colored hyperlinks configurable (cli & sisurc.yml) + --pdf-hyperlinks-color │ + --pdf-hyperlinks-no-color or --pdf-hyperlinks-monochrome │ + default: + pdf_hyperlinks: 'color' │ + (other options switch hyperlink color off 'no-color' 'color-off' 'monochrome') │ + (Closes: #744391) no color on a4 portrait │ + * texpdf, headings and table of contents * texpdf, pdf default font size configurable (cli & sisurc.yml) (no fractions) -- cgit v1.2.3 From 4c27c79289f5c59f2c350249519379192785c2a1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 22:48:09 -0400 Subject: v6: texpdf, for urls switch to sans serif (small fontsize) * instead of typewriter, latex default * (Closes: #744353) --- data/doc/sisu/CHANGELOG_v6 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index c75ad615..f97b9a30 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -71,6 +71,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz texpdf_fontsize: 12 (Closes: #744405) +* texpdf, for urls switch to sans serif (small fontsize), + instead of typewriter, latex default + (Closes: #744353) + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From 41d62d53264b7af387361e27bc5d1ff874e9d3fa Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 22:52:04 -0400 Subject: v6: texpdf, '&' in heading breaks toc (now removed from toc (not heading)), bug * revisit, bug --- data/doc/sisu/CHANGELOG_v6 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index f97b9a30..b6522a34 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -75,6 +75,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz instead of typewriter, latex default (Closes: #744353) +* texpdf, & in heading breaks toc, now & is removed from toc not heading, + broken + * added sisu.org emacs:evil:org mode notes related to sisu development %% 6.0.4.orig.tar.xz (2014-02-14:06/5) -- cgit v1.2.3 From f9fb402000465b36c2be03ca3d61c8820d7d9169 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 22:54:25 -0400 Subject: v6: texpdf, mailto markup links set for normal text objects * (Closes: #744357) but testing required --- data/doc/sisu/CHANGELOG_v6 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index b6522a34..445328ab 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -75,6 +75,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz instead of typewriter, latex default (Closes: #744353) +* texpdf, mailto markup links set for normal text objects + (Closes: #744357) but testing required + * texpdf, & in heading breaks toc, now & is removed from toc not heading, broken -- cgit v1.2.3 From 62c48aca4793f8f9b9af4114a6ba84a0a477f789 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 22:56:57 -0400 Subject: v6: texpdf, urls in creator cause breakage * (Closes: #744541) --- data/doc/sisu/CHANGELOG_v6 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 445328ab..d2bcea38 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -78,6 +78,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * texpdf, mailto markup links set for normal text objects (Closes: #744357) but testing required +* texpdf, urls in creator cause breakage + (Closes: #744541) + * texpdf, & in heading breaks toc, now & is removed from toc not heading, broken -- cgit v1.2.3 From f408992e0acf1a962478886fd968dd71f47b115e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 23:03:31 -0400 Subject: v6: ao, document markup structure check, skip processing file on major error * with error message & text at location of failure --- data/doc/sisu/CHANGELOG_v6 | 3 + .../sisu/markup-samples/manual/en/sisu_markup.sst | 76 ++++++++++++++++++++++ 2 files changed, 79 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index d2bcea38..be37cbe6 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -28,6 +28,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz sisu_6.0.5.orig.tar.xz sisu_6.0.5-1.dsc +* ao, document structure check, stop processing on major error + (with error message & text at location of failure) + * ao_syntax, address possible manual use of url delimiters「」 * composite, fix includes, provide extra newline after inserted comment diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst index be6d7b9d..e3eefbac 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst @@ -65,6 +65,82 @@ or if for a particular version: _1 sisu --query-0.38 +2~ Markup Rules, document structure and metadata requirements + +minimal content/structure requirement: + +[metadata] + +@title: + +@creator: + +[levels] + +``` code +A~ (level A [title]) +1~ (at least one level 1 [segment/(chapter)]) +``` + +structure rules (document heirarchy, heading levels): + +there are two sets of heading levels ABCD (title & parts if any) and 123 (segment & subsegments if any) + +sisu has the fllowing levels: + +``` code +A~ [title] . + required (== 1) followed by B~ or 1~ +B~ [part] * + followed by C~ or 1~ +C~ [subpart] * + followed by D~ or 1~ +D~ [subsubpart] * + followed by 1~ +1~ [segment (chapter)] + + required (>= 1) followed by text or 2~ +text * + followed by more text or 1~, 2~ + or relevant part *() +2~ [subsegment] * + followed by text or 3~ +text * + followed by more text or 1~, 2~ or 3~ + or relevant part, see *() +3~ [subsubsegment] * + followed by text +text * + followed by more text or 1~, 2~ or 3~ or relevant part, see *() + +*(B~ if none other used; + if C~ is last used: C~ or B~; + if D~ is used: D~, C~ or B~) +``` + +``` code +* level A~ is the tile and is mandatory +* there can only be one level A~ +* heading levels BCD, are optional and there may be several of each + (where all three are used corresponding to e.g. Book Part Section) + * sublevels that are used must follow each other sequentially + (alphabetically), +* heading levels A~ B~ C~ D~ are followed by other heading levels rather + than substantive text + which may be the subsequent sequential (alphabetic) heading part level + or a heading (segment) level 1~ +* there must be at least one heading (segment) level 1~ + (the level on which the text is segmented, in a book would correspond + to the Chapter level) +* additional heading levels 1~ 2~ 3~ are optional and there may be several + of each +* heading levels 1~ 2~ 3~ are followed by text (which may be followed by + the same heading level) + and/or the next lower numeric heading level (followed by text) + or indeed return to the relevant part level + (as a corollary to the rules above substantive text/ content + must be preceded by a level 1~ (2~ or 3~) heading) +``` + 2~ Markup Examples 3~ Online -- cgit v1.2.3 From 57f00b948ff59e7154df74ad3fac7d93041833b6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 23:09:20 -0400 Subject: v5 v6: bin/sisu, ensure return to start dir --- data/doc/sisu/CHANGELOG_v5 | 2 ++ data/doc/sisu/CHANGELOG_v6 | 2 ++ 2 files changed, 4 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 7447e4fc..8126efab 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz sisu_5.3.5.orig.tar.xz sisu_5.3.5-1.dsc +* sisu, ensure return to start dir + * ao_syntax, address possible manual use of url delimiters「」 * composite, fix includes, provide extra newline after inserted comment diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index be37cbe6..1d3a5c6e 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz sisu_6.0.5.orig.tar.xz sisu_6.0.5-1.dsc +* sisu, ensure return to start dir + * ao, document structure check, stop processing on major error (with error message & text at location of failure) -- cgit v1.2.3 From cd4b4e42386f781c14e5c8c945d11e7c08cf98c5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 23:13:42 -0400 Subject: v6: ao, heading with no ocn, distinguish ~# from -# * ~# is general & means no ocn (for any object to which it is applied) * -# is relevant only for 1~ dummy headings & instructs that they should be removed from output where possible * applied so far to pdf, odt & plaintext --- data/doc/sisu/CHANGELOG_v6 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 1d3a5c6e..a103a9ed 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -35,6 +35,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz * ao_syntax, address possible manual use of url delimiters「」 +* ao, heading with no ocn, distinguish ~# from -# + * ~# is general & means no ocn (for any object to which it is applied) + * -# is relevant only for 1~ dummy headings & instructs that they should be + removed from output where possible, applied so far to pdf, odt & plaintext + * composite, fix includes, provide extra newline after inserted comment (Closes: #744360) "includes do not work properly" -- cgit v1.2.3 From e2f6efc6f18a86b8a5e2da1bcd9ffc6f84a6d389 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 May 2014 23:18:54 -0400 Subject: documentation, notes, update --- data/doc/sisu/markup-samples/manual/en/sisu_commands.sst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') 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 19ce3db5..356f38e1 100644 --- a/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst +++ b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst @@ -390,11 +390,11 @@ on its own, provides SiSU version information !_ -v [filename/wildcard] \\ see --verbose -!_ --v3 [filename/wildcard] \\ -invokes the sisu v3 document parser/generator. You may run sisu3 instead. +!_ --v5 [filename/wildcard] \\ +invokes the sisu v5 document parser/generator. You may run sisu5 instead. This is the current default and is normally omitted. -!_ --v4 [filename/wildcard] \\ -invokes the sisu v4 document parser/generator. This is the default and is normally omitted. +!_ --v6 [filename/wildcard] \\ +invokes the sisu v6 document parser/generator. You may run sisu6 instead. !_ --verbose [filename/wildcard] \\ provides verbose output of what is being generated, where output is placed (and error messages if any), as with -u flag provides a url mapping of files created for each of the processing flag requests. Alias -v -- cgit v1.2.3