reintroduce Variant tag to text fields: #54

Author: opoudjis

grammars/basicdoc-models

@@ -74,6 +74,15 @@ LocalizedString =
   LocalizedString1 |
   element variant { LocalizedString1 }+
 
+LocalizedMarkedUpString1 =
+  # multiple languages and scripts possible: comma delimit them if so
+  LocalizedStringAttrs,
+  TextElement+
+
+LocalizedMarkedUpString =
+  LocalizedMarkedUpString1 |
+  element variant { LocalizedMarkedUpString1 }+
+
 # Unlike UML, change type to format: type is overloaded
 # Would be need if plain were default value and could omit the attribute
 # Added LocalizedStringOrXsAny
@@ -109,10 +118,7 @@ ContributorInfo =
   ( person | organization )
 
 roledescription =
-  element description { 
-   LocalizedStringAttrs,
-   TextElement+ 
-  }
+  element description { LocalizedMarkedUpString }
 
 person =
   element person {
@@ -150,10 +156,7 @@ affiliation =
 
 affiliationname = element name { LocalizedString }
 
-affiliationdescription = element description { 
-   LocalizedStringAttrs,
-   TextElement+ 
-}
+affiliationdescription = element description {  LocalizedMarkedUpString }
 
 organization = element organization { OrganizationType}
 OrganizationType =
@@ -325,8 +328,7 @@ validityRevision = element revision { ISO8601DateTime }
 
 TypedTitleString =
   attribute type { text }?,
-  LocalizedStringAttrs,
-  TextElement*
+  LocalizedMarkedUpString
 
 # TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" )
 
@@ -361,8 +363,7 @@ docidentifier = element docidentifier {
   attribute type { text }?,
   attribute scope { text }?,
   attribute primary { xsd:boolean }?,
-  LocalizedStringAttrs,
-  TextElement+
+  LocalizedMarkedUpString
 }
 docnumber = element docnumber { text }
 
@@ -431,9 +432,9 @@ seriesrun = element run { text }
 
 biblionote = element note {
   attribute type { text }?,
-  LocalizedStringAttrs,
-  TextElement+
+  LocalizedMarkedUpString
 }
+
 bibabstract = element abstract { 
   LocalizedStringAttrs,
   (BasicBlockNoId+ | TextElement+)
@@ -514,10 +515,7 @@ DocRelationType =
 docrelation =
   element relation {
     attribute type { DocRelationType },
-    element description { 
-       LocalizedStringAttrs,
-       TextElement+ 
-    }?,
+    element description { LocalizedMarkedUpString }?,
     element bibitem { ReducedBibliographicItem },
     (locality* | localityStack*),
     (sourceLocality* | sourceLocalityStack*)

grammars/biblio.rnc

@@ -122,6 +122,23 @@
       </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
@@ -204,10 +221,7 @@
   </define>
   <define name="roledescription">
     <element name="description">
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="person">
@@ -332,10 +346,7 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="organization">
@@ -946,10 +957,7 @@
     <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">
@@ -1040,10 +1048,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="docnumber">
@@ -1268,10 +1273,7 @@
       <optional>
         <attribute name="type"/>
       </optional>
-      <ref name="LocalizedStringAttrs"/>
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedMarkedUpString"/>
     </element>
   </define>
   <define name="bibabstract">
@@ -1389,10 +1391,7 @@
       </attribute>
       <optional>
         <element name="description">
-          <ref name="LocalizedStringAttrs"/>
-          <oneOrMore>
-            <ref name="TextElement"/>
-          </oneOrMore>
+          <ref name="LocalizedMarkedUpString"/>
         </element>
       </optional>
       <element name="bibitem">