grammars/biblio.rng in relaton-ogc-1.13.0 vs grammars/biblio.rng in relaton-ogc-1.14.0
- old
+ new
@@ -31,13 +31,14 @@
<define name="ISO8601Date">
<data type="string">
<param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
</data>
</define>
- <start>
- <ref name="bibitem"/>
- </start>
+ <!-- start = bibitem -->
+ <define name="BibData">
+ <ref name="BibliographicItem"/>
+ </define>
<define name="status">
<element name="status">
<ref name="stage"/>
<optional>
<ref name="substage"/>
@@ -71,12 +72,18 @@
<define name="language">
<element name="language">
<text/>
</element>
</define>
- <define name="script">
+ <define name="locale">
<a:documentation>ISO-639</a:documentation>
+ <element name="locale">
+ <text/>
+ </element>
+ </define>
+ <define name="script">
+ <a:documentation>ISO-3166</a:documentation>
<element name="script">
<text/>
</element>
</define>
<define name="edition">
@@ -92,10 +99,13 @@
<optional>
<!-- multiple languages and scripts possible: comma delimit them if so -->
<attribute name="language"/>
</optional>
<optional>
+ <attribute name="locale"/>
+ </optional>
+ <optional>
<attribute name="script"/>
</optional>
<text/>
</define>
<define name="LocalizedString">
@@ -135,10 +145,13 @@
<optional>
<!-- multiple languages and scripts possible: comma delimit them if so -->
<attribute name="language"/>
</optional>
<optional>
+ <attribute name="locale"/>
+ </optional>
+ <optional>
<attribute name="script"/>
</optional>
<oneOrMore>
<choice>
<text/>
@@ -156,31 +169,34 @@
</oneOrMore>
</choice>
</define>
<define name="contributor">
<element name="contributor">
- <zeroOrMore>
+ <oneOrMore>
<ref name="role"/>
- </zeroOrMore>
+ </oneOrMore>
<ref name="ContributorInfo"/>
</element>
</define>
<define name="role">
<element name="role">
- <optional>
- <attribute name="type">
- <choice>
- <value>author</value>
- <value>performer</value>
- <value>publisher</value>
- <value>editor</value>
- <value>adapter</value>
- <value>translator</value>
- <value>distributor</value>
- </choice>
- </attribute>
- </optional>
+ <attribute name="type">
+ <choice>
+ <value>author</value>
+ <value>performer</value>
+ <value>publisher</value>
+ <value>editor</value>
+ <value>adapter</value>
+ <value>translator</value>
+ <value>distributor</value>
+ <value>realizer</value>
+ <value>owner</value>
+ <value>authorizer</value>
+ <value>enabler</value>
+ <value>subject</value>
+ </choice>
+ </attribute>
<zeroOrMore>
<ref name="roledescription"/>
</zeroOrMore>
</element>
</define>
@@ -498,10 +514,21 @@
<ref name="BibItemLocality"/>
</element>
</define>
<define name="localityStack">
<element name="localityStack">
+ <optional>
+ <attribute name="connective">
+ <choice>
+ <value>and</value>
+ <value>or</value>
+ <value>from</value>
+ <value>to</value>
+ <value/>
+ </choice>
+ </attribute>
+ </optional>
<zeroOrMore>
<ref name="locality"/>
</zeroOrMore>
</element>
</define>
@@ -510,10 +537,21 @@
<ref name="BibItemLocality"/>
</element>
</define>
<define name="sourceLocalityStack">
<element name="sourceLocalityStack">
+ <optional>
+ <attribute name="connective">
+ <choice>
+ <value>and</value>
+ <value>or</value>
+ <value>from</value>
+ <value>to</value>
+ <value/>
+ </choice>
+ </attribute>
+ </optional>
<zeroOrMore>
<ref name="sourceLocality"/>
</zeroOrMore>
</element>
</define>
@@ -613,10 +651,13 @@
<attribute name="type">
<ref name="BibItemType"/>
</attribute>
</optional>
<optional>
+ <attribute name="schema-version"/>
+ </optional>
+ <optional>
<ref name="fetched"/>
</optional>
<optional>
<ref name="formattedref"/>
</optional>
@@ -649,10 +690,13 @@
</zeroOrMore>
<zeroOrMore>
<ref name="language"/>
</zeroOrMore>
<zeroOrMore>
+ <ref name="locale"/>
+ </zeroOrMore>
+ <zeroOrMore>
<ref name="script"/>
</zeroOrMore>
<zeroOrMore>
<ref name="bibabstract"/>
</zeroOrMore>
@@ -704,10 +748,13 @@
<attribute name="type">
<ref name="BibItemType"/>
</attribute>
</optional>
<optional>
+ <attribute name="schema-version"/>
+ </optional>
+ <optional>
<ref name="fetched"/>
</optional>
<optional>
<ref name="formattedref"/>
</optional>
@@ -740,10 +787,13 @@
</zeroOrMore>
<zeroOrMore>
<ref name="language"/>
</zeroOrMore>
<zeroOrMore>
+ <ref name="locale"/>
+ </zeroOrMore>
+ <zeroOrMore>
<ref name="script"/>
</zeroOrMore>
<zeroOrMore>
<ref name="bibabstract"/>
</zeroOrMore>
@@ -852,10 +902,19 @@
<!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
<define name="TypedUri">
<optional>
<attribute name="type"/>
</optional>
+ <optional>
+ <attribute name="language"/>
+ </optional>
+ <optional>
+ <attribute name="locale"/>
+ </optional>
+ <optional>
+ <attribute name="script"/>
+ </optional>
<data type="anyURI"/>
</define>
<define name="DateType">
<optional>
<attribute name="text"/>
@@ -880,10 +939,11 @@
<value>circulated</value>
<value>adapted</value>
<value>vote-started</value>
<value>vote-ended</value>
<value>announced</value>
+ <value>stable-until</value>
</choice>
</define>
<define name="bdate">
<element name="date">
<attribute name="type">
@@ -927,9 +987,12 @@
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="language"/>
+ </optional>
+ <optional>
+ <attribute name="locale"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<text/>