isodoc 2.0.5.3 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 127ed935ef3052a904bd3d13f513b6e4772faf36defe3035317f4ea0586ec249
-  data.tar.gz: b2cb57af77963c233565bf0599d92f591b17167c80d76752473e83b768f1e260
+  metadata.gz: e038a4b4f203a16e86b716deffc9602d005c305312aebedbaf88231cfe263a60
+  data.tar.gz: 0f873f9ce5847c0a33296714a60917d3112a95ef04f3b2ea7052b18f0fcdab8c
 SHA512:
-  metadata.gz: 143929b58729e90e51149b2db84c08fac0dbc5a4e358ab8759e8cdc2977e4c055ba556ca337173bfbd9fa4a3da118cb0c0b1aee9f9bbb61d8c1515621dc490fb
-  data.tar.gz: 61d77e9f87e6d6358beabb8a730cad9c35f79848ae4e31938f2b725aefbe044fb54d1a54006d710b1d235c3353e4cab7c9109bcb5d0c044e22d358e8ddb22475
+  metadata.gz: 8c146a97d03c932fe72755edf96a9ad26806daf7c7de07814f8afd93714e1a88193b476e972bed1c17820eeca3f9216c6e07931d8fe56e6d036f857d9537339d
+  data.tar.gz: c081e93e7e29fd600f5968550a51a81c29f5663c6d5fb45c6f0a853978a3fdc1bc07d06a4b4e3161a4c67c78c3de7cd3ecc2e5b18999e25fec2d88ce010d9998

data/isodoc.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciimath"
   spec.add_dependency "html2doc", "~> 1.3.0"
   spec.add_dependency "htmlentities", "~> 4.3.4"
+  spec.add_dependency "isodoc-i18n", "~> 1.0.0"
   spec.add_dependency "liquid", "~> 4"
   # spec.add_dependency "metanorma", ">= 1.2.0"
   spec.add_dependency "emf2svg", "~> 1"

data/lib/isodoc/base_style/all.css

