Merge branch 'master' of ssh://somweyr.de/var/local/git/ousia

3 files changed, 20 insertions, 8 deletions

diff --git a/testdata/osmlparser/simple_book.osml b/testdata/osmlparser/simple_book.osml
index 19f5543..21751b9 100644
--- a/testdata/osmlparser/simple_book.osml
+++ b/testdata/osmlparser/simple_book.osml
@@ -1,19 +1,31 @@
 \import[domain]{../osxmlparser/book_domain.osxml}
 \import[domain]{../osxmlparser/headings_domain.osxml}
 
+%\domain#stuff
+%	\import[typesystem]{../osxmlparser/color.osxml}
+%	\struct#fancy
+%		\primitive#bla[type=color]
+%		\parentRef[ref=book]
+%			\fieldRef[ref=$default]
+
 \begin{book}
 This might be some introductory text or a dedication.
 
-\chapter#myFirstChapter
-\heading{My first chapter}
+\chapter#myFirstChapter{My first chapter}
 Here we might have an introduction to the chapter.
 
 \section#myFirstSection
 \heading{A rather curious experiment}
-Here we might find the actual section content.
+\paragraph{!Here we might find the actual section content.
+\heading{test}}
 
 \section#mySndSection
 Here we might find the actual section content.
 
+
+bla
+
+%\fancy{aquamarine}
+
 \end{book}
 
diff --git a/testdata/osxmlparser/bibliography_domain.osxml b/testdata/osxmlparser/bibliography_domain.osxml
index 6418c61..53ba531 100644
--- a/testdata/osxmlparser/bibliography_domain.osxml
+++ b/testdata/osxmlparser/bibliography_domain.osxml
@@ -13,14 +13,14 @@
 		</parentRef>
 	</struct>
 	<struct name="bibEntry">
-		<field name="authors" optional="true">
-			<childRef ref="meta.author"/>
-		</field>
 		<primitive name="name" type="string" isSubtree="true"/>
 		<primitive name="year" type="int" isSubtree="true"/>
 		<primitive name="journal" type="string" isSubtree="true" optional="true"/>
 		<primitive name="pages" type="cardinality" isSubtree="true" optional="true"/>
 		<!-- Here a geographical enum or something would be more exact -->
 		<primitive name="location" type="string" isSubtree="true" optional="true"/>
+		<field name="authors" optional="true">
+			<childRef ref="meta.author"/>
+		</field>
 	</struct>
 </domain>
diff --git a/testdata/osxmlparser/book_domain.osxml b/testdata/osxmlparser/book_domain.osxml
index 4218915..5a8cc67 100644
--- a/testdata/osxmlparser/book_domain.osxml
+++ b/testdata/osxmlparser/book_domain.osxml
@@ -75,7 +75,7 @@
 			<childRef ref="book.paragraph"/>
 		</field>
 	</struct>
-	<struct name="paragraph" transparent="true" role="paragraph">
+	<struct name="paragraph" transparent="true">
 	<!-- implicitly:
 	<struct name="subsection" isRoot="false" cardinality="{*}"
 	                 transparent="true" isa="" attributesDescriptor="">
@@ -87,7 +87,7 @@
 			<childRef ref="book.text"/>
 		</field>
 	</struct>
-	<struct name="text" transparent="true" role="text">
+	<struct name="text" transparent="true">
 	<!-- implicitly:
 	<struct name="text" isRoot="false" cardinality="{*}"
 	                 transparent="true" isa="" attributesDescriptor="">