Merge branch 'upstream' into debian/sid

19 files changed, 183 insertions, 132 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 5cf3d984..b373eea7 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,25 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.1.orig.tar.gz (2011-03-30:13/3) [see 3.0.6]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1
+
+  * (ruby 1.9.2 (transition related) fixes)
+    * dal_doc_str
+      * empty line not paragraph object
+      * table structure issue, double spaced empty line creates spurious newline
+    * dal_images, image path setting
+    * param, nested regex match backport from v3
+    * cgi sample-search-form, string output (also cleaned unused help text)
+
+  * sysenv, remove repeated method
+
+  * vim colorscheme Slate, review console colors
+    * change warning and diff colors, so as not to conflict
+    * review cterm colors
+    * for console use color names instead of numbers
+    * rearrange
+
 %% 2.9.0.orig.tar.gz (2011-03-24:12/4) [see 3.0.5]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.5-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 916427bd..8660f162 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,6 +13,28 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.6.orig.tar.gz (2011-03-30:13/3)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.6-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz
+  sisu_3.0.6.orig.tar.gz
+  sisu_3.0.6-1.dsc
+  sisu_3.0.6-1.debian.tar.gz
+
+  * (ruby 1.9.2 (transition related) fixes)
+    * dal_doc_str
+      * empty line not paragraph object
+      * table structure issue, double spaced empty line creates spurious newline
+    * dal_images, image path setting
+    * cgi sample-search-form, string output (also cleaned unused help text)
+
+  * sysenv, remove repeated method
+
+  * vim colorscheme Slate, review console colors
+    * change warning and diff colors, so as not to conflict
+    * review cterm colors
+    * for console use color names instead of numbers
+    * rearrange
+
 %% 3.0.5.orig.tar.gz (2011-03-24:12/4)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.5-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz
@@ -21,6 +43,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz
   d464fea52ecc63ef2dd79467caa8737ff4f438ef3ac2a4d31be19d87d938bb50 282094 sisu_3.0.5-1.debian.tar.gz
   1cfa902db6e95f189094ea04aeffdf829b0587949474284c3d319c6538ab64e7 1216 sisu_3.0.5-2.dsc
   6934656837f4cc9830a549dd96ac2592fde3c7132021db1d4c876fac40b63846 284916 sisu_3.0.5-2.debian.tar.gz
+  7316b1dc48da1b4b1f9ef0ffbb3ca5e7cbaebf57a1cdcb44acc5856c1ea0f852 1216 sisu_3.0.5-3.dsc
+  6984641a61f676e03a085953309c1ba728b263ce3a44e56d0df428406b65f03a 285568 sisu_3.0.5-3.debian.tar.gz
 
   * move to ruby >=1.9.2p180: simplify development of v3 and maintenance of v2
     * bin/sisu demand ruby >=1.9.2p180 (version checks)
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
index 64ae0ff1..01a6c057 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,6 +1,8 @@
 "%% SiSU Vim color file
