From ef4a6366232d4f67e9be6b70ada9cd8fc20b3777 Mon Sep 17 00:00:00 2001 From: svkalinin Date: Fri, 25 Nov 2022 12:41:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D1=81=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/highlight.tcl | 7 ++++--- lib/lexers.tcl | 2 +- projman.tcl | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/highlight.tcl b/lib/highlight.tcl index d7275d8..1608ed3 100644 --- a/lib/highlight.tcl +++ b/lib/highlight.tcl @@ -108,13 +108,14 @@ namespace eval Highlight {} { ctext::addHighlightClassForRegexp $txt namespaces #4f64ff {::} } proc MD {txt} { + ctext::addHighlightClassForRegexp $txt comments #666666 {^\s+?(#|//).*$} ctext::addHighlightClassForRegexp $txt lists #4471ca {(\*|-|\+)+} ctext::addHighlightClassForSpecialChars $txt brackets green {[]{}()} - ctext::addHighlightClassForRegexp $txt url #19a2a6 {(http|http|ftp|ssh)(://)(\w|\.|-)+?} + ctext::addHighlightClassForRegexp $txt url #19a2a6 {(http|https|ftp|ssh)(://)(\w|\.|-|/)+?} ctext::addHighlightClassForRegexp $txt email #467a7b {(\w|\.|-)+?(@)(\w|\.|-)+?($|\s)} ctext::addHighlightClassForRegexp $txt qoute #b84a0c {("|'|`).*?("|'|`)} - ctext::addHighlightClassForRegexp $txt sharp #975db4 {(#+?)\s(.*?)$} + ctext::addHighlightClassForRegexp $txt sharp #975db4 {^(#+?)\s(.*?)$} ctext::addHighlightClassForRegexp $txt quotedtext #a9b36c {^(\s*?)(>+).+?$} - ctext::addHighlightClassForRegexp $txt italictext #dff74e {((_|\*)+?)(.+?)((_|\*)+?)} + ctext::addHighlightClassForRegexp $txt italictext #dff74e {((_|\*)+?)(\w+?)((_|\*)+?)} } } diff --git a/lib/lexers.tcl b/lib/lexers.tcl index e57d939..3a7a860 100644 --- a/lib/lexers.tcl +++ b/lib/lexers.tcl @@ -52,7 +52,7 @@ dict set lexers YML varRegexpCommandMultiline {regexp -all -line -- {^(\s*)(set_ # MD (markdown) dict set lexers MD tabSize 2 dict set lexers MD procFindString {(#+?)\s*?PROCNAME} -dict set lexers MD procRegexpCommand {regexp -nocase -all -- {^\s*?(#+?)\s(.+?)$} $line match keyWord procName} +dict set lexers MD procRegexpCommand {regexp -nocase -all -- {^(#+?)\s(.+?)$} $line match keyWord procName} # dict set lexers YML varRegexpCommandMultiline {regexp -all -line -- {^(\s*)(set_fact|vars):$} $line match indent keyWord} # ------------------------------------------------- diff --git a/projman.tcl b/projman.tcl index 74c328c..b9c4ab0 100755 --- a/projman.tcl +++ b/projman.tcl @@ -10,7 +10,7 @@ exec wish "$0" -- "$@" ###################################################### # Version: 2.0.0 # Release: alpha -# Build: 25112022110647 +# Build: 25112022123908 ###################################################### # определим текущую версию, релиз и т.д.