Merge branch 'upstream' into debian/sid

10 files changed, 187 insertions, 37 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index ee4d8ed5..ba5e1262 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,11 +12,25 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.3.5.orig.tar.gz (2010-05-18:20/2)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
+  sisu_2.3.5.orig.tar.gz
+  sisu_2.3.5-1.dsc
+  sisu_2.3.5-1.diff.gz
+
+  * dal_syntax, url match fix
+
+  * dal_doc_str, name tags fix
+
+  * html, epub, latex/pdf add name tag points
+
+  * vim templates for .sst .ssm & .ssi
+
 %% 2.3.4.orig.tar.gz (2010-05-12:19/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
-  sisu_2.3.4.orig.tar.gz
-  sisu_2.3.4-1.dsc
-  sisu_2.3.4-1.diff.gz
+  3072d857dd7cda793315d2dd57233bb015cac0fa85fcbaec7c05650e09f27b88 2755570 sisu_2.3.4.orig.tar.gz
+  c646cd4a08ad7e58c38b5bdcf0259574dd30db5db51a269be2a5bdf92b6a1293 1145 sisu_2.3.4-1.dsc
+  463e1b2122b8f5aaaf2c9aefec265bfd48856a6839e557d3ac4afa8cea943eb1 276124 sisu_2.3.4-1.diff.gz
 
   * dal_syntax, italics match fix
 
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 1e5e0423..5b2fb44f 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 2.3.4
-:date_stamp: 2010w19/3
-:date: "2010-05-12"
+:version: 2.3.5
+:date_stamp: 2010w20/2
+:date: "2010-05-18"
 :project: SiSU
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 905e940b..378ad2b9 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,25 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.3.5.orig.tar.gz (2010-05-18:20/2)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
+  sisu_2.3.5.orig.tar.gz
+  sisu_2.3.5-1.dsc
+  sisu_2.3.5-1.diff.gz
+
+  * dal_syntax, url match fix
+
+  * dal_doc_str, name tags fix
+
+  * html, epub, latex/pdf add name tag points
+
+  * vim templates for .sst .ssm & .ssi
+
 %% 2.3.4.orig.tar.gz (2010-05-12:19/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
-  sisu_2.3.4.orig.tar.gz
-  sisu_2.3.4-1.dsc
-  sisu_2.3.4-1.diff.gz
+  3072d857dd7cda793315d2dd57233bb015cac0fa85fcbaec7c05650e09f27b88 2755570 sisu_2.3.4.orig.tar.gz
+  c646cd4a08ad7e58c38b5bdcf0259574dd30db5db51a269be2a5bdf92b6a1293 1145 sisu_2.3.4-1.dsc
+  463e1b2122b8f5aaaf2c9aefec265bfd48856a6839e557d3ac4afa8cea943eb1 276124 sisu_2.3.4-1.diff.gz
 
   * dal_syntax, italics match fix
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
index c02898ec..9814205d 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -16,7 +16,7 @@
  :issued: 2002-11-12
  :available: 2002-11-12
  :published: 2009-01-18
- :modified: 2010-05-05
+ :modified: 2010-05-18
 
 @make:
  :num_top: 1
@@ -55,7 +55,7 @@
 
 3~source- Source (tarball tar.gz)
 
-_* {~^ sisu_2.3.4.orig.tar.gz (2010-05-12:19/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
+_* {~^ sisu_2.3.5.orig.tar.gz (2010-05-18:20/2) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
 
 _* {~^ sisu-markup-samples_2.0.3.orig.tar.gz (of 2010-05-01:17/6 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.3.orig.tar.gz *~sisu-markup-samples
 
@@ -102,11 +102,11 @@ group{
 
 *{Source}*
 
-{~^ sisu_2.3.4.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
+{~^ sisu_2.3.5.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
 
-{~^ sisu_2.3.4-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4-1.diff.gz
+{~^ sisu_2.3.5-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5-1.diff.gz
 
-{~^ sisu_2.3.4-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4-1.dsc
+{~^ sisu_2.3.5-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5-1.dsc
 
 }group
 
@@ -114,15 +114,15 @@ group{
 
 *{Debs}*
 
-{~^ sisu_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.4-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_2.3.5-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.5-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_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.4-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_2.3.5-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.5-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_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.4-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_2.3.5-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.5-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_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.4-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_2.3.5-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.5-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_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.4-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_2.3.5-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.5-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 }~
 
 }group
 
@@ -152,7 +152,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
 
 sudo rpm -i [package name]
 
-_* {~^ sisu-2.3.4-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.4-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.3.5-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.5-2.noarch.rpm ~{ <br>created using alien }~
 
 _* {~^ sisu-markup-samples_2.0.3.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_2.0.3.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.3-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
 
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst
index c155e027..f69b2e02 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst
@@ -3,9 +3,11 @@
 @title: SiSU
  :subtitle: Markup
 
-@creator: 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
@@ -19,7 +21,7 @@
  :issued: 2002-08-28
  :available: 2002-08-28
  :published: 2008-05-22
- :modified: 2009-12-16
+ :modified: 2010-05-14
 
 @make:
  :num_top: 1
@@ -327,18 +329,18 @@ code{
 
 code{
 
-normal text !{emphasis}! *{bold text}* _{underscore}_ /{italics}/ "{citation}" ^{superscript}^ ,{subscript}, +{inserted text}+
+normal text  *{emphasis}* !{bold text}! /{italics}/ _{underscore}_ "{citation}" ^{superscript}^ ,{subscript}, +{inserted text}+
 
 normal text
 
-!{emphasis}!
+*{emphasis}*
 
-*{bold text}*
-
-_{underscore}_
+!{bold text}!
 
 /{italics}/
 
+_{underscore}_
+
 "{citation}"
 
 ^{superscript}^
@@ -353,19 +355,19 @@ _{underscore}_
 
 !_ resulting output:
 
-normal text !{emphasis}! *{bold text}* _{underscore}_ /{italics}/ "{citation}" ^{superscript}^ ,{subscript}, +{inserted text}+
+normal text  *{emphasis}* !{bold text}! /{italics}/ _{underscore}_ "{citation}" ^{superscript}^ ,{subscript}, +{inserted text}+
 -{strikethrough}-
 
 normal text
 
-!{emphasis}!
-
-*{bold text}*
+*{emphasis}*
 
-_{underscore}_
+!{bold text}!
 
 /{italics}/
 
+_{underscore}_
+
 "{citation}"
 
 ^{superscript}^
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/templates/ssi.tpl b/data/sisu/v2/conf/editor-syntax-etc/vim/templates/ssi.tpl
new file mode 100644
index 00000000..a101dee6
--- /dev/null
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/templates/ssi.tpl
@@ -0,0 +1,40 @@
+% SiSU 2.0 insert
+
+@title: #___#
+ :subtitle: #___#
+
+@creator:
+ :author: #___#
+
+@rights:
+ :copyright: #___#
+ :license: #___#
+
+@classify:
+ :topic_register: #___#
+ :subject: #___#
+ :type: #___#
+ :loc: #___#
+ :oclc: #___#
+ :isbn: #___#
+
+@date:
+ :published: 20YY-MM-DD
+ :added_to_site: 20YY-MM-DD
+ :modified: 20YY-MM-DD
+
+@make:
+ :headings: none; none; none; none;
+ :num_top: 1
+ :breaks: new=:C; break=1
+ :bold: / #___#/i
+ :italics: / #___#/i
+ :skin: #___#
+
+@links:
+ {SiSU}http://www.jus.uio.no/sisu/SiSU
+
+:A~ @title @author
+
+1~  #___#
+
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/templates/ssm.tpl b/data/sisu/v2/conf/editor-syntax-etc/vim/templates/ssm.tpl
new file mode 100644
index 00000000..cbda5053
--- /dev/null
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/templates/ssm.tpl
@@ -0,0 +1,40 @@
+% SiSU 2.0 master
+
+@title: #___#
+ :subtitle: #___#
+
+@creator:
+ :author: #___#
+
+@rights:
+ :copyright: #___#
+ :license: #___#
+
+@classify:
+ :topic_register: #___#
+ :subject: #___#
+ :type: #___#
+ :loc: #___#
+ :oclc: #___#
+ :isbn: #___#
+
+@date:
+ :published: 20YY-MM-DD
+ :added_to_site: 20YY-MM-DD
+ :modified: 20YY-MM-DD
+
+@make:
+ :headings: none; none; none; none;
+ :num_top: 1
+ :breaks: new=:C; break=1
+ :bold: / #___#/i
+ :italics: / #___#/i
+ :skin: #___#
+
+@links:
+ {SiSU}http://www.jus.uio.no/sisu/SiSU
+
+:A~ @title @author
+
+1~  #___#
+
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/templates/sst.tpl b/data/sisu/v2/conf/editor-syntax-etc/vim/templates/sst.tpl
new file mode 100644
index 00000000..dd19efb4
--- /dev/null
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/templates/sst.tpl
@@ -0,0 +1,40 @@
+% SiSU 2.0
+
+@title: #___#
+ :subtitle: #___#
+
+@creator:
+ :author: #___#
+
+@rights:
+ :copyright: #___#
+ :license: #___#
+
+@classify:
+ :topic_register: #___#
+ :subject: #___#
+ :type: #___#
+ :loc: #___#
+ :oclc: #___#
+ :isbn: #___#
+
+@date:
+ :published: 20YY-MM-DD
+ :added_to_site: 20YY-MM-DD
+ :modified: 20YY-MM-DD
+
+@make:
+ :headings: none; none; none; none;
+ :num_top: 1
+ :breaks: new=:C; break=1
+ :bold: / #___#/i
+ :italics: / #___#/i
+ :skin: #___#
+
+@links:
+ {SiSU}http://www.jus.uio.no/sisu/SiSU
+
+:A~ @title @author
+
+1~  #___#
+
diff --git a/lib/sisu/v2/dal_doc_str.rb b/lib/sisu/v2/dal_doc_str.rb
index 46ae8d3c..a250175b 100644
--- a/lib/sisu/v2/dal_doc_str.rb
+++ b/lib/sisu/v2/dal_doc_str.rb
@@ -102,9 +102,9 @@ module SiSU_document_structure_extract
       tags=[]
       if str.nil?
       else
-        if str =~/(?:^|[ ])\*~([a-z0-9._-]+)(?:[ ]|$)/
-          str.gsub!(/(^|[ ])\*~([a-z0-9._-]+)([ ]|$)/i,
-            "\\1#{Mx[:tag_o]}\\2#{Mx[:tag_c]}\\3")
+        if str =~/(?:^|[ ])\*~([a-z0-9._-]+)(?=[ #{Mx[:br_nl]}]|$)/
+          str.gsub!(/(^|[ ])\*~([a-z0-9._-]+)(?=[ #{Mx[:br_nl]}]|$)/i,
+            "\\1#{Mx[:tag_o]}\\2#{Mx[:tag_c]}")
           str.gsub!(/ [ ]+/i,' ')
           tags=str.scan(/#{Mx[:tag_o]}(\S+?)#{Mx[:tag_c]}/).flatten
           str.gsub!(/[ ]?#{Mx[:tag_o]}\S+?#{Mx[:tag_c]}[ ]?/,' ') #may be issues with spaces would leave one, but "code" blocks?
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb
index c34104c7..9774f7c1 100644
--- a/lib/sisu/v2/dal_syntax.rb
+++ b/lib/sisu/v2/dal_syntax.rb
@@ -409,7 +409,7 @@ module SiSU_Syntax
         dob.obj.gsub!(/(#{Mx[:gr_o]}verse#{Mx[:gr_c]}.+)/m,"\\1\n")
         dob.obj.gsub!(/[ ]+($)/,'\1')
         dob.obj.gsub!(/\{\s*(.+?)\s*\}(https?:\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/,
-          "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}\\2\\3") #any remaining linked text or image
+          "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}#{Mx[:url_o]}\\2#{Mx[:url_c]}\\3") #any remaining linked text or image
         dob.obj.gsub!(/\{\s*(.+?)\s*\}(#{Mx[:url_o]}\S+?#{Mx[:url_c]})/,
           "#{Mx[:lnk_o]}\\1#{Mx[:lnk_c]}\\2") #any remaining linked text or image
         dob.obj.gsub!(/(^|[ ])\{\s*(.+?)\s*\}(\S+?)([;,.]?)(?=\s|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}#{Mx[:en_a_o]}#{Mx[:en_b_o]}]|$)/,