diff options
| author | Ralph Amissah <ralph@amissah.com> | 2008-05-27 18:50:20 -0400 | 
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2008-05-27 18:50:20 -0400 | 
| commit | ac3f653ed16960283c1f2e840cde6f710facd80c (patch) | |
| tree | c62970babfc1865d4b2812ee51f68508151ea2f2 /data | |
| parent | cannot install kate directory, kde::kate install is optional (diff) | |
| parent | syntax highlighting minor adjustments (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'data')
5 files changed, 17 insertions, 9 deletions
| 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>^<<\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="</a>" attribute="Warn" context="#pop" />        <RegExpr String="<https?:\/\/\S+>" attribute="Warn" context="#pop"/>        <RegExpr String=">https?:\/\/\S+" attribute="Warn" context="#pop"/> +      <RegExpr String="^<<\s+[a-zA-Z._]+\.ss[it]" attribute="Link" context="#pop"/> +      <RegExpr String="^<<\{\s*[a-zA-Z._]+\.ss[it]\s*\}" attribute="Link" context="#pop"/>        <RegExpr String="<<\s+|" attribute="Link" context="#pop"/>        <RegExpr String="https?:\/\/\S+<" 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 | 
