isodoc 2.0.6.1 → 2.0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32b98e8156bdafb3ad6549d179b6607cc7811bf67191cf0ee736b6c72d5360f
-  data.tar.gz: 63236257e5e7f511e6cfe2ea9ff5c7a12dd2059be3bc588c50f15c8946e4a01d
+  metadata.gz: a736ad455159e993e2c100d8ac3cd67a09c07705dad2fab7f30c8995636a55d8
+  data.tar.gz: b600c452fe5bac0622c27ab05ca4156c46caaea6f56d0cebc2d76b9377c3ae2a
 SHA512:
-  metadata.gz: 58a629b21dee494368d7ad6c9f25fc3ac01ccb5f70b82674843cefdcb0959c484f770174ccb9ce75e52f4d4f906918fe1f390405dafd91119c945bade6ff716b
-  data.tar.gz: 11332100db734b1fd700ecfe164fb80ae0fd4be9843c6e48ffac4ea2c0d2d1ef4c417cb9e78c1a5d9cbae68294acac7f98fcb8365c10808a38153fae1f1dd2dd
+  metadata.gz: 6e534774023bcb0212a72808f5167633ecce14af71aaa506388385c5e458fd41a87bb927d87546a3b3a709021d41d1592c99cd008caab5f652023543820137ad
+  data.tar.gz: 9b8dfa80516811e6aa87d0cfc80ac3ad79c26eaf61edf6366b12a89c30b429d0b96e15fc7970c0ada89ce8d94ebbc08a330af41dcb5185baa7245a05f1f1a8d7

data/isodoc.gemspec

@@ -31,9 +31,10 @@ 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"
+  spec.add_dependency "emf2svg", "<= 1.3"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-utils"
   spec.add_dependency "nokogiri", "~> 1.12.0"

data/lib/isodoc/convert.rb

@@ -43,6 +43,8 @@ module IsoDoc
     # tocfigures: add ToC for figures
     # toctables: add ToC for tables
     # tocrecommendations: add ToC for rcommendations
+    # fonts: fontist fonts to install
+    # fontlicenseagreement: fontist font license agreement
     def initialize(options)
       @libdir ||= File.dirname(__FILE__) # rubocop:disable Lint/DisjunctiveAssignmentInConstructor
       options.merge!(default_fonts(options)) do |_, old, new|
@@ -57,10 +59,7 @@ module IsoDoc
       init_stylesheets(options)
       init_covers(options)
       init_toc(options)
-      @normalfontsize = options[:normalfontsize]
-      @smallerfontsize = options[:smallerfontsize]
-      @monospacefontsize = options[:monospacefontsize]
-      @footnotefontsize = options[:footnotefontsize]
+      init_fonts(options)
       @i18nyaml = options[:i18nyaml]
       @ulstyle = options[:ulstyle]
       @olstyle = options[:olstyle]
@@ -96,6 +95,15 @@ module IsoDoc
       @tmpfilesdir_suffix = tmpfilesdir_suffix
     end
 
+    def init_fonts(options)
+      @normalfontsize = options[:normalfontsize]
+      @smallerfontsize = options[:smallerfontsize]
+      @monospacefontsize = options[:monospacefontsize]
+      @footnotefontsize = options[:footnotefontsize]
+      @fontist_fonts = options[:fonts]
+      @fontlicenseagreement = options[:fontlicenseagreement]
+    end
+
     def init_covers(options)
       @header = options[:header]
       @htmlcoverpage = options[:htmlcoverpage]

data/lib/isodoc/function/references.rb

@@ -171,7 +171,7 @@ module IsoDoc
           if b.name == "bibitem"
             next if implicit_reference(b)
 
-            i += 1
+            i += 1 unless b["hidden"]
             if standard?(b) then std_bibitem_entry(div, b, i, biblio)
             else nonstd_bibitem(div, b, i, biblio)
             end
