various fixes: cgi search for, manifest, concordance, diakonos syntax highlghting

* cgi search subtitle and odf link

* manifest and concordance, subtitle and author info

* diakonos syntax highligthing;

2 files changed, 24 insertions, 26 deletions

diff --git a/data/sisu/conf/syntax/README b/data/sisu/conf/syntax/README
index 82d5ff67..9fde1d1e 100644
--- a/data/sisu/conf/syntax/README
+++ b/data/sisu/conf/syntax/README
@@ -3,15 +3,15 @@ This directory
   /usr/share/sisu-examples/sisu-examples/config/syntax_hi
 contains rudimentary sisu syntax highlighting files for:
 
-* (g)vim http://www.vim.org
+* (g)vim <http://www.vim.org>
   * package: sisu-vim
   * status: largely done
   * comments: not found here
     a vim syntax highlighting and folds component of sisu exists,
     see sisu-vim
 
-* gedit http://www.gnome.org/projects/gedit
-* gobby http://gobby.0x539.de/
+* gedit <http://www.gnome.org/projects/gedit>
+* gobby <http://gobby.0x539.de/>
   file: sisu.lang
   place in:
     /usr/share/gtksourceview-1.0/language-specs
@@ -20,7 +20,7 @@ contains rudimentary sisu syntax highlighting files for:
   * status: very basic syntax highlighting
   * comments: this editor features display line wrap and is used by Goby!
 
-* nano http://www.nano-editor.org
+* nano <http://www.nano-editor.org>
   file: nanorc
   save as:
     ~/.nanorc
@@ -30,7 +30,7 @@ contains rudimentary sisu syntax highlighting files for:
     no display line-wrap
     does line breaks
 
-* diakonos (an editor written in ruby) http://purepistos.net/diakonos
+* diakonos (an editor written in ruby) <http://purepistos.net/diakonos>
   file: diakonos.conf
   save as:
     ~/.diakonos/diakonos.conf
@@ -48,22 +48,22 @@ contains rudimentary sisu syntax highlighting files for:
   [settings::configure kate::{highlighting,filetypes}]
   [tools::highlighting::{markup,scripts}::SiSU]
 
-* nedit http://www.nedit.org
+* nedit <http://www.nedit.org>
   file: sisu_nedit.pats
   nedit -import sisu_nedit.pats
   * status: a very clumsy first attempt
   [not really done]
   * comments: this editor features display line wrap
 
-* emacs http://www.gnu.org/software/emacs/emacs.html
+* emacs <http://www.gnu.org/software/emacs/emacs.html>
   files: sisu-mode.el
   to file ~/.emacs add the following 2 lines:
     (add-to-list 'load-path "/usr/share/sisu-examples/config/syntax_hi")
     (require 'sisu-mode.el)
   [not done / not yet included]
 
-* vim & gvim http://www.vim.org
-  files: sisu-vim http://www.jus.uio.no/sisu/SiSU/download
+* vim & gvim <http://www.vim.org>
+  files: sisu-vim <http://www.jus.uio.no/sisu/SiSU/download>
   package is the most comprehensive sisu syntax highlighting and editor
   environment provided to date (is for vim/ gvim, and is separate from the
   contents of this directory)
diff --git a/data/sisu/conf/syntax/diakonos.conf b/data/sisu/conf/syntax/diakonos.conf
index f40547bc..c7fa686b 100644
--- a/data/sisu/conf/syntax/diakonos.conf
+++ b/data/sisu/conf/syntax/diakonos.conf
@@ -931,34 +931,32 @@ lang.sisu.tokens.heading.format yellow bold
 #lang.sisu.tokens.heading.format white inverse
 lang.sisu.tokens.headings.case_insensitive ^(?:Chapter|Part|Section|Book|Article|Preamble|Appendix)\s.*
 lang.sisu.tokens.headings.format white bold
-lang.sisu.tokens.bullet ^_[12]?\*\s+
+lang.sisu.tokens.bullet ^_[1-9]?\*\s+
 lang.sisu.tokens.bullet.format yellow
-lang.sisu.tokens.indent ^_[12]\s+
+lang.sisu.tokens.indent ^_[1-9]\s+
 lang.sisu.tokens.indent.format yellow
-lang.sisu.tokens.link \{.+?\}(?:http:\/\/\S+|image)
-lang.sisu.tokens.link.format yellow
-lang.sisu.tokens.url http:\/\/\S+
+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.line_bold ^!_\s+.*
 lang.sisu.tokens.line_bold.format white bold
-lang.sisu.tokens.font_bold [!*]\{.+?\}[!*]
+lang.sisu.tokens.font_bold (([!*])\{.+?\}\2)
 lang.sisu.tokens.font_bold.format white bold
-lang.sisu.tokens.font_modify [/_+-^,]\{.+?\}[/_+-^,]
+lang.sisu.tokens.font_modify (([/_^,+-])\{.+?\}\2)
 lang.sisu.tokens.font_modify.format brown
 lang.sisu.tokens.page_break <:(?:pb|np)>
 lang.sisu.tokens.page_break.format white bold inverse
-lang.sisu.tokens.br <(?:\/\s*)?br>
+lang.sisu.tokens.br <:?br>
 lang.sisu.tokens.br.format white bold inverse
 lang.sisu.tokens.endnote_mark ~\^(?:\s|$)
 lang.sisu.tokens.endnote_mark.format green
 lang.sisu.tokens.endnote_content ^\^~\s.+
 lang.sisu.tokens.endnote_content.format green
-
-lang.sisu.tokens.endnote.open ~\{
-lang.sisu.tokens.endnote.close \}~
-lang.sisu.tokens.endnote.format green
-#lang.sisu.tokens.endnotes ~\{.+?\}~
-#lang.sisu.tokens.endnotes.format green
+#lang.sisu.tokens.endnote.open ~\{
+#lang.sisu.tokens.endnote.close \}~
+lang.sisu.tokens.endnotes ~\{.+?\}~
+lang.sisu.tokens.endnotes.format green
 lang.sisu.tokens.group.open ^group\{
 lang.sisu.tokens.group.close ^\}group
 lang.sisu.tokens.group.format green
@@ -968,9 +966,9 @@ lang.sisu.tokens.poem.format green
 lang.sisu.tokens.code.open ^code\{
 lang.sisu.tokens.code.close ^\}code
 lang.sisu.tokens.code.format green
-
-lang.sisu.tokens.error [a-zA-Z0-9,.::?!&]+http:\/\/\S+
-lang.sisu.tokens.error.format magenta
+lang.sisu.tokens.error \s+$|<\S{2}\S+?>|[a-zA-Z0-9,.::?!&><]+http://\S+|http://\S+<
+#lang.sisu.tokens.error \s+$|<\S+?>|[a-zA-Z0-9,.::?!&><]+http://\S+|http://\S+<
+lang.sisu.tokens.error.format magenta reverse
 
 # Custom configuration files can be included.
 # If a setting is specified again, it overrides the previous setting given