lib/asciidoctor/mpfd/isodoc.rng in metanorma-mpfd-0.1.4 vs lib/asciidoctor/mpfd/isodoc.rng in metanorma-mpfd-0.1.5
- old
+ new
@@ -38,13 +38,10 @@
</start>
<define name="standard-document">
<element name="standard-document">
<ref name="bibdata"/>
<optional>
- <ref name="version"/>
- </optional>
- <optional>
<ref name="preface"/>
</optional>
<ref name="sections"/>
<zeroOrMore>
<ref name="annex"/>
@@ -57,38 +54,10 @@
<define name="bibdata">
<element name="bibdata">
<ref name="BibData"/>
</element>
</define>
- <define name="version">
- <element name="version">
- <optional>
- <ref name="vedition"/>
- </optional>
- <optional>
- <ref name="revision-date"/>
- </optional>
- <zeroOrMore>
- <ref name="draft"/>
- </zeroOrMore>
- </element>
- </define>
- <define name="vedition">
- <element name="edition">
- <data type="int"/>
- </element>
- </define>
- <define name="revision-date">
- <element name="revision-date">
- <data type="date"/>
- </element>
- </define>
- <define name="draft">
- <element name="draft">
- <text/>
- </element>
- </define>
<define name="preface">
<element name="preface">
<oneOrMore>
<ref name="content"/>
</oneOrMore>
@@ -1065,9 +1034,12 @@
<zeroOrMore>
<ref name="contributor"/>
</zeroOrMore>
<optional>
<ref name="edition"/>
+ </optional>
+ <optional>
+ <ref name="version"/>
</optional>
<zeroOrMore>
<ref name="biblionote"/>
</zeroOrMore>
<zeroOrMore>