From 214c1b729158084c51ff2caefe6fcb26271f02f3 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 11 Jul 2007 16:48:06 +0100
Subject: 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;
---
 data/sisu/conf/syntax/diakonos.conf | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'data/sisu/conf/syntax/diakonos.conf')

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
-- 
cgit v1.2.3