matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

colors: Rework newline adding for blockquotes and <p> tags.

Browse source
This commit is contained in:
Damir Jelić 2018-08-09 17:52:24 +02:00
parent 0e66455cce
commit 8fca7d19c7
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
matrix/colors.py
View file

@ -301,7 +301,7 @@ class Formatted():
return text return text
weechat_strings = map(format_string, self.substrings) weechat_strings = map(format_string, self.substrings)
return "".join(weechat_strings).rstrip("\n") return "".join(weechat_strings).rstrip("\n").replace("\n\n", "\n")
# TODO this should be a typed dict. # TODO this should be a typed dict.
@ -357,6 +357,12 @@ class MatrixHtmlParser(HTMLParser):
self._toggle_attribute("strikethrough") self._toggle_attribute("strikethrough")
elif tag == "blockquote": elif tag == "blockquote":
self._toggle_attribute("quote") self._toggle_attribute("quote")
elif tag == "p":
if self.text:
self.add_substring(self.text, self.attributes.copy())
self.text = "\n"
self.add_substring(self.text, DEFAULT_ATRIBUTES.copy())
self.text = ""
elif tag == "br": elif tag == "br":
if self.text: if self.text:
self.add_substring(self.text, self.attributes.copy()) self.add_substring(self.text, self.attributes.copy())
@ -389,9 +395,6 @@ class MatrixHtmlParser(HTMLParser):
self._toggle_attribute("strikethrough") self._toggle_attribute("strikethrough")
elif tag == "blockquote": elif tag == "blockquote":
self._toggle_attribute("quote") self._toggle_attribute("quote")
elif tag == "p":
if self.text:
self.add_substring(self.text, self.attributes.copy())
self.text = "\n" self.text = "\n"
self.add_substring(self.text, DEFAULT_ATRIBUTES.copy()) self.add_substring(self.text, DEFAULT_ATRIBUTES.copy())
self.text = "" self.text = ""