allow recursive container prefixes for cross-references: metanorma/me…

…tanorma-jis#126

Gemfile.devel

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

lib/isodoc/bipm/xref.rb

@@ -213,11 +213,11 @@ def annex_name_lbl(_clause, num)
         l10n("<strong>#{@annexlbl} #{num}</strong>")
       end
 
-      def sequential_formula_names(clause)
+      def sequential_formula_names(clause, container: false)
         c = Counter.new
         clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
-            c.increment(t).print, nil,
+            c.increment(t).print, container ? t : nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
             "formula", t["unnumbered"]
           )
@@ -232,9 +232,9 @@ def initial_anchor_names(doc)
         end
       end
 
-      def sequential_figure_names(clause)
+      def sequential_figure_names(clause, container: false)
         @jcgm or return super
-        @iso.sequential_figure_names(clause)
+        @iso.sequential_figure_names(clause, container: container)
         @anchors.merge!(@iso.get)
       end
 

lib/metanorma/bipm/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>