aboutsummaryrefslogtreecommitdiffhomepage
path: root/data
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-06-11 22:06:53 -0400
committerRalph Amissah <ralph@amissah.com>2010-06-11 22:06:53 -0400
commite4932393ec8cce24b7d3390d08a3dc0b5296c261 (patch)
treec3fc610766a7d211460a5ffba338f05e540605c7 /data
parentdebian/changelog (2.4.3-1) (diff)
parentdebian/changelog (2.5.0-1) (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'data')
-rw-r--r--data/doc/sisu/v2/CHANGELOG29
-rw-r--r--data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi22
-rw-r--r--data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim4
3 files changed, 39 insertions, 16 deletions
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 8e272e77..489572c4 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,34 @@ Reverse Chronological:
%% Development branch UNSTABLE
+%% 2.5.0.orig.tar.gz (2010-06-11:23/5)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
+ sisu_2.5.0.orig.tar.gz
+ sisu_2.5.0-1.dsc
+ sisu_2.5.0-1.diff.gz
+
+ * texpdf, font selection permitted in sisurc.yml (default: texpdf_font:) or
+ document header (@make: :texpdf_font:)
+
+ NOTE: this is a small addition, but texpdf requires that Liberation fonts be
+ installed as 'Liberation Sans' is now the default, and thus can cause
+ breakage unless this is installed, hence the version bump. This is taken care
+ of in the debian package by depending on ttf-liberation
+
+ * vim syntax (sisu.vim) updated to match @make: :texpdf_font:
+
+ * param, fix breakage on malformed sisu identifier (top header line)
+
+ * tables: blank lines (use tilde to indicate); allow line breaks
+
+ * css for html, make right pane when used darker to distinguish from selected
+ content
+
%% 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
+ bf0e596113b60b873efc738ec2a9ab9a7b2d0687cd7011d27700331faab4e2c5 2767084 sisu_2.4.3.orig.tar.gz
+ 01784bc068f91858534f157a024d4ca723e4afb0161c50cf3a42ab0cbaeef889 1145 sisu_2.4.3-1.dsc
+ 00f039ec6fd246b2320565003ecd4ab255c28d4a9f43deb62170e10e6a3630e6 276235 sisu_2.4.3-1.diff.gz
* vim/ftplugin/sisu.vim make less intrusive (both for sisu v2 & v1), includes
the following:
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 bb0558d2..c2186adc 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-06-01
+ :modified: 2010-06-11
@make:
:num_top: 1
@@ -55,7 +55,7 @@
3~source- Source (tarball 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_2.5.0.orig.tar.gz (2010-06-11:23/5) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.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.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
+{~^ sisu_2.5.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.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.5.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0-1.diff.gz
-{~^ sisu_2.4.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3-1.dsc
+{~^ sisu_2.5.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0-1.dsc
}group
@@ -114,15 +114,15 @@ group{
*{Debs}*
-{~^ 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_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.5.0-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.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-complete_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.5.0-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.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-pdf_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.5.0-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.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-postgresql_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.5.0-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.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 }~
+{~^ sisu-sqlite_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.5.0-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.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.4.3-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.5.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.5.0-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/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
index c0d30b89..cba13164 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.3.6, 2010-05-24)
+"SiSU Markup: SiSU (sisu-2.5.0, 2010-06-11)
"(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\|emphasis\|plaintext_wrap\|skin\|stamp\|promo\|ad\|manpage\):\s"
+ syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|italics\|bold\|emphasis\|plaintext_wrap\|texpdf_font\|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]"