isodoc 2.7.0 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf4eea4c89d6c8b67907883ac59beb80f11c58ce6a8646b98c78498ab716e09
-  data.tar.gz: 4645c6421411b736ec194cbf307de7d3285662f708e871356ce355e0fe53f716
+  metadata.gz: a8e11539f17ee97d00f3b2f4470b384f1caf06cb5d72b11fc408b731f071e55b
+  data.tar.gz: 9f45bc01cc6aa695152e0f237f281bad777eb745836c4f08880467781c722942
 SHA512:
-  metadata.gz: eeaa4541fc33975c131cfeb8781319ec97bc952f8bae99ef2f8699e9270a9e8894fef1dcb6f0948fffadac00405d05082ec7c6b03209057ee15986971e26f86f
-  data.tar.gz: 94788ad30cba5e36df220f2f080c81896d887a774405b5c3a0abc254bda6f70927fccde3a7fbf377b09d6e09331bb5f7a9a095c63599693d637234f4a38a2681
+  metadata.gz: 0174b0cb445a70b50ccaeda366c6d843a924fa481a047eb04c6c65c127b42cf789e274270fb4a6573f10040d0830ea7370081bcf0df366055baddaf7c3d991d0
+  data.tar.gz: cc9cd1214a0ce46d3cc8bd34646f9c2d629c9e1ce6116e2a03fd19dbca5e1f0c07ba1e20b67a1e5b713e6bbaaf4fbe00ccaa69ed580000b161f5cacaf4158d86

data/isodoc.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |spec|
   end
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "html2doc", "~> 1.7.0"
+  spec.add_dependency "html2doc", "~> 1.7.1"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   spec.add_dependency "emf2svg"
   spec.add_dependency "liquid", "~> 5"
-  spec.add_dependency "relaton-cli"
+  #spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf"
   spec.add_dependency "mn-requirements", "~> 0.3.4"

data/lib/isodoc/convert.rb

@@ -110,7 +110,8 @@ module IsoDoc
     end
 
     def preprocess_xslt(docxml)
-      extract_preprocess_xslt(docxml).each do |x|
+      sheets = extract_preprocess_xslt(docxml)
+      sheets.each do |x|
         docxml = Nokogiri::XSLT(x).transform(docxml)
       end
       docxml
@@ -131,8 +132,9 @@ module IsoDoc
       convert_i18n_init1(docxml)
       i18n_init(@lang, @script, @locale)
       @reqt_models = requirements_processor
-        .new({ default: "default", lang: @lang, script: @script, locale: @locale,
-               labels: @i18n.get, modspecidentifierbase: @modspecidentifierbase })
+        .new({ default: "default", lang: @lang, script: @script,
+               locale: @locale, labels: @i18n.get,
+               modspecidentifierbase: @modspecidentifierbase })
     end
 
     def convert_i18n_init1(docxml)

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -136,24 +136,21 @@ module IsoDoc
       end
 
       def html_toc_entries(docxml, path)
-        xml = html_toc_entries_prep(docxml, path)
+        headers = html_toc_entries_prep(docxml, path)
         path.each_with_index.with_object([]) do |(p, i), m|
-          xml.xpath(p.join(" | ")).each do |h|
+          docxml.xpath(p.join(" | ")).each do |h|
             m << { entry: html_toc_entry("h#{i + 1}", h),
-                   line: h.line }
+                   line: headers[h["id"]] }
           end
         end.sort_by { |k| k[:line] }
       end
 
       def html_toc_entries_prep(docxml, path)
-        path.each do |p|
-          docxml.xpath(p.join(" | ")).each do |h|
+        docxml.xpath(path.join(" | "))
+          .each_with_index.with_object({}) do |(h, i), m|
             h["id"] ||= "_#{UUIDTools::UUID.random_create}"
+            m[h["id"]] = i
           end
-        end
-        xml = Nokogiri::XML(docxml.to_xml, &:noblanks)
-        xml.remove_namespaces!
-        xml
       end
 
       def toc_exclude_class

data/lib/isodoc/i18n.rb

@@ -7,23 +7,26 @@ module IsoDoc
   class I18n
     Hash.include Metanorma::Utils::Hash
 
-    def load_yaml1(lang, script)
+    def yaml_lang(lang, script)
       case lang
       when "en", "fr", "ru", "de", "es", "ar", "ja"
-        load_yaml2(lang)
+        lang
       when "zh"
