aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2008-05-27 18:50:20 -0400
committerRalph Amissah <ralph@amissah.com>2008-05-27 18:50:20 -0400
commitac3f653ed16960283c1f2e840cde6f710facd80c (patch)
treec62970babfc1865d4b2812ee51f68508151ea2f2
parentcannot install kate directory, kde::kate install is optional (diff)
parentsyntax highlighting minor adjustments (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG17
-rw-r--r--data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf1
-rw-r--r--data/sisu/conf/editor-syntax-etc/gedit/sisu.lang8
-rw-r--r--data/sisu/conf/editor-syntax-etc/kate/sisu.xml2
-rw-r--r--data/sisu/conf/editor-syntax-etc/nano/nanorc1
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml14
6 files changed, 31 insertions, 12 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 912699c8..27e39822 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,22 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% 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
+
+ * syntax highlighting minor updates: nano; diakonos; kate
+ [todo: gedit]
+
+ * 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
- sisu_0.67.0.orig.tar.gz
- sisu_0.67.0-1.dsc
- sisu_0.67.0-1.diff.gz
+ a543f310b8452b5d7477f1491d6d0510efd0293408dfa3fe2697ae586bbc98aa 1498054 sisu_0.67.0.orig.tar.gz
+ 759277657882aee6b02f8c0956e9d848fbeb4ac3b41345a2d1d3bcbaa1289aec 1151 sisu_0.67.0-1.dsc
+ e688b0b1dc0b51c742f4e5d0274969172e8975793c4aa95d9ff15bef474117ac 146427 sisu_0.67.0-1.diff.gz
* composite document, simplify syntax for importation of external files,
syntax change (minor), automatic version bump, document samples modified
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/kate/sisu.xml b/data/sisu/conf/editor-syntax-etc/kate/sisu.xml
index 61135285..a8054f2d 100644
--- a/data/sisu/conf/editor-syntax-etc/kate/sisu.xml
+++ b/data/sisu/conf/editor-syntax-etc/kate/sisu.xml
@@ -16,6 +16,8 @@
<RegExpr String="&lt;/a&gt;" attribute="Warn" context="#pop" />
<RegExpr String="&lt;https?:\/\/\S+&gt;" attribute="Warn" context="#pop"/>
<RegExpr String="&gt;https?:\/\/\S+" attribute="Warn" context="#pop"/>
+ <RegExpr String="^&lt;&lt;\s+[a-zA-Z._]+\.ss[it]" attribute="Link" context="#pop"/>
+ <RegExpr String="^&lt;&lt;\{\s*[a-zA-Z._]+\.ss[it]\s*\}" attribute="Link" context="#pop"/>
<RegExpr String="&lt;&lt;\s+&#124;" attribute="Link" context="#pop"/>
<RegExpr String="https?:\/\/\S+&lt;" attribute="Warn" context="#pop"/>
<keyword attribute="Keyword" context="#stay" String="somename" />
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