diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/ontology/bibliography.osxml (renamed from data/domain/bibliography.osxml) | 8 | ||||
| -rw-r--r-- | data/ontology/book.osxml (renamed from data/domain/book.osxml) | 4 | ||||
| -rw-r--r-- | data/ontology/comments.osxml (renamed from data/domain/comments.osxml) | 6 | ||||
| -rw-r--r-- | data/ontology/headings.osxml (renamed from data/domain/headings.osxml) | 8 | ||||
| -rw-r--r-- | data/ontology/lists.osxml (renamed from data/domain/lists.osxml) | 6 | ||||
| -rw-r--r-- | data/ontology/meta.osxml (renamed from data/domain/meta.osxml) | 11 |
6 files changed, 22 insertions, 21 deletions
diff --git a/data/domain/bibliography.osxml b/data/ontology/bibliography.osxml index 5953e5f..e133a2b 100644 --- a/data/domain/bibliography.osxml +++ b/data/ontology/bibliography.osxml @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<domain name="bibliography"> +<ontology name="bibliography"> - <import rel="domain" src="book"/> - <import rel="domain" src="meta"/> + <import rel="ontology" src="book"/> + <import rel="ontology" src="meta"/> <struct name="bibliography" transparent="true"> <field> @@ -39,4 +39,4 @@ <!-- here some kind of database reference would be better --> <primitive type="string"/> </struct> -</domain> +</ontology> diff --git a/data/domain/book.osxml b/data/ontology/book.osxml index 8ec60ed..41dc788 100644 --- a/data/domain/book.osxml +++ b/data/ontology/book.osxml @@ -1,5 +1,5 @@ <?xml version="1.0" standalone="yes"?> -<domain name="book"> +<ontology name="book"> <struct name="book" cardinality="{1}" isRoot="true"> <field> <childRef ref="book.chapter"/> @@ -31,4 +31,4 @@ <struct name="text" transparent="true"> <primitive type="string"/> </struct> -</domain> +</ontology> diff --git a/data/domain/comments.osxml b/data/ontology/comments.osxml index cb19bd4..621fe1c 100644 --- a/data/domain/comments.osxml +++ b/data/ontology/comments.osxml @@ -1,6 +1,6 @@ <?xml version="1.0" standalone="yes"?> -<domain name="comments"> - <import rel="domain" src="book"/> +<ontology name="comments"> + <import rel="ontology" src="book"/> <!-- an annotation comment --> <annotation name="comment"> @@ -37,4 +37,4 @@ <childRef ref="book.paragraph"/> </field> </struct> -</domain> +</ontology> diff --git a/data/domain/headings.osxml b/data/ontology/headings.osxml index 055a204..1319306 100644 --- a/data/domain/headings.osxml +++ b/data/ontology/headings.osxml @@ -1,7 +1,7 @@ <?xml version="1.0" standalone="yes"?> -<domain name="headings"> +<ontology name="headings"> - <import rel="domain" src="book"/> + <import rel="ontology" src="book"/> <struct name="heading" cardinality="1" transparent="true"> <!-- The parent mechanism is a curious thing. Remind yourself @@ -26,8 +26,8 @@ <!-- 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 bit of content that a paragraph would allow - also considering - possible extensions of paragraph by other domains. + possible extensions of paragraph by other ontologys. So we need to reference the default field of paragraph. --> <fieldRef ref="book.paragraph.$default"/> </struct> -</domain> +</ontology> diff --git a/data/domain/lists.osxml b/data/ontology/lists.osxml index 66e77cb..a177cd4 100644 --- a/data/domain/lists.osxml +++ b/data/ontology/lists.osxml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<domain name="lists"> - <import rel="domain" src="book"/> +<ontology name="lists"> + <import rel="ontology" src="book"/> <struct name="ul" isa="book.paragraph"> <!-- Here we solve the problem of parents using the isa @@ -23,4 +23,4 @@ <childRef name="book.paragaph"/> </field> </struct> -</domain> +</ontology> diff --git a/data/domain/meta.osxml b/data/ontology/meta.osxml index d214921..6b25305 100644 --- a/data/domain/meta.osxml +++ b/data/ontology/meta.osxml @@ -1,15 +1,15 @@ <?xml version="1.0"?> -<domain name="meta"> +<ontology name="meta"> <import rel="typesystem" src="affiliation"/> <import rel="typesystem" src="email"/> <import rel="typesystem" src="version"/> - <import rel="domain" src="book"/> - <import rel="domain" src="headings"/> + <import rel="ontology" src="book"/> + <import rel="ontology" src="headings"/> <struct name="meta" cardinality="{1}" transparent="true"> <field> - <childRef ref="author"/> + <childRef ref="authors"/> <childRef ref="version"/> </field> <parentRef ref="book"> @@ -23,6 +23,7 @@ <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"/> @@ -46,4 +47,4 @@ <struct name="version" cardinality="{0-1}"> <primitive type="version"/> </struct> -</domain> +</ontology> |