grammars/biblio.rng in relaton-ogc-1.11.1 vs grammars/biblio.rng in relaton-ogc-1.12.0
- old
+ new
@@ -525,11 +525,11 @@
<ref name="referenceTo"/>
</optional>
</define>
<define name="LocalityType">
<data type="string">
- <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+ <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
</data>
</define>
<define name="referenceFrom">
<element name="referenceFrom">
<text/>
@@ -612,20 +612,111 @@
</attribute>
</optional>
<optional>
<ref name="fetched"/>
</optional>
- <choice>
- <oneOrMore>
- <ref name="btitle"/>
- </oneOrMore>
+ <optional>
<ref name="formattedref"/>
- </choice>
+ </optional>
+ <oneOrMore>
+ <ref name="btitle"/>
+ </oneOrMore>
<zeroOrMore>
<ref name="bsource"/>
</zeroOrMore>
+ <oneOrMore>
+ <ref name="docidentifier"/>
+ </oneOrMore>
+ <optional>
+ <ref name="docnumber"/>
+ </optional>
<zeroOrMore>
+ <ref name="bdate"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="contributor"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="edition"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="version"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="biblionote"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="language"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="script"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="bibabstract"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="status"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="copyright"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="docrelation"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="series"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="medium"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="bplace"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="bprice"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="extent"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="bibliographic_size"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="accesslocation"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="license"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="bclassification"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="bkeyword"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="validity"/>
+ </optional>
+ </define>
+ <define name="ReducedBibliographicItem">
+ <optional>
+ <attribute name="type">
+ <ref name="BibItemType"/>
+ </attribute>
+ </optional>
+ <optional>
+ <ref name="fetched"/>
+ </optional>
+ <optional>
+ <ref name="formattedref"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="btitle"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="bsource"/>
+ </zeroOrMore>
+ <zeroOrMore>
<ref name="docidentifier"/>
</zeroOrMore>
<optional>
<ref name="docnumber"/>
</optional>
@@ -636,13 +727,13 @@
<ref name="contributor"/>
</zeroOrMore>
<optional>
<ref name="edition"/>
</optional>
- <optional>
+ <zeroOrMore>
<ref name="version"/>
- </optional>
+ </zeroOrMore>
<zeroOrMore>
<ref name="biblionote"/>
</zeroOrMore>
<zeroOrMore>
<ref name="language"/>
@@ -831,10 +922,16 @@
<optional>
<attribute name="primary">
<data type="boolean"/>
</attribute>
</optional>
+ <optional>
+ <attribute name="language"/>
+ </optional>
+ <optional>
+ <attribute name="script"/>
+ </optional>
<text/>
</element>
</define>
<define name="docnumber">
<element name="docnumber">
@@ -849,21 +946,50 @@
<text/>
</element>
</define>
<define name="bplace">
<element name="place">
- <optional>
- <attribute name="uri">
- <data type="anyURI"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="region"/>
- </optional>
+ <choice>
+ <text/>
+ <group>
+ <ref name="bibliocity"/>
+ <zeroOrMore>
+ <ref name="biblioregion"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="bibliocountry"/>
+ </zeroOrMore>
+ </group>
+ </choice>
+ </element>
+ </define>
+ <define name="bibliocity">
+ <element name="city">
<text/>
</element>
</define>
+ <define name="biblioregion">
+ <element name="region">
+ <ref name="RegionType"/>
+ </element>
+ </define>
+ <define name="bibliocountry">
+ <element name="country">
+ <ref name="RegionType"/>
+ </element>
+ </define>
+ <define name="RegionType">
+ <optional>
+ <attribute name="iso"/>
+ </optional>
+ <optional>
+ <attribute name="recommended">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <text/>
+ </define>
<define name="bprice">
<element name="price">
<attribute name="currency"/>
<text/>
</element>
@@ -955,40 +1081,38 @@
<optional>
<attribute name="type">
<ref name="SeriesType"/>
</attribute>
</optional>
- <choice>
+ <optional>
<ref name="formattedref"/>
- <group>
- <ref name="btitle"/>
- <optional>
- <ref name="bplace"/>
- </optional>
- <optional>
- <ref name="seriesorganization"/>
- </optional>
- <optional>
- <ref name="abbreviation"/>
- </optional>
- <optional>
- <ref name="seriesfrom"/>
- </optional>
- <optional>
- <ref name="seriesto"/>
- </optional>
- <optional>
- <ref name="seriesnumber"/>
- </optional>
- <optional>
- <ref name="seriespartnumber"/>
- </optional>
- <optional>
- <ref name="seriesrun"/>
- </optional>
- </group>
- </choice>
+ </optional>
+ <ref name="btitle"/>
+ <optional>
+ <ref name="bplace"/>
+ </optional>
+ <optional>
+ <ref name="seriesorganization"/>
+ </optional>
+ <optional>
+ <ref name="abbreviation"/>
+ </optional>
+ <optional>
+ <ref name="seriesfrom"/>
+ </optional>
+ <optional>
+ <ref name="seriesto"/>
+ </optional>
+ <optional>
+ <ref name="seriesnumber"/>
+ </optional>
+ <optional>
+ <ref name="seriespartnumber"/>
+ </optional>
+ <optional>
+ <ref name="seriesrun"/>
+ </optional>
</element>
</define>
<define name="SeriesType">
<choice>
<value>main</value>
@@ -1143,11 +1267,11 @@
<element name="description">
<ref name="FormattedString"/>
</element>
</optional>
<element name="bibitem">
- <ref name="BibliographicItem"/>
+ <ref name="ReducedBibliographicItem"/>
</element>
<choice>
<zeroOrMore>
<ref name="locality"/>
</zeroOrMore>
@@ -1168,12 +1292,12 @@
<define name="version">
<element name="version">
<optional>
<ref name="revision-date"/>
</optional>
- <zeroOrMore>
+ <optional>
<ref name="draft"/>
- </zeroOrMore>
+ </optional>
</element>
</define>
<define name="vedition">
<element name="edition">
<data type="int"/>