Changed the DemoOutput algorithm as suggested by Andreas: We first transform the document graph to an XML tree and the XML tree in turn has the methods to serialize to XML text, or, in this case, XHTML text.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/plugins/html/DemoOutput.hpp b/src/plugins/html/DemoOutput.hpp
index ca9bcd2..70a5daa 100644
--- a/src/plugins/html/DemoOutput.hpp
+++ b/src/plugins/html/DemoOutput.hpp
@@ -33,6 +33,7 @@
 #include <ostream>
 
 #include <core/model/Document.hpp>
+#include <core/XML.hpp>
 
 namespace ousia {
 namespace html {
@@ -40,15 +41,11 @@ namespace html {
 class DemoHTMLTransformer {
 private:
 	/**
-	 * This method is to be called recursively to write a chapter, section or
-	 * subsection to HTML.
+	 * These methods are called recursively to transform a document to an XML
+	 * tree.
 	 */
-	void writeSection(Handle<model::StructuredEntity> sec, std::ostream& out);
-	/**
-	 * This method is to be called recursively to write a paragraph to HTML.
-	 */
-	void writeParagraph(Handle<model::StructuredEntity> par, std::ostream& out,
-	                    bool writePTags = true);
+	Rooted<xml::Element> transformSection(Handle<model::StructuredEntity> sec);
+	Rooted<xml::Element> transformParagraph(Handle<model::StructuredEntity> par);
 	/**
 	 * This method is to be called recursively to write a list to HTML.
 	 * TODO: Implement