HaikuDepot: Make MarkupParser a bit more flexible...

... by allowing to append markup to an existing document.
haiku · Sep 8, 2013 · cb97f23 · cb97f23
1 parent 97c332e
commit cb97f23
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/src/apps/haiku-depot/textview/MarkupParser.cpp b/src/apps/haiku-depot/textview/MarkupParser.cpp
@@ -64,9 +64,20 @@ MarkupParser::SetStyles(const CharacterStyle& characterStyle,
 TextDocumentRef
 MarkupParser::CreateDocumentFromMarkup(const BString& text)
 {
-	fTextDocument.SetTo(new(std::nothrow) TextDocument(), true);
+	TextDocumentRef document(new(std::nothrow) TextDocument(), true);
-	if (fTextDocument.Get() == NULL)
+	if (document.Get() == NULL)
-		return fTextDocument;
+		return document;
+
+	AppendMarkup(document, text);
+
+	return document;
+}
+
+
+void
+MarkupParser::AppendMarkup(const TextDocumentRef& document, const BString& text)
+{
+	fTextDocument.SetTo(document);
 
 	fCurrentCharacterStyle = &fNormalStyle;
 	fCurrentParagraphStyle = &fParagraphStyle;
@@ -76,7 +87,7 @@ MarkupParser::CreateDocumentFromMarkup(const BString& text)
 
 	_ParseText(text);
 
-	return fTextDocument;
+	fTextDocument.Unset();
 }
 
 

diff --git a/src/apps/haiku-depot/textview/MarkupParser.h b/src/apps/haiku-depot/textview/MarkupParser.h
@@ -19,7 +19,14 @@ class MarkupParser {
 									const CharacterStyle& characterStyle,
 									const ParagraphStyle& paragraphStyle);
 
+			const CharacterStyle& HeadingCharacterStyle() const
+									{ return fHeadingStyle; }
+			const ParagraphStyle& HeadingParagraphStyle() const
+									{ return fHeadingParagraphStyle; }
+
 			TextDocumentRef		CreateDocumentFromMarkup(const BString& text);
+			void				AppendMarkup(const TextDocumentRef& document,
+									const BString& text);
 
 private:
 			void				_InitStyles();