grammars/isodoc.rng in relaton-un-1.6.0 vs grammars/isodoc.rng in relaton-un-1.7.0
- old
+ new
@@ -22,10 +22,18 @@
<!-- include "biblio.rnc" { } -->
<include href="basicdoc.rng">
<start>
<ref name="standard-document"/>
</start>
+ <define name="doctype">
+ <element name="doctype">
+ <optional>
+ <attribute name="abbreviation"/>
+ </optional>
+ <ref name="DocumentType"/>
+ </element>
+ </define>
<define name="hyperlink">
<element name="link">
<attribute name="target">
<data type="anyURI"/>
</attribute>
@@ -139,10 +147,15 @@
<optional>
<attribute name="keep-lines-together">
<data type="boolean"/>
</attribute>
</optional>
+ <optional>
+ <attribute name="key">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
<oneOrMore>
<ref name="dt"/>
<ref name="dd"/>
</oneOrMore>
<zeroOrMore>
@@ -1162,52 +1175,10 @@
<ref name="Annex-Section"/>
</element>
</define>
<define name="annex">
<element name="annex">
- <optional>
- <attribute name="id">
- <data type="ID"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="language"/>
- </optional>
- <optional>
- <attribute name="script"/>
- </optional>
- <optional>
- <attribute name="inline-header">
- <data type="boolean"/>
- </attribute>
- </optional>
- <attribute name="obligation">
- <choice>
- <value>normative</value>
- <value>informative</value>
- </choice>
- </attribute>
- <optional>
- <ref name="section-title"/>
- </optional>
- <group>
- <group>
- <zeroOrMore>
- <ref name="BasicBlock"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="note"/>
- </zeroOrMore>
- </group>
- <zeroOrMore>
- <choice>
- <ref name="annex-subsection"/>
- <ref name="terms"/>
- <ref name="definitions"/>
- <ref name="references"/>
- </choice>
- </zeroOrMore>
- </group>
+ <ref name="Annex-Section"/>
</element>
</define>
<define name="terms">
<element name="terms">
<optional>