@@ -190,7 +190,7 @@ module IsoDoc
         (f = isoxml.at(ns(norm_ref_xpath)) and f["hidden"] != "true") or
           return num
         out.div do |div|
-          num = num + 1
+          num += 1
           clause_name(num, f.at(ns("./title")), div, nil)
           if f.name == "clause"
             f.elements.each { |e| parse(e, div) unless e.name == "title" }

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/bibdata.rb

@@ -1,7 +1,10 @@
+require "csv"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def bibdata(docxml)
       toc_metadata(docxml)
+      fonts_metadata(docxml)
       docid_prefixes(docxml)
       a = bibdata_current(docxml) or return
       address_precompose(a)
@@ -34,6 +37,23 @@ module IsoDoc
       end
     end
 
+    def fonts_metadata(xmldoc)
+      return unless @fontist_fonts
+
+      ins = xmldoc.at(ns("//presentation-metadata")) ||
+        xmldoc.at(ns("//misc-container")) || xmldoc.at(ns("//bibdata"))
+      CSV.parse_line(@fontist_fonts, col_sep: ";").map(&:strip).each do |f|
+        ins.next = presmeta("fonts", f)
+      end
+      @fontlicenseagreement and
+        ins.next = presmeta("font-license-agreement", @fontlicenseagreement)
+    end
+
+    def presmeta(name, value)
+      "<presentation-metadata><name>#{name}</name><value>#{value}</value>"\
+        "</presentation-metadata>"
+    end
+
     def address_precompose1(addr)
       ret = []
       addr.xpath(ns("./street")).each { |s| ret << s.children.to_xml }

data/lib/isodoc/presentation_function/image.rb

@@ -29,8 +29,7 @@ module IsoDoc
     def figure1(elem)
       return sourcecode1(elem) if elem["class"] == "pseudocode" ||
         elem["type"] == "pseudocode"
-      return if (labelled_ancestor(elem) && elem.ancestors("figure").empty?) ||
-        (elem.at(ns("./figure")) && !elem.at(ns("./name")))
+      return if elem.at(ns("./figure")) && !elem.at(ns("./name"))
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, " — ",

data/lib/isodoc/presentation_function/section.rb

@@ -69,23 +69,32 @@ module IsoDoc
     def bibliography_bibitem_number_skip(bibitem)
       @xrefs.klass.implicit_reference(bibitem) ||
         bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
-        bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']"))
-      # || @xrefs.klass.standard?(bibitem)
+        bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
+        bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
     end
 
     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.6.1".freeze
+  VERSION = "2.0.8.1".freeze
 end

data/lib/isodoc/xref/xref_counter.rb

@@ -112,7 +112,7 @@ module IsoDoc
       end
 
       def increment(node)
-        return self if node["unnumbered"]
+        return self if node["unnumbered"] || node["hidden"]
 
         @letter_override = nil
         @number_override = nil

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -25,7 +25,7 @@ module IsoDoc
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
           .each do |t|
-          next if labelled_ancestor(t) && t.ancestors("figure").empty?
+          # next if labelled_ancestor(t) && t.ancestors("figure").empty?
 
           j = subfigure_increment(j, c, t)
           label = c.print + (j.zero? ? "" : "-#{j}")
@@ -111,7 +111,7 @@ module IsoDoc
         j = 0
         clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
           .each do |t|
-          next if labelled_ancestor(t) && t.ancestors("figure").empty?
+          # next if labelled_ancestor(t) && t.ancestors("figure").empty?
 
           j = subfigure_increment(j, c, t)
           label = "#{num}#{hiersep}#{c.print}" +

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -34,9 +34,9 @@ internal_external_terms_boilerplate: |
           <p>% 界定的以及下列术语和定义适用于本文件。</p>
 term_defined_in: "〖术语于%中定义〗"
 binary_and: "%1和%2"
-multiple_and: "%1和%2"
+multiple_and: "%1、和%2"
 binary_or: "%1或%2"
