From 5eca67b6cab7031d8203b1403ba5cddaef833e76 Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Sun, 8 Feb 2015 19:37:51 +0100
Subject: restructured the FieldDescriptor mechanism.

---
 src/plugins/html/DemoOutput.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/plugins/html')

diff --git a/src/plugins/html/DemoOutput.cpp b/src/plugins/html/DemoOutput.cpp
index d61e9b7..d041c1d 100644
--- a/src/plugins/html/DemoOutput.cpp
+++ b/src/plugins/html/DemoOutput.cpp
@@ -27,8 +27,8 @@
 namespace ousia {
 namespace html {
 
-void DemoHTMLTransformer::writeHTML(Handle<Document> doc,
-                                    std::ostream &out, bool pretty)
+void DemoHTMLTransformer::writeHTML(Handle<Document> doc, std::ostream &out,
+                                    bool pretty)
 {
 	Manager &mgr = doc->getManager();
 	// Create an XML object tree for the document first.
@@ -115,7 +115,7 @@ Rooted<xml::Element> DemoHTMLTransformer::transformSection(
 	Rooted<xml::Element> sec{
 	    new xml::Element{mgr, parent, "section", {{"class", secclass}}}};
 	// check if we have a heading.
-	if (section->hasField("heading") &&
+	if (section->getDescriptor()->hasField("heading") &&
 	    section->getField("heading").size() > 0) {
 		Handle<StructuredEntity> heading =
 		    section->getField("heading")[0].cast<StructuredEntity>();
@@ -188,8 +188,7 @@ Rooted<xml::Element> DemoHTMLTransformer::transformList(
 	Rooted<xml::Element> l{new xml::Element{mgr, parent, listclass}};
 	// iterate through list items.
 	for (auto &it : list->getField()) {
-		Handle<StructuredEntity> item =
-		    it.cast<StructuredEntity>();
+		Handle<StructuredEntity> item = it.cast<StructuredEntity>();
 		std::string itDescrName = item->getDescriptor()->getName();
 		if (itDescrName == "item") {
 			// create the list item.
@@ -210,9 +209,9 @@ Rooted<xml::Element> DemoHTMLTransformer::transformList(
 
 typedef std::stack<Rooted<AnnotationEntity>> AnnoStack;
 
-static Rooted<xml::Element> openAnnotation(
-    Manager &mgr, AnnoStack &opened, Handle<AnnotationEntity> entity,
-    Handle<xml::Element> current)
+static Rooted<xml::Element> openAnnotation(Manager &mgr, AnnoStack &opened,
+                                           Handle<AnnotationEntity> entity,
+                                           Handle<xml::Element> current)
 {
 	// we push the newly opened entity on top of the stack.
 	opened.push(entity);
@@ -238,7 +237,8 @@ Rooted<xml::Element> DemoHTMLTransformer::transformParagraph(
 	Rooted<xml::Element> p{new xml::Element{mgr, parent, "p"}};
 
 	// check if we have a heading.
-	if (par->hasField("heading") && par->getField("heading").size() > 0) {
+	if (par->getDescriptor()->hasField("heading") &&
+	    par->getField("heading").size() > 0) {
 		Handle<StructuredEntity> heading =
 		    par->getField("heading")[0].cast<StructuredEntity>();
 		// put the heading in a strong xml::Element.
-- 
cgit v1.2.3