@@ -0,0 +1,227 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0; }
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  border: 0;
+  font-size: 100%; }
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, tt, var,
+b, u, i, center,
+dl, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  vertical-align: baseline; }
+
+html, body, div, span, applet, object, iframe,
+p, blockquote,
+a, abbr, acronym, address, big, cite,
+del, dfn, em, img, ins, q, s,
+small, strike, strong, sub, sup, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  font-family: {{bodyfont}}; }
+
+code, pre, tt, kbd, samp {
+  font-family: {{monospacefont}};
+  font-variant-ligatures: none; }
+
+code *, pre *, tt *, kbd *, samp * {
+  font-family: {{monospacefont}} !important;
+  font-variant-ligatures: none; }
+
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block; }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0; }
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: {{headerfont}}; }
+
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
+blockquote, q {
+  quotes: none; }
+  blockquote:before, blockquote:after, q:before, q:after {
+    content: '';
+    content: none; }
+
+.h2Annex {
+  font-family: {{headerfont}}; }
+
+dl {
+  display: grid;
+  grid-template-columns: max-content auto; }
+  dl dt p, dl dd p {
+    margin-top: 0; }
+  dl dt {
+    grid-column-start: 1; }
+  dl dd {
+    grid-column-start: 2; }
+
+b, strong {
+  font-weight: bold; }
+
+div.document-stage-band, div.document-type-band {
+  background-color: #333333; }
+
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
+.addition {
+  color: blue; }
+
+.deletion {
+  color: red;
+  text-decoration: line-through; }
+
+#standard-band {
+  background-color: #0AC442; }
+
+#standard {
+  border-bottom: solid 3px #0AC442; }
+
+#directive-band {
+  background-color: #540D6E; }
+
+#directive {
+  border-bottom: solid 3px #540D6E; }
+
+#guide-band {
+  background-color: #D183C9; }
+
+#guide {
+  border-bottom: solid 3px #D183C9; }
+
+#specification-band {
+  background-color: #65AFFF; }
+
+#specification {
+  border-bottom: solid 3px #65AFFF; }
+
+#report-band {
+  background-color: #3A405A; }
+
+#report {
+  border-bottom: solid 3px #3A405A; }
+
+#amendment-band {
+  background-color: #F26430; }
+
+#amendment {
+  border-bottom: solid 3px #F26430; }
+
+#corrigendum-band {
+  background-color: #C84630; }
+
+#corrigendum {
+  border-bottom: solid 3px #C84630; }
+
+#administrative-band {
+  background-color: #BFAE48; }
+
+#administrative {
+  border-bottom: solid 3px #BFAE48; }
+
+#advisory-band {
+  background-color: #BD9391; }
+
+#advisory {
+  border-bottom: solid 3px #BD9391; }
+
+#proposal-band {
+  background-color: #39A0ED; }
+
+#proposal {
+  border-bottom: solid 3px #39A0ED; }
+
+#working-draft-band {
+  background-color: #2D7393; }
+
+#working-draft {
+  border-bottom: solid 3px #2D7393; }
+
+#committee-draft-band {
+  background-color: #2A6B7C; }
+
+#committee-draft {
+  border-bottom: solid 3px #2A6B7C; }
+
+#draft-standard-band {
+  background-color: #1C7F7A; }
+
+#draft-standard {
+  border-bottom: solid 3px #1C7F7A; }
+
+#final-draft-band {
+  background-color: #53C170; }
+
+#final-draft {
+  border-bottom: solid 3px #53C170; }
+
+#published-band {
+  background-color: #069E2D; }
+
+#published {
+  border-bottom: solid 3px #069E2D; }
+
+#withdrawn-band {
+  background-color: #004E64; }
+
+#withdrawn {
+  border-bottom: solid 3px #004E64; }
+
+#cancelled-band {
+  background-color: #2E382E; }
+
+#cancelled {
+  border-bottom: solid 3px #2E382E; }

data/lib/isodoc/base_style/metanorma_word.css

@@ -0,0 +1,47 @@
+div.table_container {
+  margin-bottom: 14pt; }
+
+ol {
+  margin-bottom: 0cm; }
+
+ul {
+  margin-bottom: 0cm; }
+
+table.MsoISOTable tr {
+  page-break-inside: avoid; }
+
+td {
+  page-break-inside: avoid; }
+
+tr {
+  page-break-after: avoid; }
+
+table.MsoISOTableBig tr {
+  page-break-inside: auto; }
+
+table.MsoISOTableBig td {
+  page-break-inside: auto; }
+
+span.stem {
+  font-family: "Cambria Math",serif;
+  mso-ascii-font-family: "Cambria Math";
+  font-style: italic; }
+
+dt {
+  page-break-inside: avoid;
+  page-break-after: avoid; }
+
+br.section {
+  page-break-before: always;
+  mso-break-type: section-break; }
+
+br.pagebreak {
+  page-break-before: always;
+  mso-special-character: line-break; }
+
+span.addition {
+  color: blue; }
+
+span.deletion {
+  color: red;
+  text-decoration: line-through; }

data/lib/isodoc/base_style/reset.css

@@ -0,0 +1,125 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0; }
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  border: 0;
+  font-size: 100%; }
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, tt, var,
+b, u, i, center,
+dl, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  vertical-align: baseline; }
+
+html, body, div, span, applet, object, iframe,
+p, blockquote,
+a, abbr, acronym, address, big, cite,
+del, dfn, em, img, ins, q, s,
+small, strike, strong, sub, sup, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  font-family: {{bodyfont}}; }
+
+code, pre, tt, kbd, samp {
+  font-family: {{monospacefont}};
+  font-variant-ligatures: none; }
+
+code *, pre *, tt *, kbd *, samp * {
+  font-family: {{monospacefont}} !important;
+  font-variant-ligatures: none; }
+
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block; }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0; }
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: {{headerfont}}; }
+
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
+blockquote, q {
+  quotes: none; }
+  blockquote:before, blockquote:after, q:before, q:after {
+    content: '';
+    content: none; }
+
+.h2Annex {
+  font-family: {{headerfont}}; }
+
+dl {
+  display: grid;
+  grid-template-columns: max-content auto; }
+  dl dt p, dl dd p {
+    margin-top: 0; }
+  dl dt {
+    grid-column-start: 1; }
+  dl dd {
+    grid-column-start: 2; }
+
+b, strong {
+  font-weight: bold; }
+
+div.document-stage-band, div.document-type-band {
+  background-color: #333333; }
+
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
+.addition {
+  color: blue; }
+
+.deletion {
+  color: red;
+  text-decoration: line-through; }

data/lib/isodoc/function/to_word_html.rb

@@ -32,7 +32,7 @@ module IsoDoc
       def init_dir(filename, debug)
         dir = "#{filename}#{@tmpfilesdir_suffix}"
         unless debug
-          Dir.mkdir(dir, 0o777) unless File.exists?(dir)
+          Dir.mkdir(dir, 0o777) unless File.exist?(dir)
           FileUtils.rm_rf "#{dir}/*"
         end
         dir

data/lib/isodoc/html_convert.rb

@@ -24,7 +24,7 @@ module IsoDoc
 
     def convert(filename, file = nil, debug = false, output_filename = nil)
       ret = super
-      Dir.exists?(tmpimagedir) and Dir["#{tmpimagedir}/*"].empty? and
+      Dir.exist?(tmpimagedir) and Dir["#{tmpimagedir}/*"].empty? and
         FileUtils.rm_r tmpimagedir
       ret
     end

data/lib/isodoc/i18n.rb

@@ -1,28 +1,9 @@
 require "yaml"
+require "isodoc-i18n"
 require_relative "function/utils"
 
 module IsoDoc
   class I18n
-    def load_yaml(lang, script, i18nyaml = nil)
-      ret = load_yaml1(lang, script)
-      return normalise_hash(ret.merge(YAML.load_file(i18nyaml))) if i18nyaml
-
-      normalise_hash(ret)
-    end
-
-    def normalise_hash(ret)
-      case ret
-      when Hash
-        ret.each do |k, v|
-          ret[k] = normalise_hash(v)
-        end
-        ret
-      when Array then ret.map { |n| normalise_hash(n) }
-      when String then cleanup_entities(ret.unicode_normalize(:nfc))
-      else ret
-      end
-    end
-
     def load_yaml1(lang, script)
       case lang
       when "en", "fr", "ru", "de", "es", "ar"
@@ -40,93 +21,5 @@ module IsoDoc
       YAML.load_file(File.join(File.dirname(__FILE__),
                                "../isodoc-yaml/i18n-#{str}.yaml"))
     end
-
-    def get
-      @labels
-    end
-
-    def set(key, val)
-      @labels[key] = val
-    end
-
-    def initialize(lang, script, i18nyaml = nil)
-      @lang = lang
-      @script = script
-      y = load_yaml(lang, script, i18nyaml)
-      @labels = y
-      @labels["language"] = @lang
-      @labels["script"] = @script
-      @labels.each do |k, _v|
-        self.class.send(:define_method, k.downcase) { get[k] }
-      end
-    end
-
-    def self.l10n(text, lang = @lang, script = @script)
-      l10n(text, lang, script)
-    end
-
-    # TODO: move to localization file
-    # function localising spaces and punctuation.
-    # Not clear if period needs to be localised for zh
-    def l10n(text, lang = @lang, script = @script)
-      if lang == "zh" && script == "Hans" then l10n_zh(text)
-      else bidiwrap(text, lang, script)
-      end
-    end
-
-    def bidiwrap(text, lang, script)
-      my_script, my_rtl, outer_rtl = bidiwrap_vars(lang, script)
-      if my_rtl && !outer_rtl
-        mark = %w(Arab Aran).include?(my_script) ? "؜" : "‏"
-        "#{mark}#{text}#{mark}"
-      elsif !my_rtl && outer_rtl then "‎#{text}‎"
-      else text
-      end
-    end
-
-    def bidiwrap_vars(lang, script)
-      my_script = script || Metanorma::Utils.default_script(lang)
-      [my_script,
-       Metanorma::Utils.rtl_script?(my_script),
-       Metanorma::Utils.rtl_script?(@script || Metanorma::Utils
-         .default_script(@lang))]
-    end
-
-    def l10n_zh(text)
-      xml = Nokogiri::HTML::DocumentFragment.parse(text)
-      xml.traverse do |n|
-        next unless n.text?
-
-        n.replace(cleanup_entities(n.text.gsub(/ /, "").gsub(/:/, "：")
-          .gsub(/,/, "、").gsub(/\(/, "（").gsub(/\)/, "）")
-          .gsub(/\[/, "【").gsub(/\]/, "】"), is_xml: false))
-      end
-      xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
-    end
-
-    def boolean_conj(list, conn)
-      case list.size
-      when 0 then ""
-      when 1 then list.first
-      when 2 then @labels["binary_#{conn}"].sub(/%1/, list[0])
-        .sub(/%2/, list[1])
-      else
-        @labels["multiple_#{conn}"]
-          .sub(/%1/, l10n(list[0..-2].join(", "), @lang, @script))
-          .sub(/%2/, list[-1])
-      end
-    end
-
-    #     def multiple_and(names, andword)
-    #       return "" if names.empty?
-    #       return names[0] if names.length == 1
-    #
-    #       (names.length == 2) &&
-    #         (return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script))
-    #       l10n(names[0..-2].join(", ") + " #{andword} #{names[-1]}", @lang, @script)
-    #     end
-
-    include Function::Utils
-    # module_function :l10n
   end
 end

data/lib/isodoc/presentation_function/image.rb

@@ -64,7 +64,7 @@ module IsoDoc
     def svg_to_emf(node)
       uri = svg_to_emf_uri(node)
       ret = svg_to_emf_filename(uri)
-      File.exists?(ret) and return ret
+      File.exist?(ret) and return ret
       exe = inkscape_installed? or raise "Inkscape missing in PATH, unable" \
                                          "to convert EMF to SVG. Aborting."
       uri = Metanorma::Utils::external_path uri

data/lib/isodoc/presentation_function/section.rb

@@ -76,16 +76,25 @@ module IsoDoc
     def bibliography_bibitem_number(docxml)
       i = 0
       docxml.xpath(ns("//references[@normative = 'false']/bibitem")).each do |b|
-        next if bibliography_bibitem_number_skip(b)
-
-        i += 1
-        id = b.at(ns(".//docidentifier"))
-        id.previous =
-          "<docidentifier type='metanorma-ordinal'>[#{i}]</docidentifier>"
+        i = bibliography_bibitem_number1(b, i)
       end
       @xrefs.references docxml
     end
 
+    def bibliography_bibitem_number1(bibitem, idx)
+      if mn = bibitem.at(ns(".//docidentifier[@type = 'metanorma']"))
+        /^\[?\d\]?$/.match?(mn&.text) and
+          idx = mn.text.sub(/^\[/, "").sub(/\]$/, "").to_i
+      end
+      unless bibliography_bibitem_number_skip(bibitem)
+
+        idx += 1
+        bibitem.at(ns(".//docidentifier")).previous =
+          "<docidentifier type='metanorma-ordinal'>[#{idx}]</docidentifier>"
+      end
+      idx
+    end
+
     def docid_prefixes(docxml)
       docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
         i.children = @xrefs.klass.docid_prefix(i["type"], i.text)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.5.3".freeze
+  VERSION = "2.0.7".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -206,7 +206,7 @@ module IsoDoc
 
         out.p { |p| p << @i18n.where }
         parse(deflist, out)
-        out.parent.at("./table")["class"] = "formula_dl"
+        t = out.parent.at("./table") and t["class"] = "formula_dl"
       end
 
       def formula_parse1(node, out)

data/lib/isodoc/xref/xref_gen.rb

@@ -87,18 +87,23 @@ module IsoDoc
 
       def note_anchor_names(sections)
         sections.each do |s|
-          c = Counter.new
-          (notes = s.xpath(CHILD_NOTES_XPATH)).each do |n|
-            next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
-
-            @anchors[n["id"]] =
-              anchor_struct(increment_label(notes, n, c), n,
-                            @labels["note_xref"], "note", false)
-          end
+          notes = s.xpath(CHILD_NOTES_XPATH) -
+            s.xpath(ns(".//figure//note | .//table//note"))
+          note_anchor_names1(notes, Counter.new)
           note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
       end
 
+      def note_anchor_names1(notes, counter)
+        notes.each do |n|
+          next if @anchors[n["id"]] || blank?(n["id"])
+
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, counter), n,
+                          @labels["note_xref"], "note", false)
+        end
+      end
+
       CHILD_EXAMPLES_XPATH =
         "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
         "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
