From 49a558574f29c72733c951e1bf67ec4eabd8933b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Thu, 26 Mar 2020 19:56:35 +0100 Subject: Hypertext: Fix alignment tags adding unwanted newlines (#9548) --- src/gui/guiHyperText.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/gui/guiHyperText.h') diff --git a/src/gui/guiHyperText.h b/src/gui/guiHyperText.h index 093c84ccd..c55f8a705 100644 --- a/src/gui/guiHyperText.h +++ b/src/gui/guiHyperText.h @@ -134,11 +134,13 @@ public: Tag m_root_tag; protected: + typedef enum { ER_NONE, ER_TAG, ER_NEWLINE } EndReason; + // Parser functions void enterElement(ElementType type); void endElement(); void enterParagraph(); - void endParagraph(); + void endParagraph(EndReason reason); void pushChar(wchar_t c); ParsedText::Tag *newTag(const std::string &name, const AttrsList &attrs); ParsedText::Tag *openTag(const std::string &name, const AttrsList &attrs); @@ -160,6 +162,8 @@ protected: StyleList m_style; Element *m_element; Paragraph *m_paragraph; + bool m_empty_paragraph; + EndReason m_end_paragraph_reason; }; class TextDrawer -- cgit v1.2.3