+" Name:             Slate
 " Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" (originally looked at desert Hans Fugal <hans@fugal.net> http://hans.fugal.net/vim/colors/desert.vim (April/May 2003)
+" last updated:     2011-03-30
+" (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
 :set background=dark
 :highlight clear
 if version > 580
@@ -10,50 +12,50 @@ if version > 580
  endif
 endif
 :let colors_name = "slate"
-:hi Normal guifg=White guibg=grey15
-:hi Cursor guibg=khaki guifg=slategrey
-:hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey
-:hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7
-:hi IncSearch guifg=green guibg=black cterm=none ctermfg=yellow ctermbg=green
-:hi ModeMsg guifg=goldenrod cterm=none ctermfg=brown
-:hi MoreMsg guifg=SeaGreen ctermfg=darkgreen
-:hi NonText guifg=RoyalBlue guibg=grey15 cterm=bold ctermfg=blue
-:hi Question guifg=springgreen ctermfg=green
-:hi Search guibg=peru guifg=wheat cterm=none ctermfg=grey ctermbg=blue
-:hi SpecialKey guifg=yellowgreen ctermfg=darkgreen
-:hi StatusLine guibg=#c2bfa5 guifg=black gui=none cterm=bold,reverse
-:hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-:hi Title guifg=gold gui=bold cterm=bold ctermfg=yellow
-:hi Statement guifg=CornflowerBlue ctermfg=lightblue
-:hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse
-:hi WarningMsg guifg=salmon ctermfg=1
-:hi String guifg=SkyBlue ctermfg=darkcyan
-:hi Comment term=bold ctermfg=11 guifg=grey40
-:hi Constant guifg=#ffa0a0 ctermfg=brown
-:hi Special guifg=darkkhaki ctermfg=brown
-:hi Identifier guifg=salmon ctermfg=red
-:hi Include guifg=red ctermfg=red
-:hi PreProc guifg=red guibg=white ctermfg=red
-:hi Operator guifg=Red ctermfg=Red
-:hi Define guifg=gold gui=bold ctermfg=yellow
-:hi Type guifg=CornflowerBlue ctermfg=2
-:hi Function guifg=navajowhite ctermfg=brown
-:hi Structure guifg=green ctermfg=green
-:hi LineNr guifg=grey50 ctermfg=3
-:hi Ignore guifg=grey40 cterm=bold ctermfg=7
-:hi Todo guifg=orangered guibg=yellow2
-:hi Directory ctermfg=darkcyan
-:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi VisualNOS cterm=bold,underline
-:hi WildMenu ctermfg=0 ctermbg=3
-:hi DiffAdd ctermbg=4
-:hi DiffChange ctermbg=5
-:hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
-:hi DiffText cterm=bold ctermbg=1
-:hi Underlined cterm=underline ctermfg=5
-:hi Error guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi SpellErrors guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi CursorLine guibg=black ctermbg=black
-:hi CursorColumn guibg=black ctermbg=black
+:hi Normal                                                                              guibg=grey15      guifg=white
+:hi Cursor                                                                              guibg=khaki       guifg=slategrey
+:hi VertSplit    cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
+:hi Folded                            ctermbg=black       ctermfg=grey                  guibg=black       guifg=grey40
+:hi FoldColumn                        ctermbg=grey        ctermfg=darkblue              guibg=black       guifg=grey20
+:hi IncSearch    cterm=none           ctermbg=green       ctermfg=yellow                guibg=black       guifg=green
+:hi ModeMsg      cterm=none                               ctermfg=brown                                   guifg=goldenrod
+:hi MoreMsg                                               ctermfg=darkgreen                               guifg=SeaGreen
+:hi NonText      cterm=bold                               ctermfg=blue                  guibg=grey15      guifg=RoyalBlue
+:hi Question                                              ctermfg=green                                   guifg=springgreen
+:hi Search                            ctermbg=yellow      ctermfg=darkgreen             guibg=peru        guifg=wheat
+:hi SpecialKey                                            ctermfg=darkgreen                               guifg=yellowgreen
+:hi StatusLine   cterm=bold,reverse                                            gui=none guibg=#c2bfa5     guifg=black
+:hi StatusLineNC cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
+:hi Title        cterm=bold                               ctermfg=yellow       gui=bold                   guifg=gold
+:hi Statement                                             ctermfg=lightblue                               guifg=CornflowerBlue
+:hi Visual       cterm=reverse                                                 gui=none guibg=olivedrab   guifg=khaki
+:hi String                                                ctermfg=darkcyan                                guifg=SkyBlue
+:hi Comment      term=bold                                ctermfg=grey                                    guifg=grey40
+:hi Constant                                              ctermfg=brown                                   guifg=#ffa0a0
+:hi Special                                               ctermfg=brown                                   guifg=darkkhaki
+:hi Identifier                                            ctermfg=red                                     guifg=salmon
+:hi Include                                               ctermfg=red                                     guifg=red
+:hi PreProc                                               ctermfg=red                   guibg=white       guifg=red
+:hi Operator                                              ctermfg=red                                     guifg=red
+:hi Define                                                ctermfg=yellow       gui=bold                   guifg=gold
+:hi Type                                                  ctermfg=darkgreen                               guifg=CornflowerBlue
+:hi Function                                              ctermfg=brown                                   guifg=navajowhite
+:hi Structure                                             ctermfg=green                                   guifg=green
+:hi LineNr                                                ctermfg=darkyellow                              guifg=grey50
+:hi Ignore       cterm=bold                               ctermfg=grey                                    guifg=grey40
+:hi Todo                                                                                guibg=yellow2     guifg=orangered
+:hi Directory                                             ctermfg=darkcyan
+:hi VisualNOS    cterm=bold,underline
+:hi WildMenu                          ctermbg=darkyellow  ctermfg=black
+:hi DiffChange   cterm=none           ctermbg=darkgrey    ctermfg=white
+:hi DiffText     cterm=none           ctermbg=darkcyan    ctermfg=white
+:hi DiffAdd      cterm=none           ctermbg=darkgreen   ctermfg=white
+:hi DiffDelete   cterm=none           ctermbg=darkgrey    ctermfg=black
+:hi Underlined   cterm=underline                          ctermfg=darkmagenta
+:hi WarningMsg                        ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta guifg=salmon
+:hi ErrorMsg     cterm=bold                                                             guibg=darkred     guifg=white
+:hi Error        cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
+:hi SpellErrors  cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
+:hi CursorLine                        ctermbg=black                                     guibg=black
+:hi CursorColumn                      ctermbg=black                                     guibg=black
 
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 765b05a3..a5549d42 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.9.0
-:date_stamp: 2011w12/4
-:date: "2011-03-24"
+:version: 2.9.1
+:date_stamp: 2011w13/3
+:date: "2011-03-30"
 :project: SiSU
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
index 64ae0ff1..01a6c057 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,6 +1,8 @@
 "%% SiSU Vim color file
+" Name:             Slate
 " Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" (originally looked at desert Hans Fugal <hans@fugal.net> http://hans.fugal.net/vim/colors/desert.vim (April/May 2003)
+" last updated:     2011-03-30
+" (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
 :set background=dark
 :highlight clear
 if version > 580
@@ -10,50 +12,50 @@ if version > 580
  endif
 endif
 :let colors_name = "slate"
-:hi Normal guifg=White guibg=grey15
-:hi Cursor guibg=khaki guifg=slategrey
-:hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey
-:hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7
-:hi IncSearch guifg=green guibg=black cterm=none ctermfg=yellow ctermbg=green
-:hi ModeMsg guifg=goldenrod cterm=none ctermfg=brown
-:hi MoreMsg guifg=SeaGreen ctermfg=darkgreen
-:hi NonText guifg=RoyalBlue guibg=grey15 cterm=bold ctermfg=blue
-:hi Question guifg=springgreen ctermfg=green
-:hi Search guibg=peru guifg=wheat cterm=none ctermfg=grey ctermbg=blue
-:hi SpecialKey guifg=yellowgreen ctermfg=darkgreen
-:hi StatusLine guibg=#c2bfa5 guifg=black gui=none cterm=bold,reverse
-:hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-:hi Title guifg=gold gui=bold cterm=bold ctermfg=yellow
-:hi Statement guifg=CornflowerBlue ctermfg=lightblue
-:hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse
-:hi WarningMsg guifg=salmon ctermfg=1
-:hi String guifg=SkyBlue ctermfg=darkcyan
-:hi Comment term=bold ctermfg=11 guifg=grey40
-:hi Constant guifg=#ffa0a0 ctermfg=brown
-:hi Special guifg=darkkhaki ctermfg=brown
-:hi Identifier guifg=salmon ctermfg=red
-:hi Include guifg=red ctermfg=red
-:hi PreProc guifg=red guibg=white ctermfg=red
-:hi Operator guifg=Red ctermfg=Red
-:hi Define guifg=gold gui=bold ctermfg=yellow
-:hi Type guifg=CornflowerBlue ctermfg=2
-:hi Function guifg=navajowhite ctermfg=brown
-:hi Structure guifg=green ctermfg=green
-:hi LineNr guifg=grey50 ctermfg=3
-:hi Ignore guifg=grey40 cterm=bold ctermfg=7
-:hi Todo guifg=orangered guibg=yellow2
-:hi Directory ctermfg=darkcyan
-:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi VisualNOS cterm=bold,underline
-:hi WildMenu ctermfg=0 ctermbg=3
-:hi DiffAdd ctermbg=4
-:hi DiffChange ctermbg=5
-:hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
-:hi DiffText cterm=bold ctermbg=1
-:hi Underlined cterm=underline ctermfg=5
-:hi Error guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi SpellErrors guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi CursorLine guibg=black ctermbg=black
-:hi CursorColumn guibg=black ctermbg=black
+:hi Normal                                                                              guibg=grey15      guifg=white
+:hi Cursor                                                                              guibg=khaki       guifg=slategrey
+:hi VertSplit    cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
+:hi Folded                            ctermbg=black       ctermfg=grey                  guibg=black       guifg=grey40
+:hi FoldColumn                        ctermbg=grey        ctermfg=darkblue              guibg=black       guifg=grey20
+:hi IncSearch    cterm=none           ctermbg=green       ctermfg=yellow                guibg=black       guifg=green
+:hi ModeMsg      cterm=none                               ctermfg=brown                                   guifg=goldenrod
+:hi MoreMsg                                               ctermfg=darkgreen                               guifg=SeaGreen
+:hi NonText      cterm=bold                               ctermfg=blue                  guibg=grey15      guifg=RoyalBlue
+:hi Question                                              ctermfg=green                                   guifg=springgreen
+:hi Search                            ctermbg=yellow      ctermfg=darkgreen             guibg=peru        guifg=wheat
+:hi SpecialKey                                            ctermfg=darkgreen                               guifg=yellowgreen
+:hi StatusLine   cterm=bold,reverse                                            gui=none guibg=#c2bfa5     guifg=black
+:hi StatusLineNC cterm=reverse                                                 gui=none guibg=#c2bfa5     guifg=grey40
+:hi Title        cterm=bold                               ctermfg=yellow       gui=bold                   guifg=gold
+:hi Statement                                             ctermfg=lightblue                               guifg=CornflowerBlue
+:hi Visual       cterm=reverse                                                 gui=none guibg=olivedrab   guifg=khaki
+:hi String                                                ctermfg=darkcyan                                guifg=SkyBlue
+:hi Comment      term=bold                                ctermfg=grey                                    guifg=grey40
+:hi Constant                                              ctermfg=brown                                   guifg=#ffa0a0
+:hi Special                                               ctermfg=brown                                   guifg=darkkhaki
+:hi Identifier                                            ctermfg=red                                     guifg=salmon
+:hi Include                                               ctermfg=red                                     guifg=red
+:hi PreProc                                               ctermfg=red                   guibg=white       guifg=red
+:hi Operator                                              ctermfg=red                                     guifg=red
+:hi Define                                                ctermfg=yellow       gui=bold                   guifg=gold
+:hi Type                                                  ctermfg=darkgreen                               guifg=CornflowerBlue
+:hi Function                                              ctermfg=brown                                   guifg=navajowhite
+:hi Structure                                             ctermfg=green                                   guifg=green
+:hi LineNr                                                ctermfg=darkyellow                              guifg=grey50
+:hi Ignore       cterm=bold                               ctermfg=grey                                    guifg=grey40
+:hi Todo                                                                                guibg=yellow2     guifg=orangered
+:hi Directory                                             ctermfg=darkcyan
+:hi VisualNOS    cterm=bold,underline
+:hi WildMenu                          ctermbg=darkyellow  ctermfg=black
+:hi DiffChange   cterm=none           ctermbg=darkgrey    ctermfg=white
+:hi DiffText     cterm=none           ctermbg=darkcyan    ctermfg=white
+:hi DiffAdd      cterm=none           ctermbg=darkgreen   ctermfg=white
+:hi DiffDelete   cterm=none           ctermbg=darkgrey    ctermfg=black
+:hi Underlined   cterm=underline                          ctermfg=darkmagenta
+:hi WarningMsg                        ctermbg=darkmagenta ctermfg=black                 guibg=darkmagenta guifg=salmon
+:hi ErrorMsg     cterm=bold                                                             guibg=darkred     guifg=white
+:hi Error        cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
+:hi SpellErrors  cterm=bold           ctermbg=darkmagenta ctermfg=grey                  guibg=darkred     guifg=white
+:hi CursorLine                        ctermbg=black                                     guibg=black
+:hi CursorColumn                      ctermbg=black                                     guibg=black
 
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index bca535e0..4d06712b 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.0.5-beta-rb1.9.2p180
-:date_stamp: 2011w12/4
-:date: "2011-03-24"
+:version: 3.0.6-beta-rb1.9.2p180
+:date_stamp: 2011w13/3
+:date: "2011-03-30"
 :project: SiSU
diff --git a/lib/sisu/v2/cgi.rb b/lib/sisu/v2/cgi.rb
index a375282f..d9bbc9ed 100644
--- a/lib/sisu/v2/cgi.rb
+++ b/lib/sisu/v2/cgi.rb
@@ -71,8 +71,6 @@ module  SiSU_CGI
      a=%{
           For help on sisu search, type:
             sisu --help search
-          For help on setting up hyperestraier for sisu, type:
-            sisu --help hyperestraier
     }
         SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey
     end
diff --git a/lib/sisu/v2/cgi_pgsql.rb b/lib/sisu/v2/cgi_pgsql.rb
index 7a948366..416a7d88 100644
--- a/lib/sisu/v2/cgi_pgsql.rb
+++ b/lib/sisu/v2/cgi_pgsql.rb
@@ -83,7 +83,7 @@ module  SiSU_CGI_pgsql
         else put "WARNING: no postgresql database available, (have you created one?)"
         end
         serve.sort!
-        f1,f2,f3=[],[],[]
+        f1,f2,f3='','',''
         serve.each do |x|
           f1 << %{              <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n} unless x =~/apache|sisu\/image/ #check
         end
diff --git a/lib/sisu/v2/cgi_sqlite.rb b/lib/sisu/v2/cgi_sqlite.rb
index 5c20b072..d7e131d3 100644
--- a/lib/sisu/v2/cgi_sqlite.rb
+++ b/lib/sisu/v2/cgi_sqlite.rb
@@ -78,7 +78,7 @@ module  SiSU_CGI_sqlite
         end
       end
       serve.sort!
-      f1,f2,f3=[],[],[]
+      f1,f2,f3='','',''
       serve.each do |x|
         f1 << %{              <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n}
       end
diff --git a/lib/sisu/v2/dal_doc_str.rb b/lib/sisu/v2/dal_doc_str.rb
index 56bf205f..6fd7eff2 100644
--- a/lib/sisu/v2/dal_doc_str.rb
+++ b/lib/sisu/v2/dal_doc_str.rb
@@ -178,8 +178,10 @@ module SiSU_document_structure_extract
               image=image_test(obj)
               note=endnote_test?(obj)
               obj,tags=extract_tags(obj)
-              h={:bullet_=>bullet,:indent=>indent,:obj=>obj,:idx=>idx,:note_=>note,:image_=>image,:tags=>tags}
-              SiSU_document_structure::Object_para.new.paragraph(h)
+              unless obj=~/\A\s*\Z/m
+                h={:bullet_=>bullet,:indent=>indent,:obj=>obj,:idx=>idx,:note_=>note,:image_=>image,:tags=>tags}
+                SiSU_document_structure::Object_para.new.paragraph(h)
+              end
             else nil
             end
           when /^<?:p[bn]>?\s*$/
@@ -193,8 +195,10 @@ module SiSU_document_structure_extract
             image=image_test(t_o)
             note=endnote_test?(t_o)
             obj,tags=extract_tags(t_o)
-            h={:bullet_=>false,:indent=>0,:obj=>obj,:idx=>idx,:note_=>note,:image_=>image,:tags=>tags}
-            SiSU_document_structure::Object_para.new.paragraph(h)
+            unless obj=~/\A\s*\Z/m
+              h={:bullet_=>false,:indent=>0,:obj=>obj,:idx=>idx,:note_=>note,:image_=>image,:tags=>tags}
+              SiSU_document_structure::Object_para.new.paragraph(h)
+            end
           end
         elsif not @@flag['code']
           if t_o =~/^code\{/
@@ -306,7 +310,9 @@ module SiSU_document_structure_extract
             t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h)
             t_o
           else
-            if t_o !~/^table\{/ and not t_o.nil?
+            if t_o !~/^table\{/ \
+            and not t_o.nil?
+              t_o.gsub!(/^\n+/m,'') #check added for ruby 1.9.2 not needed in 1.8 series
               t_o.gsub!(/\n/m,"#{Mx[:tc_p]}")
               @rows += t_o + Mx[:tc_c]
             end
@@ -786,7 +792,7 @@ module SiSU_document_structure_extract
       @o_array=[]
       node=ocn=ocn_dv=ocn_sp=ocnh=ocnh1=ocnh2=ocnh3=ocnh4=ocnh5=ocnh6=ocno=ocnp=ocnt=ocnc=ocng=ocni=ocnm=ocnu=ocnk=nm=0 # h heading, o other, t table, g group, i image
       node_count_flag=false
-      regex_exclude_ocn_and_node = /#{Rx[:meta]}|^@\S+?:\s|^4~endnotes|^#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}|^\^~ |<:e[:_]\d+?>|^<:\#|<:- |<[:!]!4|<hr width|#{Mx[:br_endnotes]}/i #ocn here #&nbsp; added with Tune.code #¡
+      regex_exclude_ocn_and_node = /#{Rx[:meta]}|^@\S+?:\s|^4~endnotes|^#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}|^\^~ |<:e[:_]\d+?>|^<:\#|<:- |<[:!]!4|<hr width|#{Mx[:br_endnotes]}|\A\s*\Z/mi #ocn here #&nbsp; added with Tune.code #¡
       parent=node1=node2=node3=node4=node5=node6=nil
       data.each do |dob|
         h={}
diff --git a/lib/sisu/v2/dal_images.rb b/lib/sisu/v2/dal_images.rb
index ed537f22..2f9eb79d 100644
--- a/lib/sisu/v2/dal_images.rb
+++ b/lib/sisu/v2/dal_images.rb
@@ -92,8 +92,9 @@ module SiSU_images
                   dir=SiSU_Env::Info_env.new(@md.fns)
                   path_image=[dir.path.image_source_local_tex,dir.path.image_source_remote_tex,dir.path.image_source_tex]
                   image_path=nil
-                  path_image.each do |image_path|
-                    break if FileTest.exist?("#{image_path}/#{image}")
+                  path_image.each do |img_pth|
+                    image_path=img_pth
+                    break if FileTest.exist?("#{img_pth}/#{image}")
                   end
                   if FileTest.exist?("#{image_path}/#{image}")
                     if @rmgk
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index 655177a7..c500c282 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -908,7 +908,7 @@ module SiSU_Param
         skip unless fns_array                                                    # consider
         @markup_version=SiSU_Markup_type::Markup_identify.new(fns_array,@opt).markup_version?                          #% determine markup version
         if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?[\d.]*|sisu-[\d.]+)$/                                    #check markup and markup version
-          if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)(?:[0-9]+)?(?:\.[0-9]+)?(?:\.[0-9]+)?$/         #check markup and markup version
+          if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)(?:(?:[0-9]+?)(?:\.[0-9]+?)(?:\.[0-9]+))?$/     #check markup and markup version
             @markup_version_declared=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([\d.]+)$/)[1]
             sm_a,sm_b,sm_c=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?$/)[1..3]
             sm_c ||=0
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index ef6d86c7..72b1ffc7 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -2757,9 +2757,6 @@ WOK
         ? @rc['db']['postgresql']['port'] \
         : (@defaults[:postgresql_port])
       end
