From 78f24b65e4a84c528338cc52e71efa4aa58e656e Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Tue, 3 Mar 2015 15:17:51 +0100
Subject: Renamed isSubtree to subtree and isRoot to root

---
 data/ontology/bibliography.osxml |  2 +-
 data/ontology/book.osxml         |  2 +-
 data/ontology/comments.osxml     |  6 +++---
 data/ontology/headings.osxml     | 10 +++++-----
 data/ontology/meta.osxml         | 14 +++++++-------
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'data')

diff --git a/data/ontology/bibliography.osxml b/data/ontology/bibliography.osxml
index e133a2b..3de3e83 100644
--- a/data/ontology/bibliography.osxml
+++ b/data/ontology/bibliography.osxml
@@ -9,7 +9,7 @@
 			<childRef ref="bibEntry"/>
 		</field>
 		<parentRef ref="book">
-			<field name="bibliography" isSubtree="true"/>
+			<field name="bibliography" subtree="true"/>
 		</parentRef>
 	</struct>
 	<struct name="bibEntry">
diff --git a/data/ontology/book.osxml b/data/ontology/book.osxml
index 41dc788..3bd06b9 100644
--- a/data/ontology/book.osxml
+++ b/data/ontology/book.osxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="yes"?>
 <ontology name="book">
-	<struct name="book" cardinality="{1}" isRoot="true">
+	<struct name="book" cardinality="{1}" root="true">
 		<field>
 			<childRef ref="book.chapter"/>
 			<childRef ref="book.paragraph"/>
diff --git a/data/ontology/comments.osxml b/data/ontology/comments.osxml
index 621fe1c..97d152c 100644
--- a/data/ontology/comments.osxml
+++ b/data/ontology/comments.osxml
@@ -4,7 +4,7 @@
 
 	<!-- an annotation comment -->
 	<annotation name="comment">
-		<field name="replies" isSubtree="true">
+		<field name="replies" subtree="true">
 			<childRef ref="reply"/>
 		</field>
 		<field name="content">
@@ -17,7 +17,7 @@
 		<!-- Is there a chance to prevent users from having to redefine these
 		     two fields in comment and reply? Could we use a fieldRef here?
 		     Or would that be circular? -->
-		<field name="replies" isSubtree="true">
+		<field name="replies" subtree="true">
 			<childRef ref="reply"/>
 		</field>
 		<field name="content">
@@ -30,7 +30,7 @@
 	<!-- note that replies are organized in a tree fashion: One can also reply
 	     to a reply -->
 	<struct name="reply">
-		<field name="replies" isSubtree="true">
+		<field name="replies" subtree="true">
 			<childRef ref="reply"/>
 		</field>
 		<field name="content">
diff --git a/data/ontology/headings.osxml b/data/ontology/headings.osxml
index 1319306..9e164d6 100644
--- a/data/ontology/headings.osxml
+++ b/data/ontology/headings.osxml
@@ -9,19 +9,19 @@
 		     by fields. So we must either reference a field that is
 		     already there or declare a new one on the fly. -->
 		<parentRef ref="book.book">
-			<field name="heading" isSubtree="true" optional="true"/>
+			<field name="heading" subtree="true" optional="true"/>
 		</parentRef>
 		<parentRef ref="book.chapter">
-			<field name="heading" isSubtree="true" optional="true"/>
+			<field name="heading" subtree="true" optional="true"/>
 		</parentRef>
 		<parentRef ref="book.section">
-			<field name="heading" isSubtree="true" optional="true"/>
+			<field name="heading" subtree="true" optional="true"/>
 		</parentRef>
 		<parentRef ref="book.subsection">
-			<field name="heading" isSubtree="true" optional="true"/>
+			<field name="heading" subtree="true" optional="true"/>
 		</parentRef>
 		<parentRef ref="book.paragraph">
-			<field name="heading" isSubtree="true" optional="true"/>
+			<field name="heading" subtree="true" optional="true"/>
 		</parentRef>
 		<!-- regarding its fields we have a problem here. We do not want to
 		     declare a new field, because in fact we want to allow every
diff --git a/data/ontology/meta.osxml b/data/ontology/meta.osxml
index 6b25305..c03541a 100644
--- a/data/ontology/meta.osxml
+++ b/data/ontology/meta.osxml
@@ -13,20 +13,20 @@
 			<childRef ref="version"/>
 		</field>
 		<parentRef ref="book">
-			<field name="meta" isSubtree="true" optional="true"/>
+			<field name="meta" subtree="true" optional="true"/>
 		</parentRef>
 		<parentRef ref="chapter">
-			<field name="meta" isSubtree="true" optional="true"/>
+			<field name="meta" subtree="true" optional="true"/>
 		</parentRef>
 		<!-- One could also include "article" and other things here -->
 	</struct>
 
 	<struct name="person">
-		<primitive isSubtree="true" name="firstName" type="string"/>
-		<primitive isSubtree="true" name="secondNames" type="string[]" optional="true"/>
-		<primitive isSubtree="true" name="lastName" type="string"/>
-		<primitive isSubtree="true" name="email" type="email" optional="true"/>
-		<primitive isSubtree="true" name="affiliation" type="affiliation" optional="true"/>
+		<primitive subtree="true" name="firstName" type="string"/>
+		<primitive subtree="true" name="secondNames" type="string[]" optional="true"/>
+		<primitive subtree="true" name="lastName" type="string"/>
+		<primitive subtree="true" name="email" type="email" optional="true"/>
+		<primitive subtree="true" name="affiliation" type="affiliation" optional="true"/>
 	</struct>
 
 	<!-- wrapper author tag to allow specifying no authors whatsoever. But if
-- 
cgit v1.2.3