aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG14
-rw-r--r--conf/sisu/version.yml6
-rw-r--r--data/doc/sisu/html/sisu.1.html55
-rw-r--r--data/doc/sisu/html/sisu_vim.7.html44
-rw-r--r--data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm6
-rw-r--r--data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst18
-rw-r--r--data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst10
-rw-r--r--data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf5
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim91
-rw-r--r--lib/sisu/v0/dal.rb1
-rw-r--r--lib/sisu/v0/dal_syntax.rb1
-rw-r--r--lib/sisu/v0/help.rb11
-rw-r--r--lib/sisu/v0/shared_sem.rb110
-rw-r--r--lib/sisu/v0/sst_identify_markup.rb126
-rw-r--r--lib/sisu/v0/sst_to_s_xml_dom.rb2
-rw-r--r--lib/sisu/v0/sst_to_s_xml_node.rb2
-rw-r--r--lib/sisu/v0/sst_to_s_xml_sax.rb2
-rw-r--r--man/man1/sisu.138
-rw-r--r--man/man7/sisu_vim.732
19 files changed, 406 insertions, 168 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d11d0b29..5edad220 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,19 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.64.4.orig.tar.gz (2008-02-14:06/4)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.4.orig.tar.gz
+ sisu_0.64.4.orig.tar.gz
+ sisu_0.64.4-1.dsc
+ sisu_0.64.4-1.diff.gz
+
+ * markup tag, semantic tag added
+
%% sisu_0.64.3.orig.tar.gz (2008-02-06:05/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3.orig.tar.gz
- sisu_0.64.3.orig.tar.gz
- sisu_0.64.3-1.dsc
- sisu_0.64.3-1.diff.gz
+ 8af7f396c0aeb231869fa0d12c5429c2 1486648 sisu_0.64.3.orig.tar.gz
+ 6b2f4554afe0a328f7861d3be943ea8d 629 sisu_0.64.3-1.dsc
+ 4300eac4651ed7ae3788f7d7c22fb8dc 146267 sisu_0.64.3-1.diff.gz
* db sql pgsql future development and testing on version postgresql 8.3
diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml
index 7154dd4a..94f6a84b 100644
--- a/conf/sisu/version.yml
+++ b/conf/sisu/version.yml
@@ -1,5 +1,5 @@
---
-:version: 0.64.3
-:date_stamp: 2008w05/3
-:date: "2008-02-06"
+:version: 0.64.4
+:date_stamp: 2008w06/4
+:date: "2008-02-14"
:project: SiSU
diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html
index aee67590..88717ed6 100644
--- a/data/doc/sisu/html/sisu.1.html
+++ b/data/doc/sisu/html/sisu.1.html
@@ -685,26 +685,35 @@ as code<br>
<p> Some interactive help on markup is available, by typing sisu and selecting
<p>markup or sisu --help markup
+<p> To check the markup in a file:
+<p> sisu --identify
+&nbsp;[filename].sst<br>
+
+<p> For brief descriptive summary of markup history
+<p> sisu --query-history<br>
+
+<p> or if for a particular version:
+<p> sisu --query-0.38<br>
+
<p> 7.2 MARKUP EXAMPLES
<p> 7.2.1 ONLINE
-<p> Online markup
-examples are available together with the respective outputs produced from
-&lt;<a href='http://www.jus.uio.no/sisu/SiSU/examples.html'>http://www.jus.uio.no/sisu/SiSU/examples.html</a>
-&gt; or from &lt;<a href='http://www.jus.uio.no/sisu/sisu_examples/'>http://www.jus.uio.no/sisu/sisu_examples/</a>
-&gt;
-
-<p> There is of course this document, which provides a cursory overview of
-sisu markup and the respective output produced: &lt;<a href='http://www.jus.uio.no/sisu/sisu_markup/'>http://www.jus.uio.no/sisu/sisu_markup/</a>
+<p> Online markup examples are available
+together with the respective outputs produced from &lt;<a href='http://www.jus.uio.no/sisu/SiSU/examples.html'>http://www.jus.uio.no/sisu/SiSU/examples.html</a>
&gt;
-
-<p> Some example marked up files are available as html with syntax highlighting
-for viewing: &lt;<a href='http://www.jus.uio.no/sisu/sample/syntax'>http://www.jus.uio.no/sisu/sample/syntax</a>
+or from &lt;<a href='http://www.jus.uio.no/sisu/sisu_examples/'>http://www.jus.uio.no/sisu/sisu_examples/</a>
&gt;
-<p> an alternative presentation
-of markup syntax: &lt;<a href='http://www.jus.uio.no/sisu/sample/on_markup.txt'>http://www.jus.uio.no/sisu/sample/on_markup.txt</a>
+<p> There is of course this
+document, which provides a cursory overview of sisu markup and the respective
+output produced: &lt;<a href='http://www.jus.uio.no/sisu/sisu_markup/'>http://www.jus.uio.no/sisu/sisu_markup/</a>
&gt;
-<p> 7.2.2 INSTALLED
+<p> Some example marked
+up files are available as html with syntax highlighting for viewing: &lt;<a href='http://www.jus.uio.no/sisu/sample/syntax'>http://www.jus.uio.no/sisu/sample/syntax</a>
+&gt;
+
+<p> an alternative presentation of markup syntax: &lt;<a href='http://www.jus.uio.no/sisu/sample/on_markup.txt'>http://www.jus.uio.no/sisu/sample/on_markup.txt</a>
+&gt;
+<p> 7.2.2 INSTALLED
<p> With <b>SiSU</b> installed sample skins may be found in: /usr/share/doc/sisu/sisu_markup_samples/dfsg
(or equivalent directory) and if sisu-markup-samples is installed also under:
@@ -3262,30 +3271,30 @@ html pages[^28]
<p> DC Title: <i>SiSU</i> - Manual
<p> DC Creator: <i>Ralph</i> Amissah
<p> DC Rights: <i>Copyright</i>
-(C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+(C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
<p> DC
Type: <i>information</i>
<p> DC Date created: <i>2002-08-28</i>
<p> DC Date issued: <i>2002-08-28</i>
<p> DC Date available: <i>2002-08-28</i>
-<p> DC Date modified: <i>2008-02-05</i>
-<p> DC Date: <i>2008-02-05</i>
+<p> DC Date modified: <i>2008-02-12</i>
+<p> DC Date: <i>2008-02-12</i>
<p> <b>Version Information</b>
<p> Sourcefile: <i>sisu.ssm.sst</i>
<p> Filetype: <i>SiSU</i> text insert
<p>0.58
-<p> Sourcefile Digest, MD5(sisu.ssm.sst)= <i>587397c3165a622e01a5c800d69d39a0</i>
+<p> Sourcefile Digest, MD5(sisu.ssm.sst)= <i>1a602f31f72da6a8d1e6fc6b42d1b703</i>
<p> Skin_Digest: MD5(skin_sisu_manual.rb)= <i>072b2584bedea82ea8a416587b9fa244</i>
<p> <b>Generated</b>
-<p> Document (metaverse) last generated: <i>Tue</i> Feb 05 23:45:59
+<p> Document (metaverse) last generated: <i>Thu</i> Feb 14 02:44:23
<p>+0000 2008
-<p> Generated by: <i>SiSU</i> <i>0.64.3</i> of 2008w05/2 (2008-02-05)
+<p> Generated by: <i>SiSU</i> <i>0.64.4</i> of 2008w06/4 (2008-02-14)
<p> Ruby version:
<i>ruby</i> 1.8.6 (2007-09-24 patchlevel 111) &nbsp;[i486-linux]
<p>
@@ -3403,15 +3412,15 @@ distributable are not freely changeable. </li><b>.</b><li>named index.html or mo
</dt>
<dd></dd>
-<dt>* Generated by: SiSU 0.64.3 of 2008w05/2 (2008-02-05) </dt>
+<dt>* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14) </dt>
<dd></dd>
<dt>* Ruby version: ruby
1.8.6 (2007-09-24 patchlevel 111) [i486-linux] </dt>
<dd></dd>
-<dt>* Last Generated on: Tue Feb
-05 23:45:59 +0000 2008 </dt>
+<dt>* Last Generated on: Thu Feb
+14 02:44:23 +0000 2008 </dt>
<dd></dd>
<dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>
diff --git a/data/doc/sisu/html/sisu_vim.7.html b/data/doc/sisu/html/sisu_vim.7.html
index 5099bb3a..385eef0e 100644
--- a/data/doc/sisu/html/sisu_vim.7.html
+++ b/data/doc/sisu/html/sisu_vim.7.html
@@ -9,14 +9,15 @@
<a href='#toc'>Table of Contents</a><p>
<h2><a name='sect0' href='#toc0'>Name</a></h2>
-sisu_vim - vim syntax and folds file for sisu: documents: markup, structuring,
-publishing in multiple standard formats, and search SISU - VIM, RALPH AMISSAH
-
+ sisu_vim - vim syntax and folds file for sisu: markup, structuring,
+publishing in multiple standard formats, and search<br>
+ SISU - VIM, RALPH AMISSAH
<p> SISU VIM
<p> 1. SISU VIM
<p> <b>Synopsis</b>
-<p> <b>SiSU</b> has syntax highlighting for
-a number of editors including vim which are documented under:
+<p> <b>SiSU</b> has
+syntax highlighting for a number of editors including vim which are documented
+under:
<p> man sisu_syntax_highlighting<br>
<p> /usr/share/doc/sisu/sisu_manual/sisu_syntax_highlighting/index.html<br>
@@ -32,10 +33,11 @@ and to set some defaults for <b>SiSU</b> markup in installed by sisu.
<p> Vim 7 includes
sisu markup syntax highlighting.
<p> Vim related files are included in: /usr/share/sisu/conf/editor-syntax-etc/vim
-(including the syntax highlighter which may be used for earlier versions
-of Vim).
-<p> sisu-vim actions are activated on files with the suffix .sst .ssm
-.ssi .-sst ._sst (and the same with a further .meta extension)<br>
+(including the syntax highlighter, together with an ftplugin which may
+be sourced if so desired from your vimrc).
+<p> sisu-vim actions are activated
+on files with the suffix .sst .ssm .ssi .-sst ._sst (and the same with a further
+.meta extension)<br>
<p>
<p> <br>
@@ -65,7 +67,7 @@ of Vim).
<i>SiSU</i> - Vim
<p> DC Creator: <i>Ralph</i> Amissah
<p> DC Rights: <i>Copyright</i> (C) Ralph
-Amissah 2007, part of SiSU documentation, License GPL 3
+Amissah 2008, part of SiSU documentation, License GPL 3
<p> DC Type: <i>information</i>
<p> DC Date created: <i>2002-11-12</i>
@@ -73,23 +75,23 @@ Amissah 2007, part of SiSU documentation, License GPL 3
<p> DC Date available:
<p><i>2002-11-12</i>
-<p> DC Date modified: <i>2007-09-16</i>
-<p> DC Date: <i>2007-09-16</i>
+<p> DC Date modified: <i>2008-02-12</i>
+<p> DC Date: <i>2008-02-12</i>
<p> <b>Version Information</b>
<p> Sourcefile: <i>sisu_vim.sst</i>
<p> Filetype: <i>SiSU</i> text insert 0.58
<p> Sourcefile
-Digest, MD5(sisu_vim.sst)= <i>a3db74eebef04815aa234d3c3b17f375</i>
+Digest, MD5(sisu_vim.sst)= <i>b5028f957b128162f7653bbd940042ca</i>
<p> Skin_Digest:
-MD5(skin_sisu_manual.rb)= <i>20fc43cf3eb6590bc3399a1aef65c5a9</i>
+MD5(skin_sisu_manual.rb)= <i>072b2584bedea82ea8a416587b9fa244</i>
<p> <b>Generated</b>
<p>
- Document (metaverse) last generated: <i>Sat</i> Sep 29 17:14:44 +0100 2007
+ Document (metaverse) last generated: <i>Thu</i> Feb 14 02:44:14 +0000 2008
<p>
-Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25)
+Generated by: <i>SiSU</i> <i>0.64.4</i> of 2008w06/4 (2008-02-14)
<p> Ruby version: <i>ruby</i> 1.8.6
-(2007-06-07 patchlevel 36) &nbsp;[i486-linux]
+(2007-09-24 patchlevel 111) &nbsp;[i486-linux]
<p>
<p>
<dl>
@@ -130,15 +132,15 @@ Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25)
</dt>
<dd></dd>
-<dt>* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25) </dt>
+<dt>* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14) </dt>
<dd></dd>
<dt>* Ruby version: ruby
-1.8.6 (2007-06-07 patchlevel 36) [i486-linux] </dt>
+1.8.6 (2007-09-24 patchlevel 111) [i486-linux] </dt>
<dd></dd>
-<dt>* Last Generated on: Sat Sep 29
-17:14:44 +0100 2007 </dt>
+<dt>* Last Generated on: Thu Feb
+14 02:44:14 +0000 2008 </dt>
<dd></dd>
<dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
index 50265706..54bbe2a3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
@@ -6,7 +6,7 @@
@creator: Ralph Amissah
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+@rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
@type: information
@@ -18,9 +18,9 @@
@date.available: 2002-08-28
-@date.modified: 2008-02-05
+@date.modified: 2008-02-12
-@date: 2008-02-05
+@date: 2008-02-12
@level: new=C; break=1; num_top=1
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
index 9c797dcc..741c26a8 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
@@ -6,7 +6,7 @@
@creator: Ralph Amissah
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+@rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
@type: information
@@ -18,9 +18,9 @@
@date.available: 2002-08-28
-@date.modified: 2007-09-16
+@date.modified: 2008-02-12
-@date: 2007-09-16
+@date: 2008-02-12
@level: new=C; break=1; num_top=1
@@ -73,6 +73,18 @@ _1* paragraph actions, such as indent, bulleted, numbered-lists, etc.
Some interactive help on markup is available, by typing sisu and selecting markup or sisu --help markup
+To check the markup in a file:
+
+_1 sisu --identify [filename].sst
+
+For brief descriptive summary of markup history
+
+_1 sisu --query-history
+
+or if for a particular version:
+
+_1 sisu --query-0.38
+
2~ Markup Examples
3~ Online
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
index a1c324aa..b8018fa8 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
@@ -6,7 +6,7 @@
@creator: Ralph Amissah
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+@rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
@type: information
@@ -18,14 +18,16 @@
@date.available: 2002-11-12
-@date.modified: 2007-09-16
+@date.modified: 2008-02-12
-@date: 2007-09-16
+@date: 2008-02-12
@level: new=C; break=1; num_top=1
@skin: skin_sisu_manual
+@man: name= sisu_vim \- vim syntax and folds file for sisu: markup, structuring, publishing in multiple standard formats, and search;
+
@bold: /Gnu|Debian|Ruby|SiSU/
@links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
@@ -65,7 +67,7 @@ Vim 7 includes sisu markup syntax highlighting.
Vim related files are included in:
/usr/share/sisu/conf/editor-syntax-etc/vim
-(including the syntax highlighter which may be used for earlier versions of Vim).
+(including the syntax highlighter, together with an ftplugin which may be sourced if so desired from your vimrc).
sisu-vim actions are activated on files with the suffix .sst .ssm .ssi .-sst ._sst (and the same with a further .meta extension)
diff --git a/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf b/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
index c7fa686b..cc7c4566 100644
--- a/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
+++ b/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
@@ -966,6 +966,11 @@ lang.sisu.tokens.poem.format green
lang.sisu.tokens.code.open ^code\{
lang.sisu.tokens.code.close ^\}code
lang.sisu.tokens.code.format green
+lang.sisu.tokens.sem (([a-z]+):\{.+?\}:\2)
+lang.sisu.tokens.sem (([a-z]+);\{.+?\};\2)
+lang.sisu.tokens.sem (([a-z]+):\[.+?\]:\2)
+lang.sisu.tokens.sem (([a-z]+);\[.+?\];\2)
+lang.sisu.tokens.sem.format green
lang.sisu.tokens.error \s+$|<\S{2}\S+?>|[a-zA-Z0-9,.::?!&><]+http://\S+|http://\S+<
#lang.sisu.tokens.error \s+$|<\S+?>|[a-zA-Z0-9,.::?!&><]+http://\S+|http://\S+<
lang.sisu.tokens.error.format magenta reverse
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 791d0c47..9a351d88 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -30,6 +30,20 @@ if !exists("sisu_no_identifiers")
syn match sisu_link " \*\~\S\+"
syn match sisu_action "^<:insert\d\+>"
syn match sisu_contain "<:e>"
+ syn match sisu_sem_marker "[a-z]\+;{"
+ syn match sisu_sem_marker "};[a-z]\+"
+ syn match sisu_sem_marker_block "[a-z]\+:{"
+ syn match sisu_sem_marker_block "}:[a-z]\+"
+ syn match sisu_sem_ex_marker "[a-z]\+;\["
+ syn match sisu_sem_ex_marker "\];[a-z]\+"
+ syn match sisu_sem_ex_marker_block "[a-z]\+:\["
+ syn match sisu_sem_ex_marker_block "\]:[a-z]\+"
+ syn match sisu_error_sem_marker "[a-z]\+[:;]{"
+ syn match sisu_error_sem_marker "}[:;][a-z]\+"
+ syn match sisu_sem_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]\+\):{[^}].\{-}}:\1"he=e-1
+ syn match sisu_sem_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker "\([a-z]\+\);{[^}].\{-}};\1"
+ syn match sisu_sem_ex_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]\+\):\[[^}].\{-}\]:\1"he=e-1
+ syn match sisu_sem_ex_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker "\([a-z]\+\);\[[^}].\{-}\];\1"
endif
"% 9 URLs Numbers: and ASCII Codes
syn match sisu_number "\<\(0x\x\+\|0b[01]\+\|0\o\+\|0\.\d\+\|0\|[1-9][\.0-9_]*\)\>"
@@ -43,7 +57,7 @@ syn match sisu_error contains=sisu_error "<a href\|</a>]"
syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$"
"% header
syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^0\~\(\S\+\|[^-]\)" end="\n$"
-syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^@\S\+:[+-]\?\s"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^[@%]\S\+:[+-]\?\s"rs=e-1 end="\n$"
"% headings
syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
"% grouped text
@@ -52,19 +66,20 @@ syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sis
syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(alt\|group\|poem\){" end="^}\(alt\|group\|poem\)"
syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code"
"% endnotes
-syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n"
-syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n"
+syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n"
+syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n"
syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n\n"
"% links and images
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|\.\./\)\S\+" oneline
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline
+syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|\.\./\)\S\+" oneline
+syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline
syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}image" oneline
"% some line operations
syn region sisu_control contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_control start="\(\(^\| \)!_ \|<:b>\)" end="$"
-syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$"
+syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$"
syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$"
syn region sisu_comment matchgroup=sisu_comment start="^%\{1,2\} " end="$"
"% font face curly brackets
+"syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*"
syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="!{" end="}!"
syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="_{" end="}_"
@@ -137,33 +152,43 @@ if version >= 508 || !exists("did_sisu_syntax_inits")
command -nargs=+ HiLink hi def link <args>
endif
"% 1 Defined
- HiLink sisu_normal Normal
- HiLink sisu_header PreProc
- HiLink sisu_header_content Statement
- HiLink sisu_heading Title
- HiLink sisu_structure Operator
- HiLink sisu_contain Include
- HiLink sisu_mark_endnote Include
- HiLink sisu_link NonText
- HiLink sisu_linked String
- HiLink sisu_fontface Include
- HiLink sisu_strikeout DiffDelete
- HiLink sisu_content_alt Special
- HiLink sisu_content_endnote Special
- HiLink sisu_control Define
- HiLink sisu_ocn Include
- HiLink sisu_number Number
- HiLink sisu_identifier Function
- HiLink sisu_underline Underlined
- HiLink sisu_markpara Include
- HiLink sisu_marktail Include
- HiLink sisu_mark Identifier
- HiLink sisu_break Structure
- HiLink sisu_html Type
- HiLink sisu_action Identifier
- HiLink sisu_comment Comment
- HiLink sisu_error_wspace Error
- HiLink sisu_error Error
+ HiLink sisu_normal Normal
+ HiLink sisu_header PreProc
+ HiLink sisu_header_content Statement
+ HiLink sisu_heading Title
+ HiLink sisu_structure Operator
+ HiLink sisu_contain Include
+ HiLink sisu_mark_endnote Include
+ HiLink sisu_link NonText
+ HiLink sisu_linked String
+ HiLink sisu_fontface Include
+ HiLink sisu_strikeout DiffDelete
+ HiLink sisu_content_alt Special
+ HiLink sisu_sem_content String
+ HiLink sisu_sem_content SpecialKey
+ HiLink sisu_sem_block Special
+ HiLink sisu_sem_marker Visual
+ HiLink sisu_sem_marker_block MatchParen
+ HiLink sisu_sem_ex_marker FoldColumn
+ HiLink sisu_sem_ex_marker_block Folded
+ HiLink sisu_sem_ex_content Comment
+ HiLink sisu_sem_ex_block Comment
+ HiLink sisu_content_endnote Special
+ HiLink sisu_control Define
+ HiLink sisu_ocn Include
+ HiLink sisu_number Number
+ HiLink sisu_identifier Function
+ HiLink sisu_underline Underlined
+ HiLink sisu_markpara Include
+ HiLink sisu_marktail Include
+ HiLink sisu_mark Identifier
+ HiLink sisu_break Structure
+ HiLink sisu_html Type
+ HiLink sisu_action Identifier
+ HiLink sisu_comment Comment
+ HiLink sisu_error_sem_marker Error
+ HiLink sisu_error_wspace Error
+ HiLink sisu_error Error
delcommand HiLink
endif
let b:current_syntax = "sisu"
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index e31dba69..5edc77be 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -65,6 +65,7 @@ module SiSU_DAL
require "#{SiSU_lib}/dal_syntax"
require "#{SiSU_lib}/dal_doc_str"
require "#{SiSU_lib}/i18n"
+ require "#{SiSU_lib}/shared_sem"
include SiSU_Env
include SiSU_Param
include SiSU_Viz
diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb
index 4224973d..a6c48af0 100644
--- a/lib/sisu/v0/dal_syntax.rb
+++ b/lib/sisu/v0/dal_syntax.rb
@@ -109,6 +109,7 @@ module Syntax
end
def pre(line)
line=line.dup
+ line=SiSU_sem::Tags.new(line).rm.all
if line =~/\{(?:t|table)(?:~h)?\s*c?[\d; ]*\}/; line.gsub!(/(\n)/,';;\1') #markup for alternative tables
end
line
diff --git a/lib/sisu/v0/help.rb b/lib/sisu/v0/help.rb
index c4037431..35448cd6 100644
--- a/lib/sisu/v0/help.rb
+++ b/lib/sisu/v0/help.rb
@@ -1548,14 +1548,17 @@ WOK
sisu --help header
sisu --help structure [sisu --help heading]
- for older standard markup:
- sisu --help example37
+ to check markup version in file:
+ sisu --identify [filename].sst
+
+ for brief descriptive summary of markup history
+ sisu --query-history
+ or if for a particular version
+ sisu --query-0.38
for markup:
sisu --help example38
- sisu-0.38 is provided with 0.38 markup samples
-
sample marked up documents are provided in directory:
#{@cX.green}sisu-examples/sample/document_samples_sisu_markup/#{@cX.off}
and online
diff --git a/lib/sisu/v0/shared_sem.rb b/lib/sisu/v0/shared_sem.rb
new file mode 100644
index 00000000..da989999
--- /dev/null
+++ b/lib/sisu/v0/shared_sem.rb
@@ -0,0 +1,110 @@
+=begin
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+ Sematic tags
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007,
+ 2008 Ralph Amissah All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+ SiSU, a framework for document structuring, publishing and search
+
+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007 Ralph Amissah
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation, either version 3 of the License, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+
+ If you have Internet connection, the latest version of the GPL should be
+ available at these locations:
+ <http://www.fsf.org/licensing/licenses/gpl.html>
+ <http://www.gnu.org/copyleft/gpl.html>
+
+ <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
+ <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
+ <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
+
+ * SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
+
+ * Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
+
+ * Download:
+ <http://www.jus.uio.no/sisu/SiSU/download.html>
+
+ * Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+ ** Description: system environment, resource control and configuration details
+
+=end
+module SiSU_sem
+ class Tags
+ def initialize(para)
+ @para=para
+ end
+ def rgx
+ def each_csc
+ /[a-z]+[:;]\{|\}[:;][a-z]+/
+ end
+ def each_c
+ /[a-z]+:\{|\}:[a-z]+/
+ end
+ def each_sc
+ /[a-z]+;\{|\};[a-z]+/
+ end
+ def pair_csc
+ /(([a-z]+)(?::\{(.+?)\}:\2|;\{(.+?)\};\2))/
+ #/(([a-z]+);\{(.+?)\};\2)/
+ #/(([a-z]+)([:;])\{(.+?)\}\3\2)/
+ end
+ def pair_c
+ /(([a-z]+):\{(.+?)\}:\2)/
+ end
+ def pair_sc
+ /(([a-z]+);\{.+?\};\2)/
+ end
+ def whole_csc_ae
+ /(([a-z]+)(?::\[(.+?)\]:\2|;\[(.+?)\];\2))/
+ end
+ self
+ end
+ def rm
+ def sem_marker_parts
+ @para.gsub!(rgx.each_csc,'')
+ @para
+ end
+ def sem_marker_added_extra_parts
+ @para.gsub!(rgx.whole_csc_ae,'')
+ @para
+ end
+ def all
+ sem_marker_parts
+ sem_marker_added_extra_parts
+ end
+ self
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v0/sst_identify_markup.rb b/lib/sisu/v0/sst_identify_markup.rb
index 403ad329..0f60b916 100644
--- a/lib/sisu/v0/sst_identify_markup.rb
+++ b/lib/sisu/v0/sst_identify_markup.rb
@@ -113,7 +113,7 @@ WOK
or cont[0] =~ /^(?:%\s+)?sisu-([0-9](?:\.[0-9]+){1,2})/
@declared_markup=$1
end
- @flag_57,@flag_38=false,false
+ @flat_65,@flag_57,@flag_38=false,false,false
cont.each_with_index do |y,i|
if y =~/^(?:0\{?~links?|@links?:)\s/ \
and f =~/(?:\.sst|\.ssm|\.ssi|\.s[123])/
@@ -121,55 +121,81 @@ WOK
else ' (post 0.20.4 header links)'
end
end
- if @flag_57 \
- or y =~/^:?A~\?? @title/
- version='0.57'
- markup=Markup_inform.new(version,'0.57' + oldlinks,@declared_markup,@declared_type)
- @flag_57=true
- break
+ unless @flag_38
+ if (y =~/^:?A~/ and f =~/(?:\.sst|\.ssm|\.ssi)/)
+ version='0.38'
+ markup=Markup_inform.new(version,'0.38' + oldlinks,@declared_markup,@declared_type)
+ @flag_38=true
+ end
end
- if @flag_38 \
- or (y =~/^:?A~/ and f =~/(?:\.sst|\.ssm|\.ssi)/)
- version='0.38'
- markup=Markup_inform.new(version,'0.38' + oldlinks,@declared_markup,@declared_type)
- @flag_38=true
- break if i >= 200
- if y =~ /(?:~{\*+|~\[\*|~\[\+)\s/
- version='0.42'
- markup=Markup_inform.new(version,'0.42' + oldlinks,@declared_markup,@declared_type)
+ if @flag_38
+ if @flag_65 \
+ or y =~/[a-z+][:;]\{.+?\}[:;][a-z+]/
+ version='0.65'
+ markup=Markup_inform.new(version,'0.65' + oldlinks,@declared_markup,@declared_type)
+ @flag_65=true
break
end
end
- if (y =~/^1~/ and f =~/(?:\.sst|\.ssm|\.ssi)/) \
- and not @flag_38
- version='0.37'
- markup=Markup_inform.new(version,'0.37 is substantially 0.16 - 0.36 markup with new file-extension' + oldlinks,@declared_markup,@declared_type)
- break
- end
- if y =~/^1~/ \
- and f =~/\.([rs])([123])/ \
- and not @flag_38
- t,n=$1,$2
- version='0.16'
- instruct=if t =~/r/
- " (change file extension from .#{t}#{n} to .ssm)"
- else " (change file extension from .#{t}#{n} to .sst)"
+ end
+ unless @flag_65
+ cont.each_with_index do |y,i|
+ if y =~/^(?:0\{?~links?|@links?:)\s/ \
+ and f =~/(?:\.sst|\.ssm|\.ssi|\.s[123])/
+ links=unless y =~/\{.+?\}\S+/; oldlinks=' (pre 0.20.4 header links)'
+ else ' (post 0.20.4 header links)'
+ end
end
- markup=Markup_inform.new(version,'0.16 - 0.36' + instruct + links,@declared_markup,@declared_type)
- break
- end
- if y =~/^0\{~/ \
- and not @flag_38
- version='0.1'
- markup=Markup_inform.new(version,'0.1 - 0.15',@declared_markup,@declared_type)
- break
- end
- if y =~/^0\{{3}/ \
- and not @flag_38
- markup=Markup_inform.new('circa. 1997','old, check date',@declared_markup,@declared_type)
- break
+ if @flag_57 \
+ or (y =~/^:?A~\?? @title/ and f =~/(?:\.sst|\.ssm|\.ssi)/)
+ version='0.57'
+ markup=Markup_inform.new(version,'0.57' + oldlinks,@declared_markup,@declared_type)
+ @flag_57=true
+ break
+ end
+ if @flag_38 \
+ or (y =~/^:?A~/ and f =~/(?:\.sst|\.ssm|\.ssi)/)
+ version='0.38'
+ markup=Markup_inform.new(version,'0.38' + oldlinks,@declared_markup,@declared_type)
+ @flag_38=true
+ break if i >= 200
+ if y =~ /(?:~{\*+|~\[\*|~\[\+)\s/
+ version='0.42'
+ markup=Markup_inform.new(version,'0.42' + oldlinks,@declared_markup,@declared_type)
+ break
+ end
+ end
+ if (y =~/^1~/ and f =~/(?:\.sst|\.ssm|\.ssi)/) \
+ and not @flag_38
+ version='0.37'
+ markup=Markup_inform.new(version,'0.37 is substantially 0.16 - 0.36 markup with new file-extension' + oldlinks,@declared_markup,@declared_type)
+ break
+ end
+ if y =~/^1~/ \
+ and f =~/\.([rs])([123])/ \
+ and not @flag_38
+ t,n=$1,$2
+ version='0.16'
+ instruct=if t =~/r/
+ " (change file extension from .#{t}#{n} to .ssm)"
+ else " (change file extension from .#{t}#{n} to .sst)"
+ end
+ markup=Markup_inform.new(version,'0.16 - 0.36' + instruct + links,@declared_markup,@declared_type)
+ break
+ end
+ if y =~/^0\{~/ \
+ and not @flag_38
+ version='0.1'
+ markup=Markup_inform.new(version,'0.1 - 0.15',@declared_markup,@declared_type)
+ break
+ end
+ if y =~/^0\{{3}/ \
+ and not @flag_38
+ markup=Markup_inform.new('circa. 1997','old, check date',@declared_markup,@declared_type)
+ break
+ end
+ markup='Not a recognised file type '
end
- markup='Not a recognised file type '
end
markup
else Markup_history.new(@opt).help_query
@@ -218,6 +244,14 @@ WOK
def initialize(opt)
@opt=opt
end
+ def sisu_0_65
+ <<WOK
+ SiSU 0.65 same as previous, adds semantic tags
+ /[a-z+][:;]\{.+?\}[:;][a-z+]/
+ e.g. author:{ Ralph last;{Amissah};last }:author
+
+WOK
+ end
def sisu_0_57
<<WOK
SiSU 0.57 is the same as 0.42 with the introduction of some a shortcut to use
@@ -332,7 +366,9 @@ WOK
tell=if @opt.mod.inspect =~/--query/
tell=case @opt.mod.inspect
when /history/
- "#{sisu_0_57}#{sisu_0_42}#{sisu_0_38}\n#{sisu_0_37}\n#{sisu_0_16}\n#{sisu_0_1}"
+ "#{sisu_0_65}#{sisu_0_57}#{sisu_0_42}#{sisu_0_38}\n#{sisu_0_37}\n#{sisu_0_16}\n#{sisu_0_1}"
+ when /0.65/
+ "#{sisu_0_65}#{sisu_0_57}#{sisu_0_42}#{sisu_0_38}#{sisu_0_16}"
when /0.57/
"#{sisu_0_57}#{sisu_0_42}#{sisu_0_38}#{sisu_0_16}"
when /0.42/
diff --git a/lib/sisu/v0/sst_to_s_xml_dom.rb b/lib/sisu/v0/sst_to_s_xml_dom.rb
index 355cef2b..a1c81532 100644
--- a/lib/sisu/v0/sst_to_s_xml_dom.rb
+++ b/lib/sisu/v0/sst_to_s_xml_dom.rb
@@ -66,6 +66,7 @@ module SiSU_simple_xml_model_dom
include SiSU_Env
require "#{SiSU_lib}/dal_doc_str"
require "#{SiSU_lib}/shared_xml"
+ require "#{SiSU_lib}/shared_sem"
require "#{SiSU_lib}/xml_format"
include SiSU_XML_format
include SiSU_XML_munge
@@ -355,6 +356,7 @@ WOK
(0..6).each { |x| @cont[x]=@level[x]=false }
(4..6).each { |x| @xml_contents_close[x]='' }
data.each do |para|
+ para=SiSU_sem::Tags.new(para).rm.all
wordlist=para.scan(/\S+|\n/) #\n needed for tables, check though added 2005w17
para=tidywords(wordlist).join(' ').strip
para.gsub!(/<[-~]#>/,'')
diff --git a/lib/sisu/v0/sst_to_s_xml_node.rb b/lib/sisu/v0/sst_to_s_xml_node.rb
index 346b48fa..b6d7c9b2 100644
--- a/lib/sisu/v0/sst_to_s_xml_node.rb
+++ b/lib/sisu/v0/sst_to_s_xml_node.rb
@@ -67,6 +67,7 @@ module SiSU_simple_xml_model_node
require "#{SiSU_lib}/dal_syntax"
require "#{SiSU_lib}/dal_doc_str"
require "#{SiSU_lib}/shared_xml"
+ require "#{SiSU_lib}/shared_sem"
require "#{SiSU_lib}/xml_format"
include SiSU_XML_format
include SiSU_XML_munge
@@ -398,6 +399,7 @@ WOK
@data=@data.join.split("\n\n")
@data=SiSU_document_structure::Code.new(@md,@data).code
@data.each do |para|
+ para=SiSU_sem::Tags.new(para).rm.all
data << SiSU_document_structure::Structure.new(@md,para).structure
end
data=Syntax::Markup.new(@md,data).songsheet
diff --git a/lib/sisu/v0/sst_to_s_xml_sax.rb b/lib/sisu/v0/sst_to_s_xml_sax.rb
index 0528bc09..5e4eb5ea 100644
--- a/lib/sisu/v0/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v0/sst_to_s_xml_sax.rb
@@ -66,6 +66,7 @@ module SiSU_simple_xml_model_sax
include SiSU_Env
require "#{SiSU_lib}/dal_doc_str"
require "#{SiSU_lib}/shared_xml"
+ require "#{SiSU_lib}/shared_sem"
require "#{SiSU_lib}/xml_format"
include SiSU_XML_format
include SiSU_XML_munge
@@ -261,6 +262,7 @@ WOK
data << SiSU_document_structure::Structure.new(@md,para).structure
end
data.each do |para|
+ para=SiSU_sem::Tags.new(para).rm.all
para=@trans.markup_light(para)
@trans.char_enc.utf8(para) if @sys.locale =~/utf-?8/i #% utf8
if para =~/\A(?:@|0~)(\S+?):?\s+(.+?)\Z/m # for headers
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index 678b65b6..0cfae494 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2008-02-05" "0.64.3" "SiSU"
+.TH "sisu" "1" "2008-02-12" "0.64.4" "SiSU"
.SH NAME
sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
.SH SYNOPSIS
@@ -810,6 +810,24 @@ primary outline of the document structure. Markup of substantive text includes:
Some interactive help on markup is available, by typing sisu and selecting
markup or sisu \-\-help markup
+.BR
+To check the markup in a file:
+
+.BR
+ sisu \-\-identify \ [filename].sst
+
+.BR
+For brief descriptive summary of markup history
+
+.BR
+ sisu \-\-query\-history
+
+.BR
+or if for a particular version:
+
+.BR
+ sisu \-\-query\-0.38
+
.SH
7.2 MARKUP EXAMPLES
@@ -4533,7 +4551,7 @@ DC Creator:
.BR
DC Rights:
-.I Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL
+.I Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL
3
.BR
@@ -4554,11 +4572,11 @@ DC Date available:
.BR
DC Date modified:
-.I 2008\-02\-05
+.I 2008\-02\-12
.BR
DC Date:
-.I 2008\-02\-05
+.I 2008\-02\-12
.BR
.B Version Information
@@ -4573,7 +4591,7 @@ Filetype:
.BR
Sourcefile Digest, MD5(sisu.ssm.sst)=
-.I 587397c3165a622e01a5c800d69d39a0
+.I 1a602f31f72da6a8d1e6fc6b42d1b703
.BR
Skin_Digest: MD5(skin_sisu_manual.rb)=
@@ -4584,13 +4602,13 @@ Skin_Digest: MD5(skin_sisu_manual.rb)=
.BR
Document (metaverse) last generated:
-.I Tue Feb 05 23:45:59 +0000 2008
+.I Thu Feb 14 02:44:23 +0000 2008
.BR
Generated by:
.I SiSU
-.I 0.64.3
-of 2008w05/2 (2008\-02\-05)
+.I 0.64.4
+of 2008w06/4 (2008\-02\-14)
.BR
Ruby version:
@@ -4747,10 +4765,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu/landscape.pdf>
at: <http://www.jus.uio.no/sisu>
.TP
.TP
-* Generated by: SiSU 0.64.3 of 2008w05/2 (2008-02-05)
+* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14)
.TP
* Ruby version: ruby 1.8.6 (2007-09-24 patchlevel 111) [i486-linux]
.TP
-* Last Generated on: Tue Feb 05 23:45:59 +0000 2008
+* Last Generated on: Thu Feb 14 02:44:23 +0000 2008
.TP
* SiSU http://www.jus.uio.no/sisu
diff --git a/man/man7/sisu_vim.7 b/man/man7/sisu_vim.7
index a6e4ecce..1c22b831 100644
--- a/man/man7/sisu_vim.7
+++ b/man/man7/sisu_vim.7
@@ -1,6 +1,6 @@
-.TH "sisu_vim" "1" "2007-09-16" "0.59.1" "SiSU"
+.TH "sisu_vim" "1" "2008-02-12" "0.64.4" "SiSU"
.SH NAME
-sisu_vim \- vim syntax and folds file for sisu: documents: markup, structuring, publishing in multiple standard formats, and search
+ sisu_vim \- vim syntax and folds file for sisu: markup, structuring, publishing in multiple standard formats, and search
.SH
SISU \- VIM,
RALPH AMISSAH
@@ -47,8 +47,8 @@ Vim 7 includes sisu markup syntax highlighting.
.BR
Vim related files are included in: /usr/share/sisu/conf/editor\-syntax\-etc/vim
-(including the syntax highlighter which may be used for earlier versions of
-Vim).
+(including the syntax highlighter, together with an ftplugin which may be
+sourced if so desired from your vimrc).
.BR
sisu\-vim actions are activated on files with the suffix \.sst \.ssm \.ssi
@@ -108,7 +108,7 @@ DC Creator:
.BR
DC Rights:
-.I Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL
+.I Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL
3
.BR
@@ -129,11 +129,11 @@ DC Date available:
.BR
DC Date modified:
-.I 2007\-09\-16
+.I 2008\-02\-12
.BR
DC Date:
-.I 2007\-09\-16
+.I 2008\-02\-12
.BR
.B Version Information
@@ -148,28 +148,28 @@ Filetype:
.BR
Sourcefile Digest, MD5(sisu_vim.sst)=
-.I a3db74eebef04815aa234d3c3b17f375
+.I b5028f957b128162f7653bbd940042ca
.BR
Skin_Digest: MD5(skin_sisu_manual.rb)=
-.I 20fc43cf3eb6590bc3399a1aef65c5a9
+.I 072b2584bedea82ea8a416587b9fa244
.BR
.B Generated
.BR
Document (metaverse) last generated:
-.I Sat Sep 29 17:14:44 +0100 2007
+.I Thu Feb 14 02:44:14 +0000 2008
.BR
Generated by:
.I SiSU
-.I 0.59.1
-of 2007w39/2 (2007\-09\-25)
+.I 0.64.4
+of 2008w06/4 (2008\-02\-14)
.BR
Ruby version:
-.I ruby 1.8.6 (2007\-06\-07 patchlevel 36) \ [i486\-linux]
+.I ruby 1.8.6 (2007\-09\-24 patchlevel 111) \ [i486\-linux]
.TP
@@ -188,10 +188,10 @@ manpage: http://www.jus.uio.no/sisu/sisu_vim/sisu_vim.1
at: <http://www.jus.uio.no/sisu>
.TP
.TP
-* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
+* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14)
.TP
-* Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
+* Ruby version: ruby 1.8.6 (2007-09-24 patchlevel 111) [i486-linux]
.TP
-* Last Generated on: Sat Sep 29 17:14:44 +0100 2007
+* Last Generated on: Thu Feb 14 02:44:14 +0000 2008
.TP
* SiSU http://www.jus.uio.no/sisu