-multiple_or: "%1或%2"
+multiple_or: "%1、或%2"
 chain_and: "%1和%2"
 chain_or: "%1或%2"
 chain_from: "%1从%2"

data/spec/isodoc/blocks_spec.rb

@@ -2497,7 +2497,6 @@ RSpec.describe IsoDoc do
                <bibliography>
                  <references hidden='true' normative='false' displayorder="1">
                    <bibitem id='express_action_schema' type='internal'>
-                     <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
                      <docidentifier type='repository'>express/action_schema</docidentifier>
                    </bibitem>
                  </references>

data/spec/isodoc/i18n_spec.rb

@@ -644,7 +644,7 @@ RSpec.describe IsoDoc do
              </introduction></preface><sections>
              <clause id="D" obligation="normative" type="scope" displayorder="3">
                <title depth="1">1.<tab/>Scope</title>
-               <p id="E"><eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality>ISO 712&#x3001;&#x7B2C;1&#x2013;1&#x8868;</eref></p>
+               <p id="E"><eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality>ISO 712, &#x7B2C;1&#x2013;1 &#x8868;</eref></p>
              </clause>
              <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title depth="2">3.1.<tab/>Normal Terms</title>
@@ -722,7 +722,7 @@ RSpec.describe IsoDoc do
                      <div id="D">
                        <h1>1.&#12288;Scope</h1>
                        <p id="E">
-                       <a href='#ISO712'>ISO 712&#12289;&#31532;1&#8211;1&#34920;</a>
+                       <a href='#ISO712'>ISO 712, &#31532;1&#8211;1 &#34920;</a>
                        </p>
                      </div>
                      <div>

data/spec/isodoc/inline_spec.rb

@@ -1603,7 +1603,7 @@ RSpec.describe IsoDoc do
          <bibliography>
            <references id='_normative_references' obligation='informative' normative='true' displayorder='2' hidden="true">
              <title depth='1'>
-               1.
+               0.
                <tab/>
                Normative References
              </title>
