put order to contact elements

relaton · Jan 1, 2025 · 268c555 · 268c555
1 parent 0951d42
commit 268c555
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/grammars/biblio.rnc b/grammars/biblio.rnc
@@ -175,7 +175,7 @@ person =
     ## An identifier of the person according to an international identifier scheme
     person-identifier*,
     ## Contact information for the person, including URI, address, phone number, and email
-    contact*
+    contact?
 }
 
 ## The name of a person
@@ -266,7 +266,7 @@ OrganizationType =
     ## An identifier of the organization according to an international identifier scheme
     org-identifier*,
     ## Contact information for the organization, including address, phone number, and email
-    contact*,
+    contact?,
     ## A logo for the organization
     logo?
 
@@ -319,7 +319,7 @@ uri =
 # TODO may change
 ## Contact information for a person or organization
 contact =
-  ( address | phone | email | uri )
+  ( address*, phone*, email*, uri* )
 
 ## The phone number associated with a person or organization
 phone = element phone {

diff --git a/grammars/biblio.rng b/grammars/biblio.rng
@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>
@@ -1783,9 +1789,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">