@@ -109,18 +114,22 @@ module IsoDoc
 
       def example_anchor_names(sections)
         sections.each do |s|
-          c = Counter.new
-          (notes = s.xpath(CHILD_EXAMPLES_XPATH)).each do |n|
-            next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
-
-            @anchors[n["id"]] =
-              anchor_struct(increment_label(notes, n, c), n,
-                            @labels["example_xref"], "example", n["unnumbered"])
-          end
+          notes = s.xpath(CHILD_EXAMPLES_XPATH)
+          example_anchor_names1(notes, Counter.new)
           example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
       end
 
+      def example_anchor_names1(notes, counter)
+        notes.each do |n|
+          next if @anchors[n["id"]] || blank?(n["id"])
+
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, counter), n,
+                          @labels["example_xref"], "example", n["unnumbered"])
+        end
+      end
+
       def list_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
@@ -154,17 +163,20 @@ module IsoDoc
         sections.each do |s|
           notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
             s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
-          c = Counter.new
-          notes.reject { |n| blank?(n["id"]) }.each do |n|
-            @anchors[n["id"]] =
-              anchor_struct(increment_label(notes, n, c), n,
-                            @labels["deflist"], "deflist", false)
-            deflist_term_anchor_names(n, @anchors[n["id"]])
-          end
+          deflist_anchor_names1(notes, Counter.new)
           deflist_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
       end
 
