lib/asciidoctor/csd/biblio.rng in metanorma-csd-1.0.14 vs lib/asciidoctor/csd/biblio.rng in metanorma-csd-1.1.0

@@ -284,22 +284,27 @@
       <text/>
     </element>
   </define>
   <define name="address">
     <element name="address">
-      <oneOrMore>
+      <choice>
         <!-- iso191606 TODO -->
-        <ref name="street"/>
-      </oneOrMore>
-      <ref name="city"/>
-      <optional>
-        <ref name="state"/>
-      </optional>
-      <ref name="country"/>
-      <optional>
-        <ref name="postcode"/>
-      </optional>
+        <group>
+          <oneOrMore>
+            <ref name="street"/>
+          </oneOrMore>
+          <ref name="city"/>
+          <optional>
+            <ref name="state"/>
+          </optional>
+          <ref name="country"/>
+          <optional>
+            <ref name="postcode"/>
+          </optional>
+        </group>
+        <ref name="formattedAddress"/>
+      </choice>
     </element>
   </define>
   <define name="street">
     <element name="street">
       <text/>
@@ -320,9 +325,14 @@
       <text/>
     </element>
   </define>
   <define name="postcode">
     <element name="postcode">
+      <text/>
+    </element>
+  </define>
+  <define name="formattedAddress">
+    <element name="formattedAddress">
       <text/>
     </element>
   </define>
   <define name="person-identifier">
     <element name="identifier">