Merge branch 'upstream' into debian/sid

5 files changed, 36 insertions, 13 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7e5a2289..0c4735d5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,11 +6,30 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.55.5.orig.tar.gz (2007-07-22:29/7)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.5.orig.tar.gz
+  sisu_0.55.5.orig.tar.gz
+  sisu_0.55.5-1.dsc
+  sisu_0.55.5-1.diff.gz
+
+  * initialize output directory, fix (Closes: #434168)
+    [(a trivial but serious) bug introduced with changed use of variable in
+    0.55.3, (serious because it prevents the initialization of new output
+    directories "sisu -CC")]
+
+  * dal, matching of underscore, so as not to be to greedy and incorrectly
+    match url with escape url decoration tag (_url)
+
+  * vim syntax highlighting, match url with escape url decoration tag (_url)
+
+  * output note added on software libre's use and adherence to practical
+    open standards
+
 %% sisu_0.55.4.orig.tar.gz (2007-07-20:29/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.4.orig.tar.gz
-  sisu_0.55.4.orig.tar.gz
-  sisu_0.55.4-1.dsc
-  sisu_0.55.4-1.diff.gz
+  1d7bcf423b2e13a457d6565bfec74f20 1267367 sisu_0.55.4.orig.tar.gz
+  a75609387bc894181ccf36a42b79517c 606 sisu_0.55.4-1.dsc
+  1d7bcf423b2e13a457d6565bfec74f20 1267367 sisu_0.55.4-1.diff.gz
 
   * db import, minor refactoring
 
@@ -18,6 +37,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.4.orig.tar.gz
     * search form pre/next
     * scope for matches in individual documents
 
+  [manually re-closed bug #406280, actually closed in February in version
+  sisu-0.48.11, back-ported to sisu-0.48.8-7 freeze branch]
+
 %% sisu_0.55.3.orig.tar.gz (2007-07-14:28/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.3.orig.tar.gz
   d540a4f656393449c5f4ad5b7a5b5245 1267096 sisu_0.55.3.orig.tar.gz
diff --git a/data/sisu/conf/editor-syntax-etc/vim/addons/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/addons/syntax/sisu.vim
index 8a114b64..9b2b562d 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/addons/syntax/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/addons/syntax/sisu.vim
@@ -22,7 +22,7 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_control                           "\""
   syn match   sisu_underline                         "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
   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          contains=@NoSpell   "\(_\?https\?://\|\.\.\/\)\S\+"
   "metaverse specific
   syn match   sisu_ocn           contains=@NoSpell   "<\~\d\+;\w\d\+;\w\d\+>"
   syn match   sisu_marktail                          "<\~#>"
@@ -106,9 +106,9 @@ syn region  sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin"
 syn match sisu_error_wspace contains=sisu_error_wspace "^\s\+"
 syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+"
 syn match sisu_error_wspace contains=sisu_error_wspace  " \s*$"
-syn match sisu_error contains=sisu_error,sisu_error_wspace "[^ (}]https\?:\S\+"
 syn match sisu_error contains=sisu_error_wspace "\t\+"
-syn match sisu_error contains=sisu_error "https\?:\S\+[}><]"
+syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+"
+syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]"
 syn match sisu_error contains=sisu_error "\([!*/_\+,^]\){\([^(\}\1)]\)\{-}\n\n"
 syn match sisu_error contains=sisu_error "^[\~]{[^{]\{-}\n\n"
 syn match sisu_error contains=sisu_error "\s\+.{{"
@@ -128,8 +128,8 @@ syn match sisu_error  "/\?<\([biu]\)>[^(</\1>)]\{-}\n\n"
 syn match sisu_control "\n\n" "contains=ALL
 syn match sisu_control " //"
 syn match sisu_error  "%{"
-syn match sisu_error "<br>https\?:\S\+\|https\?:\S\+<br>"
-syn match sisu_error "[><]https\?:\S\+\|https\?:\S\+[><]"
+syn match sisu_error "<br>_\?https\?:\S\+\|_\?https\?:\S\+<br>"
+syn match sisu_error "[><]_\?https\?:\S\+\|_\?https\?:\S\+[><]"
 "% 2 Definitions - Define the default highlighting.
 if version >= 508 || !exists("did_sisu_syntax_inits")
   if version < 508
diff --git a/lib/sisu/v0/cgi_sql_common.rb b/lib/sisu/v0/cgi_sql_common.rb
index ac2958d1..73cb2342 100644
--- a/lib/sisu/v0/cgi_sql_common.rb
+++ b/lib/sisu/v0/cgi_sql_common.rb
@@ -593,8 +593,8 @@ module SiSU_CGI_sql
     software infrastructure,
     with the usual GPL (or OSS) suspects.
   <br />
-    Better - "adherence to standards, performance, reliability, scalability, security &amp; total cost of ownership"
-    [not to mention flexibility &amp; choice] and it is software libre.
+    Better - "performance, reliability, scalability, security  &amp; total cost of ownership"
+    [not to mention flexibility &amp; choice] use of and adherence to open standards (where practical and fair) and it is software libre.
   <br />
     Get With the Future
     <a href="http://www.jus.uio.no/sisu/">
diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb
index a882a2c9..ce5fdc72 100644
--- a/lib/sisu/v0/dal_syntax.rb
+++ b/lib/sisu/v0/dal_syntax.rb
@@ -262,7 +262,7 @@ module Syntax
         line.gsub!(/(^|\s+|['"]|&nbsp;|\(|\>)\*(\S+?)\*/,'\1<b>\2</b>')            #bold single word, watch
         line.gsub!(/(^|\s+|['"]|&nbsp;|\(|\>)\!(\S+?)\!/,'\1<b>\2</b>')            #bold single word, watch
         line.gsub!(/(^|\s+|['"]|&nbsp;|\(|\>)\/([\(\)a-zA-Z0-9']+?)\/([^a-zA-Z0-9]|[ ,.;:'"~$]|$)/,'\1<i>\2</i>\3')     #italics single word, watch
-        line.gsub!(/(^|\s+|['"]|&nbsp;|\(|\>)_(\S+?)_/,'\1<u>\2</u>')              #underscore single word, watch
+        line.gsub!(/(^|\s+|['"]|&nbsp;|\(|\>)_(\S+?)_([.,!'")]?(?:\s|$))/,'\1<u>\2</u>\3')  #underscore single word, watch (made more complicated by url decoration escape tag (_url))
         line.gsub!(/(^|\s+)-([^{]\S+?)-( |$)/,'\1<del>\2</del>\3')                 #underscore single word, watch
         line.gsub!(/(^|\s+|['"]|&nbsp;|\(|\>|\d+)\^(\S+?)\^/,'\1<sup>\2</sup>')    #superscript single word, watch digit added
         line.gsub!(/<[:e]\s+(.+?)!?>/,'~{ \1 }~')                                  # not tested
diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb
index 4963e882..a3a19988 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v0/defaults.rb
@@ -1397,8 +1397,8 @@ WOK
     software infrastructure,
     with the usual GPL (or OSS) suspects.
   <br />
-    Better - "adherence to standards, performance, reliability, scalability, security &amp; total cost of ownership"
-    [not to mention flexibility &amp; choice] and it is software libre.
+    Better - "performance, reliability, scalability, security &amp; total cost of ownership"
+    [not to mention flexibility &amp; choice] use of and adherence to open standards (where practical and fair) and it is software libre.
   <br />
     Get With the Future
     <a href="http://www.jus.uio.no/sisu/">
@@ -1469,6 +1469,7 @@ WOK
     def initialize
       @v=SiSU_Env::Info_version.new.get_version
       @dir=SiSU_Env::Info_env.new
+      @date=SiSU_Env::Info_date.new #{@date.year}
     end
     def redirect
       <<WOK