+      def deflist_anchor_names1(notes, counter)
+        notes.reject { |n| blank?(n["id"]) }.each do |n|
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, counter), n,
+                          @labels["deflist"], "deflist", false)
+          deflist_term_anchor_names(n, @anchors[n["id"]])
+        end
+      end
+
       def deflist_term_anchor_names(list, list_anchor)
         list.xpath(ns("./dt")).each do |li|
           label = l10n("#{list_anchor[:xref]}: #{dt2xreflabel(li)}")

data/spec/isodoc/blocks_spec.rb

@@ -558,6 +558,49 @@ RSpec.describe IsoDoc do
       .convert("test", input, true)))).to be_equivalent_to xmlpp(doc)
   end
 
+  it "numbers notes in tables and figures separately from notes outside them" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <figure id="F"><note id="FB"><p>XYZ</p></note></figure>
+          <table id="T"><note id="TB"><p>XYZ</p></note></table>
+          <p id="A">ABC <note id="B"><p id="C">XYZ</p></note>
+      </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+           <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword displayorder='1'>
+             <figure id='F'>
+               <name>Figure 1</name>
+               <note id='FB'>
+                 <name>NOTE</name>
+                 <p>XYZ</p>
+               </note>
+             </figure>
+             <table id='T'>
+               <name>Table 1</name>
+               <note id='TB'>
+                 <name>NOTE</name>
+                 <p>XYZ</p>
+               </note>
+             </table>
+             <p id='A'>
+               ABC
+               <note id='B'>
+                 <name>NOTE</name>
+                 <p id='C'>XYZ</p>
+               </note>
+             </p>
+           </foreword>
+         </preface>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
+
   it "processes figures" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/ref_spec.rb

