syntax highlighting minor adjustments

5 files changed, 19 insertions, 12 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c76b7681..27e39822 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,15 +9,16 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.67.1.orig.tar.gz (2008-05-25:20/7)
+%% sisu_0.67.1.orig.tar.gz (2008-05-27:21/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.1.orig.tar.gz
   sisu_0.67.1.orig.tar.gz
   sisu_0.67.1-1.dsc
   sisu_0.67.1-1.diff.gz
 
-  * kate syntax highlighting, update
+  * syntax highlighting minor updates: nano; diakonos; kate
+    [todo: gedit]
 
-  * debian/sisu.install, place kate syntax highlighter for use
+  * debian/vim-addon-manager, fix vim-sisu.yaml (closes: #464824)
 
 %% sisu_0.67.0.orig.tar.gz (2008-05-22:20/4)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0.orig.tar.gz
diff --git a/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf b/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
index cc7c4566..025fec07 100644
--- a/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
+++ b/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
@@ -939,6 +939,7 @@ lang.sisu.tokens.link \{.+?\}(?:https?://\S+|\.\./\S+|image)
 lang.sisu.tokens.link.format cyan
 lang.sisu.tokens.url http://\S+
 lang.sisu.tokens.url.format blue bold
+lang.sisu.tokens.url ^\<\<\s+\S+?\.ss[it]$
 lang.sisu.tokens.line_bold ^!_\s+.*
 lang.sisu.tokens.line_bold.format white bold
 lang.sisu.tokens.font_bold (([!*])\{.+?\}\2)
diff --git a/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang b/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang
index 460160dc..b82d5f80 100644
--- a/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang
+++ b/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang
@@ -13,7 +13,7 @@ or:
   </syntax-item>
 
   <pattern-item _name="Bold" style="Keyword" end-at-line-end = "TRUE">
-    <regex>^(:[A-C]|[1-6])~[ a-Z0-9,.;:!?"'\/()-]+</regex>
+    <regex>^(:[A-C]|[1-6])~[a-zA-Z0-9.?_-]*\s+.+</regex>
   </pattern-item>
 
   <pattern-item _name="Operators" style="Function">
@@ -78,7 +78,11 @@ or:
   </pattern-item>
 
   <pattern-item _name="Url" style="String">
-    <regex>\bhttps?:\/\/\S+</regex>
+    <regex>http[s]*:\/\/\S+</regex>
+  </pattern-item>
+
+  <pattern-item _name="Url" style="String">
+    <regex>^&lt;&lt;\s+\S+\.ss[ti]</regex>
   </pattern-item>
 
   <line-comment _name="Line Comment" style="Comment">
diff --git a/data/sisu/conf/editor-syntax-etc/nano/nanorc b/data/sisu/conf/editor-syntax-etc/nano/nanorc
index 213a0c26..30ba439c 100644
--- a/data/sisu/conf/editor-syntax-etc/nano/nanorc
+++ b/data/sisu/conf/editor-syntax-etc/nano/nanorc
@@ -192,6 +192,7 @@ color green "^\^~\s.+"
 #color green start="~\{" end="\}~"
 color yellow "\{.+?\}http:\/\/\S+"
 color brightblue "http:\/\/\S+"
+color brightblue "^<<\s\S+?\.ss[it]"
 color yellow "^(_[12]?\*|_[12])"
 color magenta "^%+\s+.*"
 color green start="^poem\{$" end="^\}poem$"
diff --git a/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml b/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml
index 21e85636..ca665bc8 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml
+++ b/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml
@@ -1,7 +1,7 @@
-  #debian vim-addon-manager
-  addon: sisu
-  description: "SiSU documents - structuring, publishing in multiple formats and search
-  basedir: /usr/share/vim-scripts/
-  files:
-    - ftplugin/sisu.vim
-    - syntax/sisu.vim
+#vim-addons: debian vim-addon-manager
+addon: sisu
+description: SiSU documents - structuring, publishing in multiple formats and search
+basedir: /usr/share/vim-scripts/
+files:
+  - ftplugin/sisu.vim
+  - syntax/sisu.vim