Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle webclient tabs; refactor html regex structure a little

Browse source
This commit is contained in:
Griatch 2020-10-31 23:38:40 +01:00
parent d985894677
commit 668551a0d5
2 changed files with 67 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/utils/text2html.py
View file

@ -97,7 +97,7 @@ class TextToHTMLparser(object):
re_blink = re.compile("(?:%s)(.*?)(?=%s|%s)" % (blink.replace("[", r"\["), fgstop, bgstop))
re_inverse = re.compile("(?:%s)(.*?)(?=%s|%s)" % (inverse.replace("[", r"\["), fgstop, bgstop))
re_string = re.compile(
r"(?P<htmlchars>[<&>])|(?P<firstspace>(?<=\S) )|(?P<space> [ \t]+)|"
r"(?P<htmlchars>[<&>])|(?P<tab>[\t]+)|(?P<space> +)|"
r"(?P<spacestart>^ )|(?P<lineend>\r\n|\r|\n)",
re.S | re.M | re.I,
)
@ -307,13 +307,12 @@ class TextToHTMLparser(object):
return html_escape(cdict["htmlchars"])
elif cdict["lineend"]:
return "<br>"
elif cdict["firstspace"]:
return " &nbsp;"
elif cdict["space"] == "\t":
return " " if self.tabstop == 1 else " " + "&nbsp;" * self.tabstop
elif cdict["tab"]:
text = cdict["tab"].replace("\t", "&nbsp;" * self.tabstop)
return text
elif cdict["space"] or cdict["spacestart"]:
text = match.group().replace("\t", "&nbsp;" * self.tabstop)
text = text.replace(" ", "&nbsp;")
text = cdict["space"]
text = " " if len(text) == 1 else " " + text[1:].replace(" ", "&nbsp;")
return text
return None