lib/asciidoctor/csd/biblio.rng in metanorma-csd-1.3.21 vs lib/asciidoctor/csd/biblio.rng in metanorma-csd-1.3.22
- old
+ new
@@ -86,20 +86,30 @@
<attribute name="number"/>
</optional>
<text/>
</element>
</define>
- <define name="LocalizedString">
+ <define name="LocalizedString1">
<optional>
<!-- multiple languages and scripts possible: comma delimit them if so -->
<attribute name="language"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<text/>
</define>
+ <define name="LocalizedString">
+ <choice>
+ <ref name="LocalizedString1"/>
+ <oneOrMore>
+ <element name="variant">
+ <ref name="LocalizedString1"/>
+ </element>
+ </oneOrMore>
+ </choice>
+ </define>
<!--
Unlike UML, change type to format: type is overloaded
Would be need if plain were default value and could omit the attribute
Added LocalizedStringOrXsAny
-->
@@ -119,11 +129,11 @@
</choice>
</attribute>
</optional>
<ref name="LocalizedStringOrXsAny"/>
</define>
- <define name="LocalizedStringOrXsAny">
+ <define name="LocalizedStringOrXsAny1">
<optional>
<!-- multiple languages and scripts possible: comma delimit them if so -->
<attribute name="language"/>
</optional>
<optional>
@@ -133,9 +143,19 @@
<choice>
<text/>
<ref name="AnyElement"/>
</choice>
</oneOrMore>
+ </define>
+ <define name="LocalizedStringOrXsAny">
+ <choice>
+ <ref name="LocalizedStringOrXsAny1"/>
+ <oneOrMore>
+ <element name="variant">
+ <ref name="LocalizedStringOrXsAny1"/>
+ </element>
+ </oneOrMore>
+ </choice>
</define>
<define name="contributor">
<element name="contributor">
<zeroOrMore>
<ref name="role"/>