grammars/biblio.rng in relaton-iec-1.17.0 vs grammars/biblio.rng in relaton-iec-1.18.0
- old
+ new
@@ -239,10 +239,13 @@
<element name="credential">
<text/>
</element>
</define>
<define name="FullNameType">
+ <optional>
+ <ref name="name_abbreviation"/>
+ </optional>
<choice>
<group>
<zeroOrMore>
<ref name="prefix"/>
</zeroOrMore>
@@ -264,10 +267,15 @@
</zeroOrMore>
<zeroOrMore>
<ref name="variantname"/>
</zeroOrMore>
</define>
+ <define name="name_abbreviation">
+ <element name="abbreviation">
+ <ref name="LocalizedString"/>
+ </element>
+ </define>
<define name="prefix">
<element name="prefix">
<ref name="LocalizedString"/>
</element>
</define>
@@ -346,10 +354,13 @@
<ref name="org-identifier"/>
</zeroOrMore>
<zeroOrMore>
<ref name="contact"/>
</zeroOrMore>
+ <optional>
+ <ref name="logo"/>
+ </optional>
</element>
</define>
<define name="orgname">
<element name="name">
<choice>
@@ -364,10 +375,25 @@
<ref name="LocalizedString"/>
<ref name="NameWithVariants"/>
</choice>
</element>
</define>
+ <define name="logo">
+ <element name="logo">
+ <ref name="image"/>
+ </element>
+ </define>
+ <define name="depiction">
+ <element name="depiction">
+ <optional>
+ <attribute name="scope"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="image"/>
+ </zeroOrMore>
+ </element>
+ </define>
<define name="NameWithVariants">
<element name="primary">
<ref name="LocalizedString"/>
</element>
<zeroOrMore>
@@ -750,10 +776,13 @@
<ref name="bkeyword"/>
</zeroOrMore>
<optional>
<ref name="validity"/>
</optional>
+ <optional>
+ <ref name="depiction"/>
+ </optional>
</define>
<define name="ReducedBibliographicItem">
<optional>
<attribute name="type">
<ref name="BibItemType"/>
@@ -846,9 +875,12 @@
<zeroOrMore>
<ref name="bkeyword"/>
</zeroOrMore>
<optional>
<ref name="validity"/>
+ </optional>
+ <optional>
+ <ref name="depiction"/>
</optional>
</define>
<define name="btitle">
<element name="title">
<ref name="TypedTitleString"/>