hueso/Alpaca
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Much better markup rendering

Browse Source
This commit is contained in:
jeffser 2024-10-09 21:31:08 -06:00
parent ff5e663185
commit 7f042a906d
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/custom_widgets/message_widget.py
View File

@ -537,16 +537,11 @@ class message(Gtk.Overlay):
code_block_pattern = re.compile(r'```(\w*)\n(.*?)\n\s*```', re.DOTALL) code_block_pattern = re.compile(r'```(\w*)\n(.*?)\n\s*```', re.DOTALL)
no_language_code_block_pattern = re.compile(r'`(\w*)\n(.*?)\n\s*`', re.DOTALL) no_language_code_block_pattern = re.compile(r'`(\w*)\n(.*?)\n\s*`', re.DOTALL)
table_pattern = re.compile(r'((\r?\n){2}|^)([^\r\n]*\|[^\r\n]*(\r?\n)?)+(?=(\r?\n){2}|$)', re.MULTILINE) table_pattern = re.compile(r'((\r?\n){2}|^)([^\r\n]*\|[^\r\n]*(\r?\n)?)+(?=(\r?\n){2}|$)', re.MULTILINE)
bold_pattern = re.compile(r'\*\*(.*?)\*\*') #"**text**"
code_pattern = re.compile(r'`([^`\n]*?)`') #"`text`"
h1_pattern = re.compile(r'^#\s(.*)$') #"# text"
h2_pattern = re.compile(r'^##\s(.*)$') #"## text"
markup_pattern = re.compile(r'<(b|u|tt|span.*)>(.*?)<\/(b|u|tt|span)>') #heh butt span, I'm so funny markup_pattern = re.compile(r'<(b|u|tt|span.*)>(.*?)<\/(b|u|tt|span)>') #heh butt span, I'm so funny
parts = [] parts = []
pos = 0 pos = 0
# Code blocks # Code blocks
for match in code_block_pattern.finditer(self.text[pos:]): for match in code_block_pattern.finditer(self.text[pos:]):
print(match)
start, end = match.span() start, end = match.span()
if pos < start: if pos < start:
normal_text = self.text[pos:start] normal_text = self.text[pos:start]
@ -583,10 +578,12 @@ class message(Gtk.Overlay):
if part['type'] == 'normal': if part['type'] == 'normal':
text_b = text_block(self.bot) text_b = text_block(self.bot)
part['text'] = part['text'].replace("\n* ", "\n• ") part['text'] = part['text'].replace("\n* ", "\n• ")
part['text'] = code_pattern.sub(r'<tt>\1</tt>', part['text']) part['text'] = re.sub(r'`([^`\n]*?)`', r'<tt>\1</tt>', part['text'])
part['text'] = bold_pattern.sub(r'<b>\1</b>', part['text']) part['text'] = re.sub(r'\*\*(.*?)\*\*', r'<b>\1</b>', part['text'], flags=re.MULTILINE)
part['text'] = h1_pattern.sub(r'<span size="x-large">\1</span>', part['text']) part['text'] = re.sub(r'^#\s+(.*)', r'<span size="x-large">\1</span>', part['text'], flags=re.MULTILINE)
part['text'] = h2_pattern.sub(r'<span size="large">\1</span>', part['text']) part['text'] = re.sub(r'^##\s+(.*)', r'<span size="large">\1</span>', part['text'], flags=re.MULTILINE)
part['text'] = re.sub(r'_(\((.*?)\)|\d+)', r'<sub>\2\1</sub>', part['text'], flags=re.MULTILINE)
part['text'] = re.sub(r'\^(\((.*?)\)|\d+)', r'<sup>\2\1</sup>', part['text'], flags=re.MULTILINE)
pos = 0 pos = 0
for match in markup_pattern.finditer(part['text']): for match in markup_pattern.finditer(part['text']):
start, end = match.span() start, end = match.span()