jn
/
punkshell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

more term- colours for basic functions

master
Julian Noble 2 months ago
parent
6d4f929374
commit
ec56913809
6 changed files with 20 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/bootsupport/modules/punk/args-0.2.1.tm
  2. 12
      src/bootsupport/modules/punk/ns-0.1.0.tm
  3. 3
      src/bootsupport/modules/textblock-0.1.3.tm
  4. 4
      src/modules/punk/args-999999.0a1.0.tm
  5. 12
      src/modules/punk/ns-999999.0a1.0.tm
  6. 3
      src/modules/textblock-999999.0a1.0.tm

4
src/bootsupport/modules/punk/args-0.2.1.tm
Unescape View File

@ -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

12
src/bootsupport/modules/punk/ns-0.1.0.tm
Unescape View File

@ -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

3
src/bootsupport/modules/textblock-0.1.3.tm
Unescape View File

@ -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]

4
src/modules/punk/args-999999.0a1.0.tm
Unescape View File

@ -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

12
src/modules/punk/ns-999999.0a1.0.tm
Unescape View File

@ -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

3
src/modules/textblock-999999.0a1.0.tm
Unescape View File

@ -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]

Write Preview
Loading…
Cancel
Save