lib/asciidoctor/bipm/bipm.rng in metanorma-bipm-0.0.2 vs lib/asciidoctor/bipm/bipm.rng in metanorma-bipm-0.0.3
- old
+ new
@@ -43,10 +43,154 @@
</attribute>
</optional>
<text/>
</element>
</define>
+ <define name="Clause-Section">
+ <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>
+ <optional>
+ <attribute name="obligation">
+ <choice>
+ <value>normative</value>
+ <value>informative</value>
+ </choice>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="type"/>
+ </optional>
+ <optional>
+ <attribute name="unnumbered">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <ref name="section-title"/>
+ </optional>
+ <group>
+ <choice>
+ <group>
+ <zeroOrMore>
+ <ref name="BasicBlock"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="note"/>
+ </zeroOrMore>
+ </group>
+ <ref name="amend"/>
+ </choice>
+ <zeroOrMore>
+ <choice>
+ <ref name="clause-subsection"/>
+ <ref name="terms"/>
+ <ref name="definitions"/>
+ </choice>
+ </zeroOrMore>
+ </group>
+ </define>
+ <define name="Annex-Section">
+ <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>
+ <optional>
+ <attribute name="obligation">
+ <choice>
+ <value>normative</value>
+ <value>informative</value>
+ </choice>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="unnumbered">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <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>
+ </define>
+ <define name="ol">
+ <element name="ol">
+ <attribute name="id">
+ <data type="ID"/>
+ </attribute>
+ <optional>
+ <attribute name="keep-with-next">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="keep-lines-together">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <attribute name="type">
+ <choice>
+ <value>roman</value>
+ <value>alphabet</value>
+ <value>arabic</value>
+ <value>roman_upper</value>
+ <value>alphabet_upper</value>
+ </choice>
+ </attribute>
+ <optional>
+ <attribute name="start"/>
+ </optional>
+ <oneOrMore>
+ <ref name="li"/>
+ </oneOrMore>
+ <zeroOrMore>
+ <ref name="note"/>
+ </zeroOrMore>
+ </element>
+ </define>
<define name="DocumentType">
<choice>
<value>brochure</value>
<value>mise-en-pratique</value>
<value>rapport</value>
@@ -96,10 +240,13 @@
<ref name="comment-period"/>
</optional>
<optional>
<ref name="si-aspect"/>
</optional>
+ <optional>
+ <ref name="meeting-note"/>
+ </optional>
<ref name="structuredidentifier"/>
</define>
</include>
<define name="comment-period">
<element name="comment-period">
@@ -130,33 +277,44 @@
</choice>
</element>
</define>
<define name="committee">
<element name="committee">
- <choice>
- <value>CGPM</value>
- <value>CIPM</value>
- <value>BIPM</value>
- <value>CCAUV</value>
- <value>CCEM</value>
- <value>CCL</value>
- <value>CCM</value>
- <value>CCPR</value>
- <value>CCQM</value>
- <value>CCRI</value>
- <value>CCT</value>
- <value>CCTF</value>
- <value>CCU</value>
- <value>CCL-CCTF</value>
- <value>JCGM</value>
- <value>JCRB</value>
- <value>JCTLM</value>
- <value>INetQI</value>
- </choice>
+ <attribute name="acronym">
+ <choice>
+ <value>CGPM</value>
+ <value>CIPM</value>
+ <value>BIPM</value>
+ <value>CCAUV</value>
+ <value>CCEM</value>
+ <value>CCL</value>
+ <value>CCM</value>
+ <value>CCPR</value>
+ <value>CCQM</value>
+ <value>CCRI</value>
+ <value>CCT</value>
+ <value>CCTF</value>
+ <value>CCU</value>
+ <value>CCL-CCTF</value>
+ <value>JCGM</value>
+ <value>JCRB</value>
+ <value>JCTLM</value>
+ <value>INetQI</value>
+ </choice>
+ </attribute>
+ <ref name="LocalizedString"/>
</element>
</define>
<define name="workgroup">
<element name="workgroup">
+ <optional>
+ <attribute name="acronym"/>
+ </optional>
+ <text/>
+ </element>
+ </define>
+ <define name="meeting-note">
+ <element name="meeting-note">
<text/>
</element>
</define>
<define name="bipm-standard">
<element name="bipm-standard">