Merge branch 'master' of somweyr.de:ousia

Conflicts:
	application/src/core/model/Document.cpp
	application/src/core/model/Domain.cpp

1 files changed, 13 insertions, 4 deletions

diff --git a/test/plugins/html/DemoOutputTest.cpp b/test/plugins/html/DemoOutputTest.cpp
index 6123c79..36b53b4 100644
--- a/test/plugins/html/DemoOutputTest.cpp
+++ b/test/plugins/html/DemoOutputTest.cpp
@@ -25,6 +25,7 @@
 #include <core/model/Document.hpp>
 #include <core/model/Domain.hpp>
 
+#include <core/model/TestAdvanced.hpp>
 #include <core/model/TestDocument.hpp>
 #include <core/model/TestDomain.hpp>
 
@@ -37,17 +38,25 @@ TEST(DemoHTMLTransformer, writeHTML)
 	Logger logger;
 	Manager mgr{1};
 	Rooted<model::SystemTypesystem> sys{new model::SystemTypesystem(mgr)};
-	// Get the domain.
-	Rooted<model::Domain> domain = constructBookDomain(mgr, sys, logger);
+	// Get the domains.
+	Rooted<model::Domain> bookDom =
+	    model::constructBookDomain(mgr, sys, logger);
+	Rooted<model::Domain> headingDom =
+	    model::constructHeadingDomain(mgr, sys, bookDom, logger);
+	Rooted<model::Domain> listDom =
+	    model::constructListDomain(mgr, sys, bookDom, logger);
+	Rooted<model::Domain> emDom =
+	    model::constructEmphasisDomain(mgr, sys, logger);
 	// Construct the document.
-	Rooted<model::Document> doc = model::constructBookDocument(mgr, domain);
+	Rooted<model::Document> doc =
+	    model::constructAdvancedDocument(mgr, bookDom, headingDom, listDom);
 
 #ifdef MANAGER_GRAPHVIZ_EXPORT
 	// dump the manager state
 	mgr.exportGraphviz("bookDocument.dot");
 #endif
 
-	// print it
+	// TODO: change this. Don't use printouts
 	DemoHTMLTransformer transformer;
 	transformer.writeHTML(doc, std::cout);
 }