-        if script == "Hans" then load_yaml2("zh-Hans")
-        else load_yaml2("en")
-        end
-      else
-        load_yaml2("en")
+        "#{lang}-#{script}"
       end
     end
 
+    def load_yaml1(lang, script)
+      load_yaml2(yaml_lang(lang, script))
+    end
+
     def load_yaml2(str)
-      YAML.load_file(File.join(File.dirname(__FILE__),
-                               "../isodoc-yaml/i18n-#{str}.yaml"))
+      f = File.join(File.dirname(__FILE__),
+                    "../isodoc-yaml/i18n-#{str}.yaml")
+      File.exist?(f) or
+        f = File.join(File.dirname(__FILE__),
+                      "../isodoc-yaml/i18n-en.yaml")
+      YAML.load_file(f)
     end
   end
 end
-

data/lib/isodoc/presentation_function/bibdata.rb

@@ -15,10 +15,10 @@ module IsoDoc
         "</localized-strings>"
     end
 
-    def extension_insert(docxml, path = [])
-      ins = docxml.at(ns("//metanorma-extension")) ||
-        docxml.at(ns("//bibdata"))&.after("<metanorma-extension/>")&.next_element ||
-        docxml.root.elements.first.before("<metanorma-extension/>").previous_element
+    def extension_insert(xml, path = [])
+      ins = xml.at(ns("//metanorma-extension")) ||
+        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")&.next_element ||
+        xml.root.elements.first.before("<metanorma-extension/>").previous_element
       path.each do |n|
         ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
       end
@@ -39,24 +39,24 @@ module IsoDoc
       @output_formats.empty? and return nil
       @output_formats.each_key.with_object([]) do |k, m|
         m << <<~XSLT
-<preprocess-xslt format="#{k}">
-  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
-    <xsl:strip-space elements="*"/>
-    <xsl:template match="@* | node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@* | node()"/>
-    </xsl:copy>
-  </xsl:template>
-    <xsl:template match="*[local-name() = 'passthrough']">
-      <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
-    <xsl:copy>
-        <xsl:apply-templates select="@* | node()"/>
-    </xsl:copy>
-      </xsl:if>
-    </xsl:template>
-  </xsl:stylesheet>
-</preprocess-xslt>
+          <preprocess-xslt format="#{k}">
+            <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+              <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+              <xsl:strip-space elements="*"/>
+              <xsl:template match="@* | node()">
+              <xsl:copy>
+                <xsl:apply-templates select="@* | node()"/>
+              </xsl:copy>
+            </xsl:template>
+              <xsl:template match="*[local-name() = 'passthrough']">
+                <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
+              <xsl:copy>
+                  <xsl:apply-templates select="@* | node()"/>
+              </xsl:copy>
+                </xsl:if>
+              </xsl:template>
+            </xsl:stylesheet>
+          </preprocess-xslt>
         XSLT
       end.join("\n")
     end
@@ -67,8 +67,7 @@ module IsoDoc
     end
 
     def toc_metadata(docxml)
-      return unless @tocfigures || @toctables || @tocrecommendations
-
+      @tocfigures || @toctables || @tocrecommendations or return
       ins = extension_insert(docxml)
       @tocfigures and
         ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
@@ -89,17 +88,20 @@ module IsoDoc
     end
 
     def fonts_metadata(xmldoc)
-      return unless @fontist_fonts
-
-      ins = xmldoc.at(ns("//presentation-metadata")) ||
-        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
-      CSV.parse_line(@fontist_fonts, col_sep: ";").map(&:strip).each do |f|
+      ins = presmeta_insert_pt(xmldoc)
+      @fontist_fonts and CSV.parse_line(@fontist_fonts, col_sep: ";")
+        .map(&:strip).reverse.each do |f|
         ins.next = presmeta("fonts", f)
       end
       @fontlicenseagreement and
         ins.next = presmeta("font-license-agreement", @fontlicenseagreement)
     end
 
+    def presmeta_insert_pt(xmldoc)
+      xmldoc.at(ns("//presentation-metadata")) ||
+        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
+    end
+
     def presmeta(name, value)
       "<presentation-metadata><name>#{name}</name><value>#{value}</value>" \
         "</presentation-metadata>"
@@ -144,9 +146,10 @@ module IsoDoc
     def edition_translate(bibdata)
       x = bibdata.at(ns("./edition")) or return
       /^\d+$/.match?(x.text) or return