-      def dbi
-        "DBI:Pg:database=#{psql.db};port=#{psql.port}"
-      end
       def password
         ((defined? @rc['db']['postgresql']['password']) \
         && @rc['db']['postgresql']['password']=~/\S+/) \
diff --git a/lib/sisu/v3/cgi.rb b/lib/sisu/v3/cgi.rb
index 7b01ae98..357a4332 100644
--- a/lib/sisu/v3/cgi.rb
+++ b/lib/sisu/v3/cgi.rb
@@ -71,8 +71,6 @@ module  SiSU_CGI
      a=%{
           For help on sisu search, type:
             sisu --help search
-          For help on setting up hyperestraier for sisu, type:
-            sisu --help hyperestraier
     }
         SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey
     end
diff --git a/lib/sisu/v3/cgi_pgsql.rb b/lib/sisu/v3/cgi_pgsql.rb
index 5f23f22d..3821f402 100644
--- a/lib/sisu/v3/cgi_pgsql.rb
+++ b/lib/sisu/v3/cgi_pgsql.rb
@@ -83,7 +83,7 @@ module  SiSU_CGI_pgsql
         else put "WARNING: no postgresql database available, (have you created one?)"
         end
         serve.sort!
-        f1,f2,f3=[],[],[]
+        f1,f2,f3='','',''
         serve.each do |x|
           f1 << %{              <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n} unless x =~/apache|sisu\/image/ #check
         end
