biblio.rng in metanorma-itu-2.4.8

- old
+ new

@@ -120,10 +120,27 @@
           <ref name="LocalizedString1"/>
         </element>
       </oneOrMore>
     </choice>
   </define>
+  <define name="LocalizedMarkedUpString1">
+    <!-- multiple languages and scripts possible: comma delimit them if so -->
+    <ref name="LocalizedStringAttrs"/>
+    <oneOrMore>
+      <ref name="TextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="LocalizedMarkedUpString">
+    <choice>
+      <ref name="LocalizedMarkedUpString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedMarkedUpString1"/>
+        </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
   -->
@@ -202,14 +219,11 @@
       <ref name="organization"/>
     </choice>
   </define>
   <define name="roledescription">
     <element name="description">
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="person">
     <element name="person">
       <optional>
@@ -330,14 +344,11 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
   <define name="affiliationdescription">
     <element name="description">
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="organization">
     <element name="organization">
       <ref name="OrganizationType"/>
@@ -382,20 +393,20 @@
       <ref name="OrganizationType"/>
     </element>
   </define>
   <define name="logo">
     <element name="logo">
-      <ref name="image"/>
+      <ref name="image-no-id"/>
     </element>
   </define>
   <define name="depiction">
     <element name="depiction">
       <optional>
         <attribute name="scope"/>
       </optional>
       <zeroOrMore>
-        <ref name="image"/>
+        <ref name="image-no-id"/>
       </zeroOrMore>
     </element>
   </define>
   <define name="NameWithVariants">
     <element name="primary">
@@ -944,14 +955,11 @@
   </define>
   <define name="TypedTitleString">
     <optional>
       <attribute name="type"/>
     </optional>
-    <ref name="LocalizedStringAttrs"/>
-    <zeroOrMore>
-      <ref name="TextElement"/>
-    </zeroOrMore>
+    <ref name="LocalizedMarkedUpString"/>
   </define>
   <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
     <optional>
       <attribute name="type"/>
@@ -1038,14 +1046,11 @@
       <optional>
         <attribute name="primary">
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="docnumber">
     <element name="docnumber">
       <text/>
@@ -1266,22 +1271,19 @@
   <define name="biblionote">
     <element name="note">
       <optional>
         <attribute name="type"/>
       </optional>
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="bibabstract">
     <element name="abstract">
       <ref name="LocalizedStringAttrs"/>
       <choice>
         <oneOrMore>
-          <ref name="BasicBlock"/>
+          <ref name="BasicBlockNoId"/>
         </oneOrMore>
         <oneOrMore>
           <ref name="TextElement"/>
         </oneOrMore>
       </choice>
@@ -1387,13 +1389,10 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
       <optional>
         <element name="description">
-          <ref name="LocalizedStringAttrs"/>
-          <oneOrMore>
-            <ref name="TextElement"/>
-          </oneOrMore>
+          <ref name="LocalizedMarkedUpString"/>
         </element>
       </optional>
       <element name="bibitem">
         <ref name="ReducedBibliographicItem"/>
       </element>