+      @i18n.edition_ordinal or return
+      edn = edition_translate1(x.text.to_i) or return
       tag_translate(x, @lang,
-                    @i18n.edition_ordinal.sub(/%(Spellout|Ordinal)?/,
-                                              edition_translate1(x.text.to_i)))
+                    @i18n.edition_ordinal.sub(/%(Spellout|Ordinal)?/, edn))
     end
 
     def edition_translate1(num)

data/lib/isodoc/presentation_function/inline.rb

@@ -1,4 +1,5 @@
 require "metanorma-utils"
+require "csv"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -126,16 +127,18 @@ module IsoDoc
       elem["formats"] = ",#{elem['formats']},"
     end
 
-    private
-
     def extract_custom_charsets(docxml)
-      docxml.xpath(ns("//presentation-metadata/custom-charset-font")).
-        each_with_object({}) do |x, m|
-          kv = x.text.split(":", 2)
+      docxml.xpath(ns("//presentation-metadata/custom-charset-font"))
+        .each_with_object({}) do |line, m|
+        line.text.split(",").map(&:strip).each do |x|
+          kv = x.split(":", 2)
           m[kv[0]] = kv[1]
         end
+      end
     end
 
+    private
+
     def found_matching_variant_sibling(node)
       prev = node.xpath("./preceding-sibling::xmlns:variant")
       foll = node.xpath("./following-sibling::xmlns:variant")

data/lib/isodoc/presentation_function/xrefs.rb

