Merge branch 'upstream' into debian/sid

3 files changed, 48 insertions, 21 deletions

diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 1c0343db..d6c2c6ba 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,38 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.3.2.orig.tar.gz (2010-05-03:18/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
+  sisu_2.3.2.orig.tar.gz
+  sisu_2.3.2-1.dsc
+  sisu_2.3.2-1.diff.gz
+
+  * dal, markup, In cases where the line is interpreted as level 1~ (either by
+    explicit 1~ tag or @make: :heading:) a hash (#) [octothorpe] will be
+    auto-incremented, markup e.g. "1~ Chapter #: My Way".
+
+  * markup for *{emphasis}* configurable as being displayed as bold, italics or
+    underscore, the default is that emphasis output is in bold so there is no
+    change unless configured, either in sisurc.yml (default: emphasis: 'bold'),
+    or the markup source document header @make: :emphasis: 'bold' [requested]
+
+  * plaintext, wrap width configurable between 20 to 200 characters, the
+    default width being 78, configuration eithe rin sisurc.yml (default: text_wrap:
+    78), or the markup source document header (@make: :plaintext_wrap: 78)
+
+  * param_identify_markup, identify version 2 markup
+
+  * manifest, info, expand on description of book indexes when available
+
+  * screen output, reduce verbosity unless -v or other such option used
+
+  * dal_numbering, number headings, a fix
+
 %% 2.3.1.orig.tar.gz (2010-04-28:17/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
-  sisu_2.3.1.orig.tar.gz
-  sisu_2.3.1-1.dsc
-  sisu_2.3.1-1.diff.gz
+  03a9912a475a634e4e18024a508c64c67b60337cf0edeab01b96f3d54bc96e4a 2751600 sisu_2.3.1.orig.tar.gz
+  475643cc77b3bef83cbeebdb8282240396805c328d2c6b48411555861d9d09e8 1145 sisu_2.3.1-1.dsc
+  d7f3fbcabb89a0c97347c5174677d5bba7afdedf06f8a56f5ffd47dbe594c27a 276069 sisu_2.3.1-1.diff.gz
 
   * param, for topic_register, an additional check required, bug fix, repost
 
@@ -64,7 +91,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
   * switch markup for emphasis and bold, now: *{emphasis}* and !{bold}! which
     is consistent with !_ declaring a line to be bold, the default is that
     emphasis output is in bold so there is no change at present, at some time in
-    the future it is intended that it be possible to configure emphais aoutput
+    the future it is intended that it be possible to configure emphasis output
     alternatively to be in italics [requested]
 
 %% 2.2.0.orig.tar.gz (2010-04-20:16/2)
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 8423dff8..d6cbdd7d 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-04-28
+ :modified: 2010-05-03
 
 @make:
  :num_top: 1
@@ -55,9 +55,9 @@
 
 3~source- Source (tarball tar.gz)
 
-_* {~^ sisu_2.3.1.orig.tar.gz (2010-04-28:17/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
+_* {~^ sisu_2.3.2.orig.tar.gz (2010-05-03:18/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
 
-_* {~^ sisu-markup-samples_2.0.2.orig.tar.gz (of 2010-04-27:17/2 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.2.orig.tar.gz *~sisu-markup-samples
+_* {~^ 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
 
 For installation notes see http://sisudoc.org/sisu/sisu_manual/installation.html
 
@@ -102,11 +102,11 @@ group{
 
 *{Source}*
 
-{~^ sisu_2.3.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
+{~^ sisu_2.3.2.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
 
-{~^ sisu_2.3.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1-1.diff.gz
+{~^ sisu_2.3.2-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2-1.diff.gz
 
-{~^ sisu_2.3.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1-1.dsc
+{~^ sisu_2.3.2-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2-1.dsc
 
 }group
 
@@ -114,15 +114,15 @@ group{
 
 *{Debs}*
 
-{~^ sisu_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.1-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.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.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-complete_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.1-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.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.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-pdf_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.1-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.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.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-postgresql_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.1-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.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.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-sqlite_2.3.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.1-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.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.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 }~
 
 }group
 
@@ -136,9 +136,9 @@ _1 http://www.jus.uio.no/sisu/sisu_changelog/changelog.html
 
 Book markup samples have been moved to non-free as the substantive text of the documents are available under the author or original publisher's license, and usually do not comply with the Debian Free Software Guidelines.
 
-_* {~^ sisu-markup-samples_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.2-1_all.deb ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
+_* {~^ sisu-markup-samples_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.3-1_all.deb ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
 
-_* {~^ sisu-markup-samples_2.0.2-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.2-1.dsc ~{ <br>sisu-markup-samples_2.0.2-1.dsc }~
+_* {~^ sisu-markup-samples_2.0.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.3-1.dsc ~{ <br>sisu-markup-samples_2.0.3-1.dsc }~
 
 For changelogs see:
 
@@ -152,9 +152,9 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
 
 sudo rpm -i [package name]
 
-_* {~^ sisu-2.3.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.1-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.3.2-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.2-2.noarch.rpm ~{ <br>created using alien }~
 
-_* {~^ sisu-markup-samples_2.0.2.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_2.0.2.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.2-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
+_* {~^ 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 }~
 
 For changelogs see:
 
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 dc962b3b..d2f2d94b 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
@@ -1,6 +1,6 @@
 "SiSU Vim syntax file
 "SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-"SiSU Markup:     SiSU (sisu-2.0.2, 2010-04-26)
+"SiSU Markup:     SiSU (sisu-2.3.2, 2010-05-01)
 "(originally looked at Ruby Vim by Mirko Nasato)
 
 if version < 600
@@ -34,7 +34,7 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_sub_header_classify                                    "^\s\+:\(topic_register\|coverage\|format\|identifier\|keywords\|relation\|subject\|type\|dewey\|loc\|oclc\|pg\|isbn\):\s"
   syn match   sisu_sub_header_dates                                       "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
   syn match   sisu_sub_header_original                                    "^\s\+:\(publisher\|date\|language\|language_char\|institution\|nationality\|source\):\s"
-  syn match   sisu_sub_header_make                                        "^\s\+:\(headings\|num_top\|breaks\|italics\|bold\|skin\|stamp\|promo\|ad\|manpage\):\s"
+  syn match   sisu_sub_header_make                                        "^\s\+:\(headings\|num_top\|breaks\|italics\|bold\|emphasis\|plaintext_wrap\|skin\|stamp\|promo\|ad\|manpage\):\s"
   syn match   sisu_sub_header_notes                                       "^\s\+:\(abstract\comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s"
   syn match   sisu_sem_marker                                             ";{\|};[a-z._]*[a-z]"
   syn match   sisu_sem_marker_block                                       "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]"