aboutsummaryrefslogtreecommitdiffhomepage
path: root/data
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-07-09 14:58:16 -0400
committerRalph Amissah <ralph@amissah.com>2010-07-09 14:58:16 -0400
commit47b9af7ee4b0ad72dfdc8ae71802ea71509bd08a (patch)
tree242d5fa8f57cffcd73eaf2e2b6c59cf9c9e2a64c /data
parentdebian move additional markup samples (diff)
parentchangelog update (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'data')
-rw-r--r--data/doc/sisu/v2/CHANGELOG10
-rw-r--r--data/doc/sisu/v2/markup-samples/sisu_manual/sisu_commands.sst6
-rw-r--r--data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst26
-rw-r--r--data/sisu/v2/v/version.yml6
4 files changed, 30 insertions, 18 deletions
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 382916a1..f2772393 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -20,6 +20,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
* markup samples moved to data/doc/sisu/v2/markup-samples
+ * dal, manifest & metadata headings, non-substantive, ocn removed
+
+ * dal_syntax, monospace (avoid url match false positive)
+
+ * texpdf, monospace fix
+
+ * html_scroll, index & endnotes
+
+ * sysenv, default output path, fix
+
%% 2.6.0.orig.tar.gz (2010-07-07:27/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
2a02d475c12398e5cc66e961c96e65f79951c4c2863a5e88f986692563fda983 2770986 sisu_2.6.0.orig.tar.gz
diff --git a/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_commands.sst
index a406dc57..33c7ca46 100644
--- a/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_commands.sst
@@ -3,9 +3,11 @@
@title: SiSU
:subtitle: Commands
-@creator: :author: Amissah, Ralph
+@creator:
+ :author: Amissah, Ralph
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+@rights:
+ :copyright: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
@classify:
:type: information
diff --git a/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst
index 331e6af5..275d736e 100644
--- a/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst
@@ -308,10 +308,10 @@ Second level heading [this is a heading level divider]
Third level heading [this is a heading level divider]
!_ 1~ [heading text]
-Top level heading preceding substantive text of document or sub\-heading 2, the heading level that would normally be marked 1. or 2. or 3. etc. in a document, and the level on which sisu by default would break html output into named segments, names are provided automatically if none are given (a number), otherwise takes the form 1~my\_filename\_for\_this\_segment
+Top level heading preceding substantive text of document or sub-heading 2, the heading level that would normally be marked 1. or 2. or 3. etc. in a document, and the level on which sisu by default would break html output into named segments, names are provided automatically if none are given (a number), otherwise takes the form 1~my_filename_for_this_segment
!_ 2~ [heading text]
-Second level heading preceding substantive text of document or sub\-heading 3 , the heading level that would normally be marked 1.1 or 1.2 or 1.3 or 2.1 etc. in a document.
+Second level heading preceding substantive text of document or sub-heading 3 , the heading level that would normally be marked 1.1 or 1.2 or 1.3 or 2.1 etc. in a document.
!_ 3~ [heading text]
Third level heading preceding substantive text of document, that would normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document
@@ -331,7 +331,7 @@ code{
code{
normal text, *{emphasis}*, !{bold text}!, /{italics}/, _{underscore}_, "{citation}",
-^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}- #{monospace}#
+^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}-, #{monospace}#
normal text
@@ -360,7 +360,7 @@ _{underscore}_
!_ resulting output:
normal text, *{emphasis}*, !{bold text}!, /{italics}/, _{underscore}_, "{citation}",
-^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}- #{monospace}#
+^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}-, #{monospace}#
normal text
@@ -613,13 +613,13 @@ Shared document collection link
code{
-about { SiSU book markup examples }../SiSU/examples.html
+about { SiSU book markup examples }:SiSU/examples.html
}code
!_ resulting output:
-about { SiSU book markup examples }../SiSU/examples.html
+about { SiSU book markup examples }:SiSU/examples.html
3~ Linking Images
@@ -746,19 +746,19 @@ No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,0
% code{
-%
+
% test
-%
+
% ~#
-%
+
% % unnumbered paragraph (place marker at end of paragraph)
-%
+
% -#
-%
+
% % unnumbered paragraph, delete when not required (place marker at end of paragraph) [used in dummy headings, eg. for segmented html]
-%
+
% % add a comment to text, that will be removed prior to processing (place marker at beginning of line)
-%
+
% }code
3~ Poem
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index e328bd68..6e8d23f7 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 2.6.0
-:date_stamp: 2010w27/3
-:date: "2010-07-07"
+:version: 2.6.1
+:date_stamp: 2010w27/5
+:date: "2010-07-09"
:project: SiSU