isodoc 2.0.6 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3633136f121834056746917a4af6b5c6b917365ffb941b0561a0941d16ccfb3a
-  data.tar.gz: d15461d2103ff7e43ee22c1afe80d4a4b4e0a240a76c3ee5afe11df47652ab72
+  metadata.gz: a7850182b408d69f4ae9de09a385c8813c366a2ffd15122596ac3cd95e1b62f6
+  data.tar.gz: 2920db0b8a2d7887a326ad5f58f23550c0eb949e33fdbcf7dd7601d805b08e8f
 SHA512:
-  metadata.gz: 047f237237096490e9a6380675f96d46e1de721025f17eb60a3140face2cfe794d649fb31d992bca7a63e863c42c6d79cd42fa0810c77f6bc09518d905b55fbf
-  data.tar.gz: 7cde47764db6a87866b4fe618550dc8412b85c32c90ea2e60a903083849b6e16325574d723dbb83948a8524062fa63b4c0eb19a50590f0fb3d46164962dc0368
+  metadata.gz: e80f26545cd13b3e3bab7624d140cf2844afdf3471a45a8b77102fdaf2ca633e4a80df7a315718f3b35a8e3b95b9706a1e03785a19afef1bb5cf47dcf22a9d0d
+  data.tar.gz: 4ccdbce4a6e6e854137a938ec3e26361952f355b0cffd3776e646109cff971e0514dd5e222add212be371771e85bd75df5c6a3852800d7b12a07c5a2112a45aa

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/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

@@ -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, " — ",
@@ -64,7 +63,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.6".freeze
+  VERSION = "2.0.8".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_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/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/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,72 @@ 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
+
   private
 
   def mock_symbols

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