lib/asciidoctor/csd/csd.rng in metanorma-csd-1.1.4 vs lib/asciidoctor/csd/csd.rng in metanorma-csd-1.2.0
- old
+ new
@@ -8,42 +8,10 @@
-->
<include href="isostandard.rng">
<start>
<ref name="csd-standard"/>
</start>
- <define name="language">
- <element name="language">
- <value>en</value>
- </element>
- </define>
- <define name="docidentifier">
- <element name="docidentifier">
- <optional>
- <attribute name="type"/>
- </optional>
- <text/>
- </element>
- </define>
- <define name="btitle">
- <element name="title">
- <ref name="FormattedString"/>
- </element>
- </define>
- <define name="status">
- <element name="status">
- <choice>
- <value>proposal</value>
- <value>working-draft</value>
- <value>committee-draft</value>
- <value>draft-standard</value>
- <value>final-draft</value>
- <value>published</value>
- <value>withdrawn</value>
- <ref name="LocalizedString"/>
- </choice>
- </element>
- </define>
<define name="figure">
<element name="figure">
<attribute name="id">
<data type="ID"/>
</attribute>
@@ -72,11 +40,11 @@
</optional>
</group>
</choice>
</element>
</define>
- <define name="BibItemType">
+ <define name="DocumentType">
<choice>
<value>directive</value>
<value>guide</value>
<value>specification</value>
<value>standard</value>
@@ -85,178 +53,18 @@
<value>amendment</value>
<value>technical corrigendum</value>
<value>advisory</value>
</choice>
</define>
- <define name="BibliographicItem">
+ <define name="BibDataExtensionType">
<optional>
- <attribute name="type">
- <ref name="BibItemType"/>
- </attribute>
+ <ref name="doctype"/>
</optional>
- <optional>
- <ref name="fetched"/>
- </optional>
- <choice>
- <oneOrMore>
- <ref name="btitle"/>
- </oneOrMore>
- <ref name="formattedref"/>
- </choice>
- <zeroOrMore>
- <ref name="bsource"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="docidentifier"/>
- </zeroOrMore>
- <optional>
- <ref name="docnumber"/>
- </optional>
- <zeroOrMore>
- <ref name="bdate"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="contributor"/>
- </zeroOrMore>
- <optional>
- <ref name="edition"/>
- </optional>
- <optional>
- <ref name="version"/>
- </optional>
- <zeroOrMore>
- <ref name="biblionote"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="language"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="script"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="abstract"/>
- </zeroOrMore>
- <optional>
- <ref name="status"/>
- </optional>
- <optional>
- <ref name="copyright"/>
- </optional>
- <zeroOrMore>
- <ref name="docrelation"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="series"/>
- </zeroOrMore>
- <optional>
- <ref name="medium"/>
- </optional>
- <zeroOrMore>
- <ref name="bplace"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="extent"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="accesslocation"/>
- </zeroOrMore>
- <optional>
- <ref name="bclassification"/>
- </optional>
- <optional>
- <ref name="validity"/>
- </optional>
- <optional>
- <ref name="editorialgroup"/>
- </optional>
- <zeroOrMore>
- <ref name="ics"/>
- </zeroOrMore>
- <optional>
- <ref name="allParts"/>
- </optional>
- </define>
- <define name="BibData">
- <optional>
- <attribute name="type">
- <ref name="BibItemType"/>
- </attribute>
- </optional>
- <oneOrMore>
- <ref name="btitle"/>
- </oneOrMore>
- <optional>
- <ref name="formattedref"/>
- </optional>
- <zeroOrMore>
- <ref name="bsource"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="docidentifier"/>
- </zeroOrMore>
- <optional>
- <ref name="docnumber"/>
- </optional>
- <zeroOrMore>
- <ref name="bdate"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="contributor"/>
- </zeroOrMore>
- <optional>
- <ref name="edition"/>
- </optional>
- <optional>
- <ref name="version"/>
- </optional>
- <zeroOrMore>
- <ref name="biblionote"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="language"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="script"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="abstract"/>
- </zeroOrMore>
- <optional>
- <ref name="status"/>
- </optional>
- <ref name="copyright"/>
- <zeroOrMore>
- <ref name="docrelation"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="series"/>
- </zeroOrMore>
- <optional>
- <ref name="medium"/>
- </optional>
- <zeroOrMore>
- <ref name="bplace"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="extent"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="accesslocation"/>
- </zeroOrMore>
- <optional>
- <ref name="bclassification"/>
- </optional>
- <optional>
- <ref name="validity"/>
- </optional>
<ref name="editorialgroup"/>
<zeroOrMore>
<ref name="ics"/>
</zeroOrMore>
- <optional>
- <ref name="allParts"/>
- </optional>
</define>
<define name="editorialgroup">
<element name="editorialgroup">
<oneOrMore>
<ref name="technical-committee"/>
@@ -276,9 +84,12 @@
<element name="csd-standard">
<ref name="bibdata"/>
<zeroOrMore>
<ref name="termdocsource"/>
</zeroOrMore>
+ <optional>
+ <ref name="boilerplate"/>
+ </optional>
<ref name="preface"/>
<oneOrMore>
<ref name="sections"/>
</oneOrMore>
<zeroOrMore>