grammars/isostandard.rng in relaton-cen-1.11.1 vs grammars/isostandard.rng in relaton-cen-1.12.0
- old
+ new
@@ -43,10 +43,13 @@
</optional>
<optional>
<ref name="horizontal"/>
</optional>
<ref name="editorialgroup"/>
+ <optional>
+ <ref name="approvalgroup"/>
+ </optional>
<zeroOrMore>
<ref name="ics"/>
</zeroOrMore>
<ref name="structuredidentifier"/>
<optional>
@@ -247,10 +250,11 @@
<value>danger</value>
<value>caution</value>
<value>warning</value>
<value>important</value>
<value>safety precautions</value>
+ <value>editorial</value>
</choice>
</define>
<define name="preface">
<element name="preface">
<optional>
@@ -306,22 +310,11 @@
<ref name="Content-Section"/>
</element>
</define>
<define name="editorialgroup">
<element name="editorialgroup">
- <oneOrMore>
- <ref name="technical-committee"/>
- </oneOrMore>
- <zeroOrMore>
- <ref name="subcommittee"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="workgroup"/>
- </zeroOrMore>
- <optional>
- <ref name="secretariat"/>
- </optional>
+ <ref name="ISOProjectGroup"/>
</element>
</define>
<define name="Content-Section">
<optional>
<attribute name="id">
@@ -365,9 +358,36 @@
</oneOrMore>
</choice>
</define>
</include>
<!-- end overrides -->
+ <define name="ISOProjectGroup">
+ <zeroOrMore>
+ <ref name="agency"/>
+ </zeroOrMore>
+ <oneOrMore>
+ <ref name="technical-committee"/>
+ </oneOrMore>
+ <zeroOrMore>
+ <ref name="subcommittee"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="workgroup"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="secretariat"/>
+ </optional>
+ </define>
+ <define name="approvalgroup">
+ <element name="approvalgroup">
+ <ref name="ISOProjectGroup"/>
+ </element>
+ </define>
+ <define name="agency">
+ <element name="agency">
+ <text/>
+ </element>
+ </define>
<!--
We display the Normative References between scope and terms; but to keep the
grammar simple, we keep the references together
-->
<define name="iso-standard">