@@ -1709,7 +1709,7 @@ RSpec.describe IsoDoc do
     OUTPUT
 
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-  .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
     expect(xmlpp(IsoDoc::WordConvert.new({})

data/spec/isodoc/presentation_xml_spec.rb

@@ -1158,7 +1158,6 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(presxml)
   end
 
-
   it "inserts toc metadata" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -1194,7 +1193,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes multiple-target xrefs" do
-     input = <<~INPUT
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata/>
         <sections>
@@ -1295,6 +1294,179 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(presxml)
   end
 
+  it "captions embedded figures" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata/>
+        <sections>
+       <clause id="A" inline-header="false" obligation="normative">
+       <title>Section</title>
+       <figure id="B1">
+       <name>First</name>
+       </figure>
+       <example id="C1">
+       <figure id="B2">
+       <name>Second</name>
+       </figure>
+       </example>
+       <example id="C2">
+       <figure id="B4" unnumbered="true">
+       <name>Unnamed</name>
+       </figure>
+       </example>
+       <figure id="B3">
+       <name>Third</name>
+       </figure>
+       </clause>
+         </sections>
+       </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <bibdata/>
+
+         <sections>
+           <clause id='A' inline-header='false' obligation='normative' displayorder='1'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Section
+             </title>
+             <figure id='B1'>
+               <name>Figure 1&#xA0;&#x2014; First</name>
+             </figure>
+             <example id='C1'>
+               <name>EXAMPLE 1</name>
+               <figure id='B2'>
+                 <name>Figure 2&#xA0;&#x2014; Second</name>
+               </figure>
+             </example>
+             <example id='C2'>
+                <name>EXAMPLE 2</name>
+                <figure id='B4' unnumbered='true'>
+                  <name>Unnamed</name>
+                </figure>
+              </example>
+             <figure id='B3'>
+               <name>Figure 3&#xA0;&#x2014; Third</name>
+             </figure>
+           </clause>
+         </sections>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "passes font names to Presentation XML" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata/>
+      <sections>
+       <clause id="A" inline-header="false" obligation="normative">
+       <title>Section</title>
+       <figure id="B1">
+       <name>First</name>
+       </figure>
+       </clause>
+         </sections>
+       </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <bibdata/>
+          <presentation-metadata>
+          <name>font-license-agreement</name>
+          <value>no-install-fonts</value>
+        </presentation-metadata>
+        <presentation-metadata>
+          <name>fonts</name>
+          <value>font2</value>
+        </presentation-metadata>
+        <presentation-metadata>
+          <name>fonts</name>
+          <value>font1</value>
+        </presentation-metadata>
+                 <sections>
+           <clause id='A' inline-header='false' obligation='normative' displayorder='1'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Section
+             </title>
+             <figure id='B1'>
+               <name>Figure 1&#xA0;&#x2014; First</name>
+             </figure>
+           </clause>
+         </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert
+      .new({ fonts: "font1; font2", fontlicenseagreement: "no-install-fonts" })
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "skips numbering of hidden sections" do
+    input = <<~INPUT
+      <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic">
+      <bibdata/>
+      <sections><clause id="_scope" type="scope" inline-header="false" obligation="normative">
+      <title>Scope</title>
+      <p id="_8d98c053-85d7-e8cc-75bb-183a14209d61">A</p>
+
+      <p id="_2141c040-93a4-785a-73f0-ffad4fa1779f"><eref type="inline" bibitemid="_607373b1-0cc4-fcdb-c482-fd86ae572bd1" citeas="ISO 639-2"/></p>
+      </clause>
+
+      <terms id="_terms_and_definitions" obligation="normative">
+      <title>Terms and definitions</title><p id="_36938d4b-05e5-bd0f-a082-0415db50e8f7">No terms and definitions are listed in this document.</p>
+
+      </terms>
+      </sections><bibliography><references hidden="true" normative="true">
+      <title>Normative references</title>
+      </references>
+      </bibliography></standard-document>
+    INPUT
+    presxml = <<~OUTPUT
+      <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation">
+      <bibdata/>
+       <sections>
+          <clause id='_scope' type='scope' inline-header='false' obligation='normative' displayorder='1'>
+            <title depth='1'>
+              1.
+              <tab/>
+              Scope
+            </title>
+            <p id='_8d98c053-85d7-e8cc-75bb-183a14209d61'>A</p>
+            <p id='_2141c040-93a4-785a-73f0-ffad4fa1779f'>
+              <eref type='inline' bibitemid='_607373b1-0cc4-fcdb-c482-fd86ae572bd1' citeas='ISO 639-2'>ISO 639-2</eref>
+            </p>
+          </clause>
+          <terms id='_terms_and_definitions' obligation='normative' displayorder='3'>
+            <title depth='1'>
+              2.
+              <tab/>
+              Terms and definitions
+            </title>
+            <p id='_36938d4b-05e5-bd0f-a082-0415db50e8f7'>No terms and definitions are listed in this document.</p>
+          </terms>
+        </sections>
+        <bibliography>
+          <references hidden='true' normative='true' displayorder='2'>
+            <title depth='1'>Normative references</title>
+          </references>
+        </bibliography>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+  end
+
   private
 
   def mock_symbols

data/spec/isodoc/ref_spec.rb

@@ -854,4 +854,148 @@ 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
+
+  it "enforces consistent references numbering with hidden items: metanorma identifiers" 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="metanorma">[1]</docidentifier>
+      </bibitem>
+      <bibitem id="ref2" type="standard" hidden="true">
+        <title format="text/plain">Cereals or cereal products</title>
+        <docidentifier type="metanorma">[2]</docidentifier>
+      </bibitem>
+      <bibitem id="ref3" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <docidentifier type="metanorma">[3]</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'>[1]</docidentifier>
+          </bibitem>
+          <bibitem id='ref2' type='standard' hidden='true'>
+            <title format='text/plain'>Cereals or cereal products</title>
+            <docidentifier type='metanorma'>[2]</docidentifier>
+          </bibitem>
+          <bibitem id='ref3' type='standard'>
+            <title format='text/plain'>Cereals or cereal products</title>
+            <docidentifier type='metanorma'>[3]</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
+
+  it "enforces consistent references numbering with hidden items: metanorma-ordinal identifiers" 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>ABC</docidentifier>
+      </bibitem>
+      <bibitem id="ref2" type="standard" hidden="true">
+        <title format="text/plain">Cereals or cereal products</title>
+        <docidentifier>ABD</docidentifier>
+      </bibitem>
+      <bibitem id="ref3" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <docidentifier>ABE</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>ABC</docidentifier>
+          </bibitem>
+          <bibitem id='ref2' type='standard' hidden='true'>
+            <title format='text/plain'>Cereals or cereal products</title>
+            <docidentifier>ABD</docidentifier>
+          </bibitem>
+          <bibitem id='ref3' type='standard'>
+            <title format='text/plain'>Cereals or cereal products</title>
+            <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
+            <docidentifier>ABE</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

data/spec/isodoc/xref_spec.rb

@@ -262,22 +262,22 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     output = <<~OUTPUT
-                 <foreword id='fwd' displayorder="1">
-                   <p>
-                      <xref target='N1'>Figure 1</xref>
-       <xref target='N2'>Figure (??)</xref>
-       <xref target='N'>Figure 2</xref>
-       <xref target='note1'>Figure 3</xref>
-       <xref target='note3'>Figure 4</xref>
-       <xref target='note4'>Figure 5</xref>
-       <xref target='note2'>Figure 6</xref>
-       <xref target='note51'>[note51]</xref>
-       <xref target='AN'>Figure A.1</xref>
-       <xref target='Anote1'>Figure (??)</xref>
-       <xref target='Anote2'>Figure A.2</xref>
-       <xref target='Anote3'>Figure A.3</xref>
-                   </p>
-                 </foreword>
+                <foreword id='fwd' displayorder="1">
+                  <p>
+                     <xref target='N1'>Figure 1</xref>
+      <xref target='N2'>Figure (??)</xref>
+      <xref target='N'>Figure 2</xref>
+      <xref target='note1'>Figure 3</xref>
+      <xref target='note3'>Figure 4</xref>
+      <xref target='note4'>Figure 5</xref>
+      <xref target='note2'>Figure 6</xref>
+      <xref target='note51'>[note51]</xref>
+      <xref target='AN'>Figure A.1</xref>
+      <xref target='Anote1'>Figure (??)</xref>
+      <xref target='Anote2'>Figure A.2</xref>
+      <xref target='Anote3'>Figure A.3</xref>
+                  </p>
+                </foreword>
     OUTPUT
     expect(xmlpp(Nokogiri.XML(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))
@@ -824,20 +824,20 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-                 <foreword displayorder='1'>
-                   <p>
-                      <xref target='N1'>Clause 1, Permission 1</xref>
-       <xref target='N2'>Clause 1, Permission 1-1</xref>
-       <xref target='N'>Clause 1, Permission 1-1-1</xref>
-       <xref target='Q1'>Clause 1, Requirement 1-1</xref>
-       <xref target='R1'>Clause 1, Recommendation 1-1</xref>
-       <xref target='AN1'>Permission A.1</xref>
-       <xref target='AN2'>Permission A.1-1</xref>
-       <xref target='AN'>Permission A.1-1-1</xref>
-       <xref target='AQ1'>Requirement A.1-1</xref>
-       <xref target='AR1'>Recommendation A.1-1</xref>
-                   </p>
-                 </foreword>
+                <foreword displayorder='1'>
+                  <p>
+                     <xref target='N1'>Clause 1, Permission 1</xref>
+      <xref target='N2'>Clause 1, Permission 1-1</xref>
+      <xref target='N'>Clause 1, Permission 1-1-1</xref>
+      <xref target='Q1'>Clause 1, Requirement 1-1</xref>
+      <xref target='R1'>Clause 1, Recommendation 1-1</xref>
+      <xref target='AN1'>Permission A.1</xref>
+      <xref target='AN2'>Permission A.1-1</xref>
+      <xref target='AN'>Permission A.1-1-1</xref>
+      <xref target='AQ1'>Requirement A.1-1</xref>
+      <xref target='AR1'>Recommendation A.1-1</xref>
+                  </p>
+                </foreword>
     OUTPUT
     expect(xmlpp(Nokogiri.XML(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))
@@ -966,18 +966,18 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     output = <<~OUTPUT
-          <foreword displayorder='1'>
-            <p>
-              <xref target='N1'>Table 1</xref>
-              <xref target='N2'>Table (??)</xref>
-              <xref target='N'>Table 2</xref>
-              <xref target='note1'>Table 3</xref>
-              <xref target='note2'>Table 4</xref>
-              <xref target='AN'>Table A.1</xref>
-              <xref target='Anote1'>Table (??)</xref>
-              <xref target='Anote2'>Table A.2</xref>
-            </p>
-          </foreword>
+      <foreword displayorder='1'>
+        <p>
+          <xref target='N1'>Table 1</xref>
+          <xref target='N2'>Table (??)</xref>
+          <xref target='N'>Table 2</xref>
+          <xref target='note1'>Table 3</xref>
+          <xref target='note2'>Table 4</xref>
+          <xref target='AN'>Table A.1</xref>
+          <xref target='Anote1'>Table (??)</xref>
+          <xref target='Anote2'>Table A.2</xref>
+        </p>
+      </foreword>
     OUTPUT
     expect(xmlpp(Nokogiri.XML(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))
@@ -1061,13 +1061,13 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     output = <<~OUTPUT
-          <foreword displayorder='1'>
-            <p>
-              <xref target='note1'>Clause 2.1, Note 1</xref>
-              <xref target='note2'>Clause 2.1.1, Note 1</xref>
-              <xref target='note3'>Clause 2.1.1, Note 2</xref>
-            </p>
-          </foreword>
+      <foreword displayorder='1'>
+        <p>
+          <xref target='note1'>Clause 2.1, Note 1</xref>
+          <xref target='note2'>Clause 2.1.1, Note 1</xref>
+          <xref target='note3'>Clause 2.1.1, Note 2</xref>
+        </p>
+      </foreword>
     OUTPUT
     expect(xmlpp(Nokogiri.XML(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))
@@ -1151,13 +1151,13 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     output = <<~OUTPUT
-          <foreword displayorder='1'>
-            <p>
-              <xref target='note1'>Clause 2.1, Example</xref>
-              <xref target='note2'>Clause 2.1.1, Example 1</xref>
-              <xref target='note3'>Clause 2.1.1, Example 2</xref>
-            </p>
-          </foreword>
+      <foreword displayorder='1'>
+        <p>
+          <xref target='note1'>Clause 2.1, Example</xref>
+          <xref target='note2'>Clause 2.1.1, Example 1</xref>
+          <xref target='note3'>Clause 2.1.1, Example 2</xref>
+        </p>
+      </foreword>
     OUTPUT
     expect(xmlpp(Nokogiri.XML(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))
@@ -1255,31 +1255,31 @@ RSpec.describe IsoDoc do
        </iso-standard>
     INPUT
     output = <<~OUTPUT
-          <foreword obligation='informative' displayorder='1'>
-            <title>Foreword</title>
-            <p id='A'>
-              This is a preamble
-              <xref target='C'>Introduction Subsection</xref>
-              <xref target='C1'>Introduction, 2</xref>
-              <xref target='D'>Clause 1</xref>
-              <xref target='H'>Clause 3</xref>
-              <xref target='I'>Clause 3.1</xref>
-              <xref target='J'>Clause 3.1.1</xref>
-              <xref target='K'>Clause 3.2</xref>
-              <xref target='L'>Clause 4</xref>
-              <xref target='M'>Clause 5</xref>
-              <xref target='N'>Clause 5.1</xref>
-              <xref target='O'>Clause 5.2</xref>
-              <xref target='P'>Annex A</xref>
-              <xref target='Q'>Annex A.1</xref>
-              <xref target='Q1'>Annex A.1.1</xref>
-              <xref target='QQ'>Annex B</xref>
-              <xref target='QQ1'>Annex B</xref>
-              <xref target='QQ2'>Annex B.1</xref>
-              <xref target='R'>Clause 2</xref>
-              <xref target='S'>Bibliography</xref>
-            </p>
-          </foreword>
+      <foreword obligation='informative' displayorder='1'>
+        <title>Foreword</title>
+        <p id='A'>
+          This is a preamble
+          <xref target='C'>Introduction Subsection</xref>
+          <xref target='C1'>Introduction, 2</xref>
+          <xref target='D'>Clause 1</xref>
+          <xref target='H'>Clause 3</xref>
+          <xref target='I'>Clause 3.1</xref>
+          <xref target='J'>Clause 3.1.1</xref>
+          <xref target='K'>Clause 3.2</xref>
+          <xref target='L'>Clause 4</xref>
+          <xref target='M'>Clause 5</xref>
+          <xref target='N'>Clause 5.1</xref>
+          <xref target='O'>Clause 5.2</xref>
+          <xref target='P'>Annex A</xref>
+          <xref target='Q'>Annex A.1</xref>
+          <xref target='Q1'>Annex A.1.1</xref>
+          <xref target='QQ'>Annex B</xref>
+          <xref target='QQ1'>Annex B</xref>
+          <xref target='QQ2'>Annex B.1</xref>
+          <xref target='R'>Clause 2</xref>
+          <xref target='S'>Bibliography</xref>
+        </p>
+      </foreword>
     OUTPUT
     expect(xmlpp(Nokogiri.XML(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))
@@ -1720,31 +1720,31 @@ RSpec.describe IsoDoc do
                 </iso-standard>
     INPUT
     output = <<~OUTPUT
-      <foreword displayorder='1'>
-        <p>
-     <xref target='N1'>
-     Introduction, Definition List: 
-     <stem type='MathML'>
-       <math xmlns='http://www.w3.org/1998/Math/MathML'>
-         <msub>
-           <mrow>
-             <mover accent='true'>
-               <mrow>
-                 <mi>e</mi>
-               </mrow>
-               <mo>^</mo>
-             </mover>
-           </mrow>
-           <mrow>
-             <mi>r</mi>
-           </mrow>
-         </msub>
-       </math>
-       <!-- (hat e)_((r)) -->
-     </stem>
-   </xref>
-        </p>
-      </foreword>
+         <foreword displayorder='1'>
+           <p>
+        <xref target='N1'>
+        Introduction, Definition List:
+        <stem type='MathML'>
+          <math xmlns='http://www.w3.org/1998/Math/MathML'>
+            <msub>
+              <mrow>
+                <mover accent='true'>
+                  <mrow>
+                    <mi>e</mi>
+                  </mrow>
+                  <mo>^</mo>
+                </mover>
+              </mrow>
+              <mrow>
+                <mi>r</mi>
+              </mrow>
+            </msub>
+          </math>
+          <!-- (hat e)_((r)) -->
+        </stem>
+      </xref>
+           </p>
+         </foreword>
     OUTPUT
     expect(xmlpp(Nokogiri::XML(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.6.1
+  version: 2.0.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-04-18 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
@@ -70,16 +84,16 @@ dependencies:
   name: emf2svg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement