diff --git a/Gemfile.devel b/Gemfile.devel
new file mode 100644
index 0000000..31ec817
--- /dev/null
+++ b/Gemfile.devel
@@ -0,0 +1,2 @@
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "features/branch-number"
+
diff --git a/lib/isodoc/bipm/xref.rb b/lib/isodoc/bipm/xref.rb
index 2d64e6b..bc009f4 100644
--- a/lib/isodoc/bipm/xref.rb
+++ b/lib/isodoc/bipm/xref.rb
@@ -80,10 +80,9 @@ def section_names(clause, num, lvl)
clause.nil? and return num
num.increment(clause)
@anchors[clause["id"]] = section_name_anchors(clause, num, lvl)
- i = Counter.new
+ i = Counter.new(0, prefix: "#{num.print}.")
clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
- i.increment(c)
- section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
+ section_names1(c, i.increment(c).print, lvl + 1)
end
clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
unnumbered_section_names1(c, lvl + 1)
@@ -110,10 +109,9 @@ def section_name1_anchors(clause, num, level)
def section_names1(clause, num, level)
@anchors[clause["id"]] = section_name1_anchors(clause, num, level)
- i = Counter.new
+ i = Counter.new(0, prefix: "#{num}.")
clause.xpath(ns(NUMBERED_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
clause.xpath(ns(UNNUMBERED_SUBCLAUSES)).each do |c|
unnumbered_section_names1(c, lvl + 1)
@@ -158,11 +156,10 @@ def annex_names(clause, num)
annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
num.to_s, 1)
else
- i = Counter.new
prefix = @jcgm ? "" : "A"
+ i = Counter.new(0, prefix: "#{prefix}#{num}.")
clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
- i.increment(c)
- annex_names1(c, "#{prefix}#{num}.#{i.print}", 2)
+ annex_names1(c, i.increment(c).print, 2)
end
clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
.each { |c| unnumbered_annex_names1(c, 2) }
@@ -196,10 +193,9 @@ def annex_names1_anchors(num, level)
def annex_names1(clause, num, level)
@anchors[clause["id"]] = annex_names1_anchors(num, level)
- i = Counter.new
+ i = Counter.new(0, prefix: "#{num}.")
clause.xpath(ns(NUMBERED_SUBCLAUSES)).each do |c|
- i.increment(c)
- annex_names1(c, "#{num}.#{i.print}", level + 1)
+ annex_names1(c, i.increment(c).print, level + 1)
end
clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
.each { |c| unnumbered_annex_names1(c, level + 1) }
diff --git a/lib/metanorma/bipm/biblio.rng b/lib/metanorma/bipm/biblio.rng
index d9bb5e4..ef420e4 100644
--- a/lib/metanorma/bipm/biblio.rng
+++ b/lib/metanorma/bipm/biblio.rng
@@ -942,6 +942,7 @@
obsoleted
confirmed
updated
+ corrected
issued
transmitted
copied
diff --git a/lib/metanorma/bipm/isodoc.rng b/lib/metanorma/bipm/isodoc.rng
index 7882a5f..77bd867 100644
--- a/lib/metanorma/bipm/isodoc.rng
+++ b/lib/metanorma/bipm/isodoc.rng
@@ -17,7 +17,7 @@
these elements; we just want one namespace for any child grammars
of this.
-->
-
+
@@ -1054,6 +1054,17 @@