diff --git a/lib/sisu/v3/cgi_sqlite.rb b/lib/sisu/v3/cgi_sqlite.rb
index 8d2ff53d..7251c81a 100644
--- a/lib/sisu/v3/cgi_sqlite.rb
+++ b/lib/sisu/v3/cgi_sqlite.rb
@@ -78,7 +78,7 @@ module  SiSU_CGI_sqlite
         end
       end
       serve.sort!
-      f1,f2,f3=[],[],[]
+      f1,f2,f3='','',''
       serve.each do |x|
         f1 << %{              <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n}
       end
diff --git a/lib/sisu/v3/dal_doc_str.rb b/lib/sisu/v3/dal_doc_str.rb
index 6ce77057..09635066 100644
--- a/lib/sisu/v3/dal_doc_str.rb
+++ b/lib/sisu/v3/dal_doc_str.rb
@@ -179,8 +179,10 @@ module SiSU_document_structure_extract
               image=image_test(obj)
               note=endnote_test?(obj)
               obj,tags=extract_tags(obj)
-              h={ bullet_: bullet, indent: indent, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
-              SiSU_document_structure::Object_para.new.paragraph(h)
+              unless obj=~/\A\s*\Z/m
+                h={ bullet_: bullet, indent: indent, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
+                SiSU_document_structure::Object_para.new.paragraph(h)
+              end
             else nil
             end
           when /^[<\[](?:br)?:(?:pa?r|o(?:bj|---)?)[>\]]\s*$/                  #[br:par] #[br:obj]
@@ -193,8 +195,10 @@ module SiSU_document_structure_extract
             image=image_test(t_o)
             note=endnote_test?(t_o)
             obj,tags=extract_tags(t_o)
-            h={ bullet_: false, indent: 0, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
-            SiSU_document_structure::Object_para.new.paragraph(h)
+            unless obj=~/\A\s*\Z/m
+              h={ bullet_: false, indent: 0, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
+              SiSU_document_structure::Object_para.new.paragraph(h)
+            end
           end
         elsif not @@flag['code']
           if t_o =~/^code\{/
@@ -311,8 +315,10 @@ module SiSU_document_structure_extract
             t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h)
             t_o
           else
-            if t_o !~/^table\{/ and not t_o.nil?
-              t_o.gsub!(/\n/m,"#{Mx[:tc_p]}")
+            if t_o !~/^table\{/ \
+            and not t_o.nil?
+              t_o.gsub!(/^\n+/m,'') #check added for ruby 1.9.2 not needed in 1.8 series (tested in v2)
+              t_o.gsub!(/\n+/m,"#{Mx[:tc_p]}")
               @rows += t_o + Mx[:tc_c]
             end
             t_o=nil
@@ -803,7 +809,7 @@ module SiSU_document_structure_extract
       @o_array=[]
       node=ocn=ocn_dv=ocn_sp=ocnh=ocnh1=ocnh2=ocnh3=ocnh4=ocnh5=ocnh6=ocno=ocnp=ocnt=ocnc=ocng=ocni=ocnm=ocnu=ocnk=nm=0 # h heading, o other, t table, g group, i image
       node_count_flag=false
-      regex_exclude_ocn_and_node = /#{Rx[:meta]}|^@\S+?:\s|^4~endnotes|^#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}|^\^~ |<:e[:_]\d+?>|^<:\#|<:- |<[:!]!4|<hr width|#{Mx[:br_endnotes]}/i #ocn here #&nbsp; added with Tune.code #¡
+      regex_exclude_ocn_and_node = /#{Rx[:meta]}|^@\S+?:\s|^4~endnotes|^#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}|^\^~ |<:e[:_]\d+?>|^<:\#|<:- |<[:!]!4|<hr width|#{Mx[:br_endnotes]}|\A\s*\Z/mi #ocn here #&nbsp; added with Tune.code #¡
       parent=node1=node2=node3=node4=node5=node6=nil
       data.each do |dob|
         h={}
diff --git a/lib/sisu/v3/dal_images.rb b/lib/sisu/v3/dal_images.rb
index 0d541a13..8c7e9f94 100644
--- a/lib/sisu/v3/dal_images.rb
+++ b/lib/sisu/v3/dal_images.rb
@@ -92,8 +92,9 @@ module SiSU_images
                   dir=SiSU_Env::Info_env.new(@md.fns)
                   path_image=[dir.path.image_source_include_local,dir.path.image_source_include_remote,dir.path.image_source_include]
                   image_path=nil
-                  path_image.each do |image_path|
-                    break if FileTest.exist?("#{image_path}/#{image}")
+                  path_image.each do |img_pth|
+                    image_path=img_pth
+                    break if FileTest.exist?("#{img_pth}/#{image}")
                   end
                   if FileTest.exist?("#{image_path}/#{image}")
                     if @rmgk
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index d4d0f16d..7cc2a327 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -3647,9 +3647,6 @@ WOK
         ? @rc['db']['postgresql']['port'] \
         : (@defaults[:postgresql_port])
       end
-      def dbi
-        "DBI:Pg:database=#{psql.db};port=#{psql.port}"
-      end
       def password
         ((defined? @rc['db']['postgresql']['password']) \
         && @rc['db']['postgresql']['password']=~/\S+/) \