diff --git a/lib/highlight.tcl b/lib/highlight.tcl index 8367fa2..e288735 100644 --- a/lib/highlight.tcl +++ b/lib/highlight.tcl @@ -148,12 +148,14 @@ namespace eval Highlight {} { proc INI {txt} { ctext::addHighlightClassForRegexp $txt qoute #b84a0c {("|'|`).*?("|'|`)} ctext::addHighlightClassForRegexp $txt flags orange {\s-[a-zA-Z]+} - ctext::addHighlightClassForRegexp $txt stackControl #4471ca {^(\s*?)\[[\.a-zA-Z0-9\_\-\[\]]+\]} + ctext::addHighlightClassForRegexp $txt stackControl #4471ca {^(\s*?)\[[\.a-zA-Z0-9\_\-\[\]\s\.:]+\]} ctext::addHighlightClassForSpecialChars $txt brackets green {[]{}()} ctext::addHighlightClassForRegexp $txt dog #0082ff {(@)[\.a-zA-Z0-9\_\-\[\]]+} - ctext::addHighlightClassForRegexp $txt colors #68ceff {(#)[^\n\r]*} - ctext::addHighlightClassForRegexp $txt keyword #19a2a6 {^(\s*?)[a-zA-Z0-9\_\-]+(\s*?=)} + ctext::addHighlightClassForRegexp $txt colors #68ceff {(#)[\w]+?} + ctext::addHighlightClassForRegexp $txt keyword #19a2a6 {^(\s*?).+(\s*?=)} ctext::addHighlightClassForSpecialChars $txt equal #0082ff {=} + ctext::addHighlightClassForRegexp $txt colors #68ceff {(#)(\w)+?(\s|$)} + ctext::addHighlightClassForRegexp $txt comments #666666 {(#|\s+;)[^\n\r]*} } proc DESKTOP {txt} { @@ -170,7 +172,7 @@ namespace eval Highlight {} { ctext::addHighlightClassForRegexp $txt keyword #68ceff {^(\s*?)[a-zA-Z0-9\_\-]+(\s*?:)} ctext::addHighlightClassForSpecialChars $txt equal #0082ff {=} ctext::addHighlightClassForRegexp $txt changelog lightgreen {^(\s*?)(\*|\-)(.+?)$} - ctext::addHighlightClass $txt shellcommand #19a2a6 {if fi else elseif then while case esac do in exit source echo package mkdir ls rm sed awk grep date jq zip tar gzip mount umount test make curl git iconv less gcc scp rsync cut tr function install} + ctext::addHighlightClass $txt shelcommand #19a2a6 {if fi else elseif then while case esac do in exit source echo package mkdir ls rm sed awk grep date jq zip tar gzip mount umount test make curl git iconv less gcc scp rsync cut tr function install} ctext::addHighlightClassForRegexp $txt comments #666666 {(#|//)[^\n\r]*} } } diff --git a/lib/lexers.tcl b/lib/lexers.tcl index da8ede4..74a2d85 100644 --- a/lib/lexers.tcl +++ b/lib/lexers.tcl @@ -69,7 +69,8 @@ dict set lexers PL varRegexpCommand {regexp -nocase -all -- {^(\s*?)\$([a-zA-Z0- dict set lexers INI commentSymbol {#} dict set lexers INI tabSize 4 dict set lexers INI procFindString {(\[)PROCNAME(\])} -dict set lexers INI procRegexpCommand {regexp -nocase -all -- {^\s*?(\[)([a-zA-Z0-9\-_:]+?)(\])$} $line match keyWord procName} +# dict set lexers INI procRegexpCommand {regexp -nocase -all -- {^\s*?(\[)([a-zA-Z0-9\-_:\s]+?)(\])$} $line match keyWord procName} +dict set lexers INI procRegexpCommand {regexp -nocase -all -- {^\s*?(\[)(.+?)(\])$} $line match keyWord procName} # ------------------------------------------------- # HTML