@@ -854,4 +854,52 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(presxml)
   end
 
+  it "enforces consistent metanorma-ordinal numbering" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata>
+          <language>en</language>
+          </bibdata>
+          <bibliography><references id="_normative_references" obligation="informative" normative="false"><title>Bibliography</title>
+      <bibitem id="ref1" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <docidentifier type="IEC">IEC 217</docidentifier>
+      </bibitem>
+      <bibitem id="ref2" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <docidentifier type="metanorma">[3]</docidentifier>
+      </bibitem>
+      <bibitem id="ref3" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <docidentifier>ABC</docidentifier>
+      </bibitem>
+      </references></bibliography></iso-standard>
+    INPUT
+    presxml = <<~PRESXML
+      <bibliography>
+         <references id='_normative_references' obligation='informative' normative='false' displayorder='1'>
+           <title depth='1'>Bibliography</title>
+           <bibitem id='ref1' type='standard'>
+             <title format='text/plain'>Cereals or cereal products</title>
+             <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
+             <docidentifier type='IEC'>IEC 217</docidentifier>
+           </bibitem>
+           <bibitem id='ref2' type='standard'>
+             <title format='text/plain'>Cereals or cereal products</title>
+             <docidentifier type='metanorma'>[3]</docidentifier>
+           </bibitem>
+           <bibitem id='ref3' type='standard'>
+             <title format='text/plain'>Cereals or cereal products</title>
+             <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
+             <docidentifier>ABC</docidentifier>
+           </bibitem>
+         </references>
+       </bibliography>
+    PRESXML
+    expect(xmlpp(Nokogiri::XML(
+      IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    ).at("//xmlns:bibliography").to_xml))
+      .to be_equivalent_to xmlpp(presxml)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.5.3
+  version: 2.0.7
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.4
+- !ruby/object:Gem::Dependency
+  name: isodoc-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -391,15 +405,23 @@ files:
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
+- lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
 - lib/isodoc/base_style/bands.scss
+- lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss
+- lib/isodoc/base_style/coverpage.css
 - lib/isodoc/base_style/coverpage.scss
+- lib/isodoc/base_style/defaults.css
 - lib/isodoc/base_style/defaults.scss
+- lib/isodoc/base_style/metanorma_word.css
 - lib/isodoc/base_style/metanorma_word.scss
+- lib/isodoc/base_style/nav.css
 - lib/isodoc/base_style/nav.scss
+- lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
 - lib/isodoc/base_style/scripts.html
+- lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
@@ -512,7 +534,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -527,8 +549,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.9
+signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []