isodoc 2.0.6.1 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32b98e8156bdafb3ad6549d179b6607cc7811bf67191cf0ee736b6c72d5360f
-  data.tar.gz: 63236257e5e7f511e6cfe2ea9ff5c7a12dd2059be3bc588c50f15c8946e4a01d
+  metadata.gz: e038a4b4f203a16e86b716deffc9602d005c305312aebedbaf88231cfe263a60
+  data.tar.gz: 0f873f9ce5847c0a33296714a60917d3112a95ef04f3b2ea7052b18f0fcdab8c
 SHA512:
-  metadata.gz: 58a629b21dee494368d7ad6c9f25fc3ac01ccb5f70b82674843cefdcb0959c484f770174ccb9ce75e52f4d4f906918fe1f390405dafd91119c945bade6ff716b
-  data.tar.gz: 11332100db734b1fd700ecfe164fb80ae0fd4be9843c6e48ffac4ea2c0d2d1ef4c417cb9e78c1a5d9cbae68294acac7f98fcb8365c10808a38153fae1f1dd2dd
+  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/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/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.6.1".freeze
+  VERSION = "2.0.7".freeze
 end

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.6.1
+  version: 2.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 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