Merge pull request #217 from metanorma/fix/recursive-prefix-container

allow recursive container prefixes for cross-references: https://gith…

Author: opoudjis

Gemfile.devel

@@ -0,0 +1 @@
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/recursive-prefix-container"

lib/isodoc/un/xref.rb

@@ -159,11 +159,12 @@ def clause_order_back(_docxml)
         ]
       end
 
-      def sequential_admonition_names(clause)
+      def sequential_admonition_names(clause, container: false)
         i = 0
         clause.xpath(ns(".//admonition")).noblank.each do |t|
           i += 1 unless t["unnumbered"] == "true"
-          @anchors[t["id"]] = anchor_struct(i.to_s, nil, @labels["admonition"],
+          @anchors[t["id"]] =
+            anchor_struct(i.to_s, container ? t : nil, @labels["admonition"],
                                             "box", t["unnumbered"])
         end
       end
@@ -178,9 +179,9 @@ def hierarchical_admonition_names(clause, num)
         end
       end
 
-      def sequential_asset_names(clause)
+      def sequential_asset_names(clause, container: false)
         super
-        sequential_admonition_names(clause)
+        sequential_admonition_names(clause, container: container)
       end
 
       def hierarchical_asset_names(clause, num)

lib/metanorma/un/biblio.rng

@@ -374,6 +374,16 @@
       <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"/>
@@ -760,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>