Merge branch 'upstream' into debian/sid

3 files changed, 55 insertions, 10 deletions

diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index ca439395..743786b4 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,56 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.7.8.orig.tar.gz (2010-10-25:43/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
+  sisu_2.7.8.orig.tar.gz
+  sisu_2.7.8-1.dsc
+  sisu_2.7.8-1.diff.gz
+
+  [debian freeze, fix]
+
+  * i18n, introduce header @make: :language: internationalization using codes
+    from http://www.debian.org/international/l10n/po/ at this time for texpdf,
+    (able to satify needs of polyglossia for the likes of Brazilian Portugues)
+    and in future for po files, where iso:639 for this purpose appears to have
+    use limitations http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+    * param, extract @make: :language: information if provided, default
+      "english"
+    * i18n, add code list and associated language (as listed by polyglossia)
+    * texpdf_format, use param (@make: :language: (default english)), to set
+      tex document language header (previously used file naming convention)
+    * sisu.vim recognize @make: :language:
+      (also elsewhere shortened :lang_code: from :language_code:)
+
+  * internal links
+    * dal, exclude parentheses and square brackets from matching
+      (requested fix, Ben Armstrong)
+    * html, remove space between link & following punctuation, parentheses &/or
+      square brackets
+      (requested fix, Ben Armstrong)
+    * epub, remove space between link & following punctuation, parentheses &/or
+      square brackets
+
+  * html
+    * remove "copy @" mark
+      (requested, Daniel Baumann)
+    * segments, title banner (including "copy @" mark) configurable, boolean,
+      true/false (default false)
+      (requested off option, Daniel Baumann)
+    * quick ref links_guide configurable, boolean, true/false (default false)
+      (requested off option, Daniel Baumann)
+
+  * config.yml
+    * html, seg title banner, boolean true/false setting (commented out,
+      default false)
+    * html, quick_ref, boolean true/false setting (commented out, default
+      false)
+
 %% 2.7.7.orig.tar.gz (2010-10-17:41/7)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
-  sisu_2.7.7.orig.tar.gz
-  sisu_2.7.7-1.dsc
-  sisu_2.7.7-1.diff.gz
+  0a9befa48e6cfd62ecd7ee25febe1c4e1dc3f54eed8d89042f8d3519d3fff345 2747742 sisu_2.7.7.orig.tar.gz
+  e8f3c1f8a546fa5ff58a1e14e6e4b9288b4ef1c549f018539bcc88a7f58f3c7f 1196 sisu_2.7.7-1.dsc
+  6ff81e70249e8f0a08897c99729b885969e5266135bd3a3f3ea506ab06d27936 288701 sisu_2.7.7-1.diff.gz
 
   [debian freeze, fix]
 
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 334d058c..2071fa5c 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.6.2, 2010-07-10)
+"SiSU Markup:     SiSU (sisu-2.6.8, 2010-10-25)
 "(originally looked at Ruby Vim by Mirko Nasato)
 
 if version < 600
@@ -28,13 +28,13 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_require             contains=@NoSpell                  "^<<\s*[a-zA-Z0-9^._-]\+\.ss[it]$"
   syn match   sisu_require             contains=@NoSpell                  "^<<{[a-zA-Z0-9^._-]\+\.ss[it]}$"
   syn match   sisu_structure                                              "^:A\~$"
-  syn match   sisu_sub_header_title                                       "^\s\+:\(subtitle\|short\|edition\|language\|language_char\|note\):\s" "group=sisu_header_content
+  syn match   sisu_sub_header_title                                       "^\s\+:\(subtitle\|short\|edition\|language\|lang_char\|note\):\s" "group=sisu_header_content
   syn match   sisu_sub_header_creator                                     "^\s\+:\(author\|contributor\|illustrator\|photographer\|translator\|digitized_by\|prepared_by\|audio\|video\):\s"                               " &hon &institution
   syn match   sisu_sub_header_rights                                      "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|preparation\|digitization\|audio\|video\|license\|all\):\s"                   " access_rights license
   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\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s"
+  syn match   sisu_sub_header_original                                    "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
+  syn match   sisu_sub_header_make                                        "^\s\+:\(headings\|num_top\|breaks\|language\|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]"
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 48cd5d90..58135bb9 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.7.7
-:date_stamp: 2010w41/7
-:date: "2010-10-17"
+:version: 2.7.8
+:date_stamp: 2010w43/1
+:date: "2010-10-25"
 :project: SiSU