aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2008-02-16 02:53:51 +0000
committerRalph Amissah <ralph@amissah.com>2008-02-16 02:53:51 +0000
commit9e789c86dcc84b0126db6a1e6cbf07a6a5e62a2b (patch)
tree6c8bc5ef8a14aed8b1e3cc7377818b6ae9e149d5
parentmarkup tag match refinement (diff)
regex matches vim syntax hilighting
-rw-r--r--data/doc/sisu/html/sisu.1.html12
-rw-r--r--data/doc/sisu/html/sisu_vim.7.html17
-rw-r--r--data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi24
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim4
-rw-r--r--lib/sisu/v0/shared_sem.rb2
-rw-r--r--man/man1/sisu.112
6 files changed, 33 insertions, 38 deletions
diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html
index 88717ed6..252967a0 100644
--- a/data/doc/sisu/html/sisu.1.html
+++ b/data/doc/sisu/html/sisu.1.html
@@ -3291,10 +3291,10 @@ Type: <i>information</i>
<p> Skin_Digest: MD5(skin_sisu_manual.rb)= <i>072b2584bedea82ea8a416587b9fa244</i>
<p> <b>Generated</b>
-<p> Document (metaverse) last generated: <i>Thu</i> Feb 14 02:44:23
+<p> Document (metaverse) last generated: <i>Sat</i> Feb 16 02:33:43
<p>+0000 2008
-<p> Generated by: <i>SiSU</i> <i>0.64.4</i> of 2008w06/4 (2008-02-14)
+<p> Generated by: <i>SiSU</i> <i>0.65.0</i> of 2008w06/6 (2008-02-16)
<p> Ruby version:
<i>ruby</i> 1.8.6 (2007-09-24 patchlevel 111) &nbsp;[i486-linux]
<p>
@@ -3404,7 +3404,7 @@ distributable are not freely changeable. </li><b>.</b><li>named index.html or mo
<dt>pdf: &lt;<a href='http://www.jus.uio.no/sisu/sisu/landscape.pdf'><a href='http://www.jus.uio.no/sisu/sisu/landscape.pdf'>http://www.jus.uio.no/sisu/sisu/landscape.pdf</a>
</a>
&gt; </dt>
-<dd> </dd>
+<dd></dd>
<dt>at: &lt;<a href='http://www.jus.uio.no/sisu'><a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>
</a>
@@ -3412,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.4 of 2008w06/4 (2008-02-14) </dt>
+<dt>* Generated by: SiSU 0.65.0 of 2008w06/6 (2008-02-16) </dt>
<dd></dd>
<dt>* Ruby version: ruby
1.8.6 (2007-09-24 patchlevel 111) [i486-linux] </dt>
<dd></dd>
-<dt>* Last Generated on: Thu Feb
-14 02:44:23 +0000 2008 </dt>
+<dt>* Last Generated on: Sat Feb
+16 02:33:43 +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 385eef0e..cb4a347b 100644
--- a/data/doc/sisu/html/sisu_vim.7.html
+++ b/data/doc/sisu/html/sisu_vim.7.html
@@ -122,25 +122,20 @@ Generated by: <i>SiSU</i> <i>0.64.4</i> of 2008w06/4 (2008-02-14)
</dt>
<dd></dd>
-<dt>manpage: <a href='http://www.jus.uio.no/sisu/sisu_vim/sisu_vim.1'>http://www.jus.uio.no/sisu/sisu_vim/sisu_vim.1</a>
- </dt>
-<dd></dd>
-
<dt>at: &lt;<a href='http://www.jus.uio.no/sisu'><a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>
</a>
-&gt;
-</dt>
+&gt; </dt>
<dd></dd>
-<dt>* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14) </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>
+<dt>* Ruby version: ruby 1.8.6 (2007-09-24 patchlevel 111) [i486-linux] </dt>
<dd></dd>
-<dt>* Last Generated on: Thu Feb
-14 02:44:14 +0000 2008 </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_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index 28c2f13d..736238c3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -18,9 +18,9 @@
@date.available: 2007-08-28
-@date.modified: 2008-02-05
+@date.modified: 2008-02-16
-@date: 2008-02-05
+@date: 2008-02-16
@level: new=C; break=1; num_top=1
@@ -55,7 +55,7 @@
Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
-_* {~^ sisu_0.64.3.orig.tar.gz (of 2008-02-05:05/2) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3.orig.tar.gz
+_* {~^ sisu_0.65.0.orig.tar.gz (of 2008-02-16:06/6) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.65.0.orig.tar.gz
_* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.8.orig.tar.gz *~sisu-markup-samples
@@ -90,23 +90,23 @@ deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
!_ Source
-_* {~^ sisu_0.64.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3.orig.tar.gz
+_* {~^ sisu_0.65.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.65.0.orig.tar.gz
-_* {~^ sisu_0.64.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3-1.diff.gz
+_* {~^ sisu_0.65.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.65.0-1.diff.gz
-_* {~^ sisu_0.64.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3-1.dsc
+_* {~^ sisu_0.65.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.65.0-1.dsc
!_ Debs
-_* {~^ sisu_0.64.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.64.3-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+_* {~^ sisu_0.65.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.65.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
-_* {~^ sisu-complete_0.64.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.64.3-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+_* {~^ sisu-complete_0.65.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.65.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
-_* {~^ sisu-pdf_0.64.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.64.3-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+_* {~^ sisu-pdf_0.65.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.65.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
-_* {~^ sisu-postgresql_0.64.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.64.3-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+_* {~^ sisu-postgresql_0.65.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.65.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
-_* {~^ sisu-sqlite_0.64.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.64.3-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+_* {~^ sisu-sqlite_0.65.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.65.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
For changelogs see:
@@ -132,7 +132,7 @@ _1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_sam
The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby.
-_* {~^ sisu-0.64.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.64.3-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.64.3-1_all.deb }~
+_* {~^ sisu-0.65.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.65.0-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.65.0-1_all.deb }~
_* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> untested, created using alien }~
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 1de9a34d..cfaded0d 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -38,8 +38,8 @@ if !exists("sisu_no_identifiers")
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_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"
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"
diff --git a/lib/sisu/v0/shared_sem.rb b/lib/sisu/v0/shared_sem.rb
index f6303ee0..a082cfc2 100644
--- a/lib/sisu/v0/shared_sem.rb
+++ b/lib/sisu/v0/shared_sem.rb
@@ -112,7 +112,7 @@ module SiSU_sem
def sem_marker_added_extra_parts
unless @para =~ rgx.exclude
@para.gsub!(rgx.whole_csc_ae,'')
- if para =~rgx.each_csc_ae; puts "WARNING semantic taggin error: #@para"
+ if @para =~rgx.each_csc_ae; puts "WARNING semantic taggin error: #@para"
end
end
@para
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index 38bd245c..75d77fa3 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2008-02-12" "0.64.4" "SiSU"
+.TH "sisu" "1" "2008-02-12" "0.65.0" "SiSU"
.SH NAME
sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
.SH SYNOPSIS
@@ -4602,13 +4602,13 @@ Skin_Digest: MD5(skin_sisu_manual.rb)=
.BR
Document (metaverse) last generated:
-.I Thu Feb 14 02:44:23 +0000 2008
+.I Sat Feb 16 02:33:43 +0000 2008
.BR
Generated by:
.I SiSU
-.I 0.64.4
-of 2008w06/4 (2008\-02\-14)
+.I 0.65.0
+of 2008w06/6 (2008\-02\-16)
.BR
Ruby version:
@@ -4762,10 +4762,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu/landscape.pdf>
.TP
at: <http://www.jus.uio.no/sisu>
.TP
-* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14)
+* Generated by: SiSU 0.65.0 of 2008w06/6 (2008-02-16)
.TP
* Ruby version: ruby 1.8.6 (2007-09-24 patchlevel 111) [i486-linux]
.TP
-* Last Generated on: Thu Feb 14 02:44:23 +0000 2008
+* Last Generated on: Sat Feb 16 02:33:43 +0000 2008
.TP
* SiSU http://www.jus.uio.no/sisu