lib/isodoc/iho/xref.rb in metanorma-iho-0.8.3 vs lib/isodoc/iho/xref.rb in metanorma-iho-0.8.4

@@ -55,15 +55,14 @@
         lbl = annexlbl(clause.at("./ancestor::xmlns:annex/@obligation")
             .text == "informative")
         @anchors[clause["id"]] =
           { label: num, xref: l10n("#{lbl} #{num}"),
             level: level, type: "clause" }
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
           .each do |c|
-          i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", level + 1)
+          annex_names1(c, i.increment(c).print, level + 1)
         end
       end
 
       def appendix_names(clause, _num)
         i = Counter.new
@@ -79,13 +78,12 @@
       def section_names1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level,
             xref: l10n("#{@labels['subclause']} #{num}"),
             type: "clause", elem: @labels["subclause"] }
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          i.increment(c)
-          section_names1(c, "#{num}.#{i.print}", level + 1)
+          section_names1(c, i.increment(c).print, level + 1)
         end
       end
     end
   end
 end