From ec569138098b9dd1c060ea8816076e0b55e4011a Mon Sep 17 00:00:00 2001 From: Julian Noble Date: Sat, 3 Jan 2026 00:30:07 +1100 Subject: [PATCH] more term- colours for basic functions --- src/bootsupport/modules/punk/args-0.2.1.tm | 4 ++-- src/bootsupport/modules/punk/ns-0.1.0.tm | 12 ++++++------ src/bootsupport/modules/textblock-0.1.3.tm | 3 ++- src/modules/punk/args-999999.0a1.0.tm | 4 ++-- src/modules/punk/ns-999999.0a1.0.tm | 12 ++++++------ src/modules/textblock-999999.0a1.0.tm | 3 ++- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/bootsupport/modules/punk/args-0.2.1.tm b/src/bootsupport/modules/punk/args-0.2.1.tm index 24f98b6b..63323fb5 100644 --- a/src/bootsupport/modules/punk/args-0.2.1.tm +++ b/src/bootsupport/modules/punk/args-0.2.1.tm @@ -373,8 +373,8 @@ tcl::namespace::eval ::punk::args::helpers { #Note that if we were to highlight based on the regexp {\{|\}} then the inserted ansi would come between # the backslash and brace in \{ or \} - this breaks the syntactic structure causing problems. - set str [punk::ansi::grepstr -return all -highlight {Term-grey tk-darkblue} {^\{|[^\\](\{+)} $str] - set str [punk::ansi::grepstr -return all -highlight {Term-grey tk-darkblue} {[^\\](\}+)} $str] + set str [punk::ansi::grepstr -return all -highlight {Term-grey term-navy} {^\{|[^\\](\{+)} $str] + set str [punk::ansi::grepstr -return all -highlight {Term-grey term-navy} {[^\\](\}+)} $str] set str [punk::ansi::grepstr -return all -highlight {Term-grey term-orange1} {\[|\]} $str] #puts stderr ------------------- #puts $str diff --git a/src/bootsupport/modules/punk/ns-0.1.0.tm b/src/bootsupport/modules/punk/ns-0.1.0.tm index ed9ec885..883f82de 100644 --- a/src/bootsupport/modules/punk/ns-0.1.0.tm +++ b/src/bootsupport/modules/punk/ns-0.1.0.tm @@ -6633,16 +6633,16 @@ y" {return quirkykeyscript} switch -- $syntax { basic { #rudimentary colourising only - set argl [punk::ansi::grepstr -return all -highlight tk-darkcyan {\{|\}} $argl] + set argl [punk::ansi::grepstr -return all -highlight term-teal {\{|\}} $argl] - set body [punk::ansi::grepstr -return all -highlight green {^\s*#.*} $body] ;#Note, will not highlight comments at end of line - like this one. - set body [punk::ansi::grepstr -return all -highlight green {;\s*(#.*)} $body] ;#treat as tail comment only if preceeded by semicolon + set body [punk::ansi::grepstr -return all -highlight green {^\s*#.*} $body] ;#Note, will not highlight comments at end of line - like this one. + set body [punk::ansi::grepstr -return all -highlight green {;\s*(#.*)} $body] ;#treat as tail comment only if preceeded by semicolon ##set body [punk::ansi::grepstr -return all -highlight tk-darkcyan {\{|\}} $body] - set body [punk::ansi::grepstr -return all -highlight tk-darkcyan {^(\{)|[^\\](\{+)} $body] - set body [punk::ansi::grepstr -return all -highlight tk-darkcyan {[^\\](\}+)} $body] - set body [punk::ansi::grepstr -return all -highlight tk-orange {\[|\]} $body] + set body [punk::ansi::grepstr -return all -highlight term-teal {^(\{)|[^\\](\{+)} $body] + set body [punk::ansi::grepstr -return all -highlight term-teal {[^\\](\}+)} $body] + set body [punk::ansi::grepstr -return all -highlight term-orange {\[|\]} $body] } default { set is_highlighted 0 diff --git a/src/bootsupport/modules/textblock-0.1.3.tm b/src/bootsupport/modules/textblock-0.1.3.tm index 21e3f2f1..8d82916a 100644 --- a/src/bootsupport/modules/textblock-0.1.3.tm +++ b/src/bootsupport/modules/textblock-0.1.3.tm @@ -6127,7 +6127,8 @@ tcl::namespace::eval textblock { set ansi [textblock::join -- " " [punk::ansi::ansicat -dimensions 80x8 src/testansi/publicdomain/roysac/ROY-WELC.ANS]] # Ansi art courtesy of Carsten Cumbrowski aka Roy/SAC - roysac.com set table [[textblock::spantest] print] - set punks [a+ term-lime][>punk . lhs][a]\n\n[a+ rgb#FFFF00][>punk . rhs][a] + #set punks [a+ term-lime][>punk . lhs][a]\n\n[a+ rgb#FFFF00][>punk . rhs][a] + set punks [a+ term-lime][>punk . lhs][a]\n\n[a+ term-yellow][>punk . rhs][a] set ipunks [overtype::renderspace -width [textblock::width $punks] [punk::ansi::enable_inverse]$punks] set testblock [textblock::testblock -size 15 rainbow] set contents $ansi\n[textblock::join -- " " $table " " $punks " " $testblock " " $ipunks " " $punks] diff --git a/src/modules/punk/args-999999.0a1.0.tm b/src/modules/punk/args-999999.0a1.0.tm index a3eced11..ea41a715 100644 --- a/src/modules/punk/args-999999.0a1.0.tm +++ b/src/modules/punk/args-999999.0a1.0.tm @@ -373,8 +373,8 @@ tcl::namespace::eval ::punk::args::helpers { #Note that if we were to highlight based on the regexp {\{|\}} then the inserted ansi would come between # the backslash and brace in \{ or \} - this breaks the syntactic structure causing problems. - set str [punk::ansi::grepstr -return all -highlight {Term-grey tk-darkblue} {^\{|[^\\](\{+)} $str] - set str [punk::ansi::grepstr -return all -highlight {Term-grey tk-darkblue} {[^\\](\}+)} $str] + set str [punk::ansi::grepstr -return all -highlight {Term-grey term-navy} {^\{|[^\\](\{+)} $str] + set str [punk::ansi::grepstr -return all -highlight {Term-grey term-navy} {[^\\](\}+)} $str] set str [punk::ansi::grepstr -return all -highlight {Term-grey term-orange1} {\[|\]} $str] #puts stderr ------------------- #puts $str diff --git a/src/modules/punk/ns-999999.0a1.0.tm b/src/modules/punk/ns-999999.0a1.0.tm index 474355cc..4d534c02 100644 --- a/src/modules/punk/ns-999999.0a1.0.tm +++ b/src/modules/punk/ns-999999.0a1.0.tm @@ -6633,16 +6633,16 @@ y" {return quirkykeyscript} switch -- $syntax { basic { #rudimentary colourising only - set argl [punk::ansi::grepstr -return all -highlight tk-darkcyan {\{|\}} $argl] + set argl [punk::ansi::grepstr -return all -highlight term-teal {\{|\}} $argl] - set body [punk::ansi::grepstr -return all -highlight green {^\s*#.*} $body] ;#Note, will not highlight comments at end of line - like this one. - set body [punk::ansi::grepstr -return all -highlight green {;\s*(#.*)} $body] ;#treat as tail comment only if preceeded by semicolon + set body [punk::ansi::grepstr -return all -highlight green {^\s*#.*} $body] ;#Note, will not highlight comments at end of line - like this one. + set body [punk::ansi::grepstr -return all -highlight green {;\s*(#.*)} $body] ;#treat as tail comment only if preceeded by semicolon ##set body [punk::ansi::grepstr -return all -highlight tk-darkcyan {\{|\}} $body] - set body [punk::ansi::grepstr -return all -highlight tk-darkcyan {^(\{)|[^\\](\{+)} $body] - set body [punk::ansi::grepstr -return all -highlight tk-darkcyan {[^\\](\}+)} $body] - set body [punk::ansi::grepstr -return all -highlight tk-orange {\[|\]} $body] + set body [punk::ansi::grepstr -return all -highlight term-teal {^(\{)|[^\\](\{+)} $body] + set body [punk::ansi::grepstr -return all -highlight term-teal {[^\\](\}+)} $body] + set body [punk::ansi::grepstr -return all -highlight term-orange {\[|\]} $body] } default { set is_highlighted 0 diff --git a/src/modules/textblock-999999.0a1.0.tm b/src/modules/textblock-999999.0a1.0.tm index 54caee5e..5c1406be 100644 --- a/src/modules/textblock-999999.0a1.0.tm +++ b/src/modules/textblock-999999.0a1.0.tm @@ -6127,7 +6127,8 @@ tcl::namespace::eval textblock { set ansi [textblock::join -- " " [punk::ansi::ansicat -dimensions 80x8 src/testansi/publicdomain/roysac/ROY-WELC.ANS]] # Ansi art courtesy of Carsten Cumbrowski aka Roy/SAC - roysac.com set table [[textblock::spantest] print] - set punks [a+ term-lime][>punk . lhs][a]\n\n[a+ rgb#FFFF00][>punk . rhs][a] + #set punks [a+ term-lime][>punk . lhs][a]\n\n[a+ rgb#FFFF00][>punk . rhs][a] + set punks [a+ term-lime][>punk . lhs][a]\n\n[a+ term-yellow][>punk . rhs][a] set ipunks [overtype::renderspace -width [textblock::width $punks] [punk::ansi::enable_inverse]$punks] set testblock [textblock::testblock -size 15 rainbow] set contents $ansi\n[textblock::join -- " " $table " " $punks " " $testblock " " $ipunks " " $punks]