1j01/textual-paint
1
1
Fork 0
mirror of https://github.com/1j01/textual-paint.git synced 2024-08-17 20:00:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prevent digits in document from merging with mIRC color codes

Browse Source 
If digits were present in the document, they were concatenated after
the color codes, and they ran together indistinguishably.
This changed the color index numbers that were read back, to potentially
invalid color indices, and lost the digits as part of the document.
It needs the delimiter of the ending escape code to separate the digits.
This commit is contained in:
Isaiah Odhner 2023-07-11 18:54:52 -04:00
parent f77d2bba38
commit 967801cf17
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cspell.json
View File

@ -36,6 +36,7 @@
"dasharray",
"Deutsch",
"DIALOGEX",
"disambiguates",
"domtree",
"emacsclient",
"executablepath",

7
src/textual_paint/paint.py
View File

@ -916,6 +916,9 @@ class AnsiArtDocument:
irc_text += str(closest_color(Color.from_rich_color(style.color)))
irc_text += ","
irc_text += str(closest_color(Color.from_rich_color(style.bgcolor)))
if text[0] in "0123456789,":
# separate the color code from the text with an ending escape character
irc_text += "\x03"
irc_text += text
else:
irc_text += text
@ -1007,7 +1010,8 @@ class AnsiArtDocument:
fg_color = default_fg
color_escape = "\x03"
color_escape_re = re.compile(r"\x03(\d{1,2})?(?:,(\d{1,2}))?")
# an optional escape code at the end disambiguates a digit from part of the color code
color_escape_re = re.compile(r"\x03(\d{1,2})?(?:,(\d{1,2}))?\x03?")
reset_escape = "\x0F"
index = 0
@ -1017,6 +1021,7 @@ class AnsiArtDocument:
match = color_escape_re.match(text[index:])
if match:
index += len(match.group(0))
# TODO: should a one-value syntax reset the background?
bg_color = default_bg
fg_color = default_fg
if match.group(1):