Merge branch 'upstream' into debian/sid

7 files changed, 86 insertions, 52 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index f0116acc..ec38ba0f 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,11 +12,36 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.4.3.orig.tar.gz (2010-06-05:22/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
+  sisu_2.4.3.orig.tar.gz
+  sisu_2.4.3-1.dsc
+  sisu_2.4.3-1.diff.gz
+
+  * vim/ftplugin/sisu.vim make less intrusive (both for sisu v2 & v1), includes
+    the following:
+    * <leader>ls  dir files placed in vertically split window (also <leader>dir)
+    * <leader>rd  search and replace down (in file)
+    * <leader>rg  search and replace globally (in file)
+    * <leader>rr  search and replace using ruby gsub (global search and replace)
+    Note: <leader>rf not used, ambiguous (replace forward or replace in file?)
+    * remove language and spelling american english, can't have a fixed default
+    * remove <CTRL>G (search and replace) binding
+    * remove <CTRL>F for fold file removed, use still available :F instead
+    as before includes:
+    * statusline
+    * change to the directory the file in your current buffer is in
+    * wrap at textwrap width
+    * cursor jumps a line at a time within wrapped text
+    * ^J paragraph formatting break line on 'textwidth'
+    * :F folds on fold patterns for sisu markup (and foldsearch which opens
+      result of search all else closed)
+
 %% 2.4.2.orig.tar.gz (2010-06-01:22/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
-  sisu_2.4.2.orig.tar.gz
-  sisu_2.4.2-1.dsc
-  sisu_2.4.2-1.diff.gz
+  d5267635ecc99c41b0868ea2eee78b46a9142b76b45608ebe89eff13e3cf291a 2766741 sisu_2.4.2.orig.tar.gz
+  b9d161be07f01a42aa87ae4ca5a36309e99c52e6d76d092b0e15345674e23dad 1145 sisu_2.4.2-1.dsc
+  cec64e14e07296478f3077e2b6d3ccc52aac038bbb8d87cc1fd7cabc0453a961 276179 sisu_2.4.2-1.diff.gz
 
   * texpdf, polyglossia (xelatex) (start using, instead of babel)
 
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 31eed5cd..8446c9e5 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 2.4.2
-:date_stamp: 2010w22/2
-:date: "2010-06-01"
+:version: 2.4.3
+:date_stamp: 2010w22/6
+:date: "2010-06-05"
 :project: SiSU
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index b415ea09..8e272e77 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,36 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.4.3.orig.tar.gz (2010-06-05:22/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
+  sisu_2.4.3.orig.tar.gz
+  sisu_2.4.3-1.dsc
+  sisu_2.4.3-1.diff.gz
+
+  * vim/ftplugin/sisu.vim make less intrusive (both for sisu v2 & v1), includes
+    the following:
+    * <leader>ls  dir files placed in vertically split window (also <leader>dir)
+    * <leader>rd  search and replace down (in file)
+    * <leader>rg  search and replace globally (in file)
+    * <leader>rr  search and replace using ruby gsub (global search and replace)
+    Note: <leader>rf not used, ambiguous (replace forward or replace in file?)
+    * remove language and spelling american english, can't have a fixed default
+    * remove <CTRL>G (search and replace) binding
+    * remove <CTRL>F for fold file removed, use still available :F instead
+    as before includes:
+    * statusline
+    * change to the directory the file in your current buffer is in
+    * wrap at textwrap width
+    * cursor jumps a line at a time within wrapped text
+    * ^J paragraph formatting break line on 'textwidth'
+    * :F folds on fold patterns for sisu markup (and foldsearch which opens
+      result of search all else closed)
+
 %% 2.4.2.orig.tar.gz (2010-06-01:22/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
-  sisu_2.4.2.orig.tar.gz
-  sisu_2.4.2-1.dsc
-  sisu_2.4.2-1.diff.gz
+  d5267635ecc99c41b0868ea2eee78b46a9142b76b45608ebe89eff13e3cf291a 2766741 sisu_2.4.2.orig.tar.gz
+  b9d161be07f01a42aa87ae4ca5a36309e99c52e6d76d092b0e15345674e23dad 1145 sisu_2.4.2-1.dsc
+  cec64e14e07296478f3077e2b6d3ccc52aac038bbb8d87cc1fd7cabc0453a961 276179 sisu_2.4.2-1.diff.gz
 
   * texpdf, polyglossia (xelatex) (start using, instead of babel)
 
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 5928c133..bb0558d2 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
@@ -55,7 +55,7 @@
 
 3~source- Source (tarball tar.gz)
 
-_* {~^ sisu_2.4.2.orig.tar.gz (2010-06-01:22/2) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
+_* {~^ sisu_2.4.3.orig.tar.gz (2010-06-05:22/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.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.4.2.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
+{~^ sisu_2.4.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
 
-{~^ sisu_2.4.2-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2-1.diff.gz
+{~^ sisu_2.4.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3-1.diff.gz
 
-{~^ sisu_2.4.2-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2-1.dsc
+{~^ sisu_2.4.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3-1.dsc
 
 }group
 
@@ -114,15 +114,15 @@ group{
 
 *{Debs}*
 
-{~^ sisu_2.4.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.4.2-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.4.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.4.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-complete_2.4.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.4.2-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.4.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.4.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-pdf_2.4.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.4.2-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.4.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.4.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-postgresql_2.4.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.4.2-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.4.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.4.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-sqlite_2.4.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.4.2-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.4.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.4.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 }~
 
 }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.4.2-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.4.2-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.4.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.4.3-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/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 314dd7d2..74296412 100644
--- a/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -1,14 +1,10 @@
 "%% SiSU Vim ftplugin
 " SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup:     SiSU (sisu-0.38)
+" SiSU Markup:     SiSU (sisu-1.0) 2010-06-05
 " an ftplugin setting defaults for editing sisu markup files
 :syntax on
 :filetype on
 :filetype indent on
-":let dialect='UK'
-:if version >= 700
-:  setlocal spell spelllang=en_us
-:endif
 :autocmd FileType sisu :set nonumber
 :set encoding=utf-8 fileencodings=
 :set ff=unix
@@ -55,11 +51,8 @@
 :  cmap q qa
 :endif
 "% directory files, placed in vertical split window
-:map <leader>dir :vs<cr><C-W><C-R> :Explore<cr>
-:map <leader>nn :set nonumber paste<cr>
-:map <leader>nu :set number paste<cr>
-:map <leader>no :set number nopaste<cr>
-"% vimdiff q exits
+:map <leader>ls :vs<cr> :Explore<cr>
+:map <leader>dir :vs<cr> :Explore<cr>
 :if &diff
 :  cmap q qa
 :endif
@@ -77,9 +70,9 @@
 "% colorscheme slate
 :map <C-C> :syntax on <cr> :colorscheme slate<cr>
 "% search and replace
-:map <C-@> :.,$s///c "search and replace down
-:map <c-G> :%s///c "search and replace whole file
-:map <c-X> :rubyd gsub!(//,"")
+:map <leader>rd :.,$s///c "search and replace down
+:map <leader>rg :%s///c "search and replace whole file
+:map <leader>rr :rubyd gsub!(//,"")
 "% pwd t64 working directory set to that of the file you're editing
 "changes pwd to directory of file in current buffer
 :function! CHANGE_CURR_DIR()
@@ -108,7 +101,6 @@
 "%% SiSU vim folds
 "% foldsearchx FoldSearch (opens result of search all else closed) t77
 :map fs :set foldmethod=expr foldcolumn=2 foldlevel=0 <cr>
-:map <C-F> :F<cr>  "consider, is a remapping
 :map <leader>ff :F<cr>
 :map <leader>fe :F<cr> zE
 "% foldtoggle Fold Toggle mapped to <space>
@@ -186,5 +178,5 @@
 "% cursorline
 :highlight CursorLine guibg=black ctermbg=black
 :highlight CursorColumn guibg=black ctermbg=black
-map <leader>cu- :set nocursorline nocursorcolumn<cr>
-map <leader>cu+ :set cursorline cursorcolumn<cr>
+:map <leader>cu- :set nocursorline nocursorcolumn<cr>
+:map <leader>cu+ :set cursorline cursorcolumn<cr>
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 314dd7d2..160444fd 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -1,14 +1,10 @@
 "%% SiSU Vim ftplugin
 " SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup:     SiSU (sisu-0.38)
+" SiSU Markup:     SiSU (sisu-2.0) 2010-06-05
 " an ftplugin setting defaults for editing sisu markup files
 :syntax on
 :filetype on
 :filetype indent on
-":let dialect='UK'
-:if version >= 700
-:  setlocal spell spelllang=en_us
-:endif
 :autocmd FileType sisu :set nonumber
 :set encoding=utf-8 fileencodings=
 :set ff=unix
@@ -55,11 +51,8 @@
 :  cmap q qa
 :endif
 "% directory files, placed in vertical split window
-:map <leader>dir :vs<cr><C-W><C-R> :Explore<cr>
-:map <leader>nn :set nonumber paste<cr>
-:map <leader>nu :set number paste<cr>
-:map <leader>no :set number nopaste<cr>
-"% vimdiff q exits
+:map <leader>ls :vs<cr> :Explore<cr>
+:map <leader>dir :vs<cr> :Explore<cr>
 :if &diff
 :  cmap q qa
 :endif
@@ -77,9 +70,9 @@
 "% colorscheme slate
 :map <C-C> :syntax on <cr> :colorscheme slate<cr>
 "% search and replace
-:map <C-@> :.,$s///c "search and replace down
-:map <c-G> :%s///c "search and replace whole file
-:map <c-X> :rubyd gsub!(//,"")
+:map <leader>rd :.,$s///c "search and replace down
+:map <leader>rg :%s///c "search and replace whole file
+:map <leader>rr :rubyd gsub!(//,"")
 "% pwd t64 working directory set to that of the file you're editing
 "changes pwd to directory of file in current buffer
 :function! CHANGE_CURR_DIR()
@@ -108,7 +101,6 @@
 "%% SiSU vim folds
 "% foldsearchx FoldSearch (opens result of search all else closed) t77
 :map fs :set foldmethod=expr foldcolumn=2 foldlevel=0 <cr>
-:map <C-F> :F<cr>  "consider, is a remapping
 :map <leader>ff :F<cr>
 :map <leader>fe :F<cr> zE
 "% foldtoggle Fold Toggle mapped to <space>
@@ -186,5 +178,5 @@
 "% cursorline
 :highlight CursorLine guibg=black ctermbg=black
 :highlight CursorColumn guibg=black ctermbg=black
-map <leader>cu- :set nocursorline nocursorcolumn<cr>
-map <leader>cu+ :set cursorline cursorcolumn<cr>
+:map <leader>cu- :set nocursorline nocursorcolumn<cr>
+:map <leader>cu+ :set cursorline cursorcolumn<cr>
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 40c050ee..c0d30b89 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -119,7 +119,7 @@ syn region  sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin"
 "Errors:
 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_wspace contains=sisu_error_wspace "\s\+$"
 syn match sisu_error contains=sisu_error_wspace "\t\+"
 syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+"
 syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]"