@@ -1,7 +1,12 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def prefix_container(container, linkend, node, _target)
-      l10n(@i18n.nested_xref.sub("%1", anchor_xref(node, container))
+    def prefix_container(container, linkend, node, target)
+      prefix_container?(container, node) or return linkend
+      container_container = @xrefs.anchor(container, :container, false)
+      container_label =
+        prefix_container(container_container, anchor_xref(node, container),
+                         node, target)
+      l10n(@i18n.nested_xref.sub("%1", container_label)
         .sub("%2", linkend))
     end
 
@@ -31,8 +36,7 @@ module IsoDoc
     def anchor_linkend1(node)
       linkend = anchor_xref(node, node["target"])
       container = @xrefs.anchor(node["target"], :container, false)
-      prefix_container?(container, node) and
-        linkend = prefix_container(container, linkend, node, node["target"])
+      linkend = prefix_container(container, linkend, node, node["target"])
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.7.0".freeze
+  VERSION = "2.7.2".freeze
 end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -24,24 +24,25 @@ module IsoDoc
         .//figure[not(@class)] | .//figure[@class = 'pseudocode'] | .//sourcecode[not(ancestor::example)]
       XPATH
 
-      def sequential_figure_names(clause)
+      def sequential_figure_names(clause, container: false)
         c = Counter.new
         j = 0
         clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
-          sequential_figure_body(j, c, t, "figure")
+          sequential_figure_body(j, c, t, "figure", container: container)
         end
-        sequential_figure_class_names(clause)
+        sequential_figure_class_names(clause, container: container)
       end
 
-      def sequential_figure_class_names(clause)
+      def sequential_figure_class_names(clause, container: false)
         c = {}
         j = 0
         clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
           .each do |t|
           c[t["class"]] ||= Counter.new
           j = subfigure_increment(j, c[t["class"]], t)
-          sequential_figure_body(j, c[t["class"]], t, t["class"])
+          sequential_figure_body(j, c[t["class"]], t, t["class"],
+                                 container: container)
         end
       end
 
@@ -50,27 +51,28 @@ module IsoDoc
         "-#{subfignum}"
       end
 
-      def sequential_figure_body(subfignum, counter, block, klass)
+      def sequential_figure_body(subfig, counter, elem, klass, container: false)
         label = counter.print
-        label &&= label + subfigure_label(subfignum)
-        @anchors[block["id"]] = anchor_struct(
-          label, nil, @labels[klass] || klass.capitalize, klass,
-          block["unnumbered"]
+        label &&= label + subfigure_label(subfig)
+        @anchors[elem["id"]] = anchor_struct(
+          label, container ? elem : nil,
+          @labels[klass] || klass.capitalize, klass,
+          elem["unnumbered"]
         )
       end
 
-      def sequential_table_names(clause)
+      def sequential_table_names(clause, container: false)
         c = Counter.new
         clause.xpath(ns(".//table")).noblank.each do |t|
           labelled_ancestor(t) and next
           @anchors[t["id"]] = anchor_struct(
-            c.increment(t).print, nil,
+            c.increment(t).print, container ? t : nil,
             @labels["table"], "table", t["unnumbered"]
           )
         end
       end
 
-      def sequential_formula_names(clause)
+      def sequential_formula_names(clause, container: false)
         c = Counter.new
         clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
@@ -91,60 +93,63 @@ module IsoDoc
         ./permission | ./requirement | ./recommendation
       XPATH
 
-      def sequential_permission_names(clause)
+      def sequential_permission_names(clause, container: false)
         c = ReqCounter.new
         clause.xpath(ns(FIRST_LVL_REQ)).noblank.each do |t|
           m = @reqt_models.model(t["model"])
           klass, label = reqt2class_label(t, m)
           id = c.increment(label, t).print
-          sequential_permission_body(id, t, label, klass, m)
-          sequential_permission_children(t, id)
+          sequential_permission_body(id, t, label, klass, m,
+                                     container: container)
+          sequential_permission_children(t, id, container: container)
         end
       end
 
-      def sequential_permission_children(block, lbl)
+      def sequential_permission_children(elem, lbl, container: false)
         c = ReqCounter.new
-        block.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
+        elem.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
           m = @reqt_models.model(t["model"])
           klass, label = reqt2class_nested_label(t, m)
           id = "#{lbl}#{hierfigsep}#{c.increment(label, t).print}"
-          sequential_permission_body(id, t, label, klass, m)
-          sequential_permission_children(t, id)
+          sequential_permission_body(id, t, label, klass, m,
+                                     container: container)
+          sequential_permission_children(t, id, container: container)
         end
       end
 
-      def sequential_permission_body(id, block, label, klass, model)
-        @anchors[block["id"]] = model.postprocess_anchor_struct(
-          block, anchor_struct(id, block,
-                               label, klass, block["unnumbered"])
+      def sequential_permission_body(id, elem, label, klass, model, container: false)
+        @anchors[elem["id"]] = model.postprocess_anchor_struct(
+          elem, anchor_struct(id, elem,
+                              label, klass, elem["unnumbered"])
         )
-        model.permission_parts(block, id, label, klass).each do |n|
+        model.permission_parts(elem, id, label, klass).each do |n|
           @anchors[n[:id]] = anchor_struct(n[:number], n[:elem], n[:label],
                                            n[:klass], false)
         end
       end
 
-      def reqt2class_label(block, model)
+      def reqt2class_label(elem, model)
         model.req_class_paths.each do |n|
           v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
-          block.at("./self::#{v1}") and return [n[:klass], n[:label]]
+          elem.at("./self::#{v1}") and return [n[:klass], n[:label]]
         end
         [nil, nil]
       end
 
-      def reqt2class_nested_label(block, model)
+      def reqt2class_nested_label(elem, model)
         model.req_nested_class_paths.each do |n|
           v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
-          block.at("./self::#{v1}") and return [n[:klass], n[:label]]
+          elem.at("./self::#{v1}") and return [n[:klass], n[:label]]
         end
         [nil, nil]
       end
 
-      def sequential_asset_names(clause)
-        sequential_table_names(clause)
-        sequential_figure_names(clause)
-        sequential_formula_names(clause)
-        sequential_permission_names(clause)
+      # container makes numbering be prefixed with the parent clause reference
+      def sequential_asset_names(clause, container: false)
+        sequential_table_names(clause, container: container)
+        sequential_figure_names(clause, container: container)
+        sequential_formula_names(clause, container: container)
+        sequential_permission_names(clause, container: container)
       end
 
       def hierarchical_figure_names(clause, num)

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -129,6 +129,10 @@ module IsoDoc
 
       def back_names(clause)
         unnumbered_names(clause)
+        sequential_asset_names(
+          Nokogiri::XML::NodeSet.new(clause.document, [clause]),
+          container: true,
+        )
       end
 
       def unnumbered_names(clause)
@@ -237,8 +241,8 @@ module IsoDoc
       def reference_names(ref)
         ids = @klass.bibitem_ref_code(ref)
         identifiers = @klass.render_identifier(ids)
-        reference = @klass.
-          docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
+        reference = @klass
+          .docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
                       identifiers[:ordinal] || identifiers[:doi])
         @anchors[ref["id"]] = { xref: reference }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: relaton-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement