isodoc 2.6.6 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5facc53bb7c8a88619fbf516d9d4d749ee960311f32dcf9f536375ee0c25a806
-  data.tar.gz: a6fc8b7e15083a368e3527d4e745977de12fddf02d907163fcc142f41fa96fa2
+  metadata.gz: c3d420c1f407fc9c61f6b5b35b4b6a2da5348eb80331cf1751e09546ceef5669
+  data.tar.gz: 8861cbd102660ee74d94b5ff367727607fd23ece4c9bca44a468a68b1756a5c9
 SHA512:
-  metadata.gz: 55858670ba62d093769824d5888ba78d4af4170626c18e2f575e0fcfbaa6ea2e461b920664ad60911304329536846b89cd54d55688f43c9674938e426a366472
-  data.tar.gz: 0aded4a1dd614f01e6d5cff9ed4e8b6f7d4065694e156ec0023fdb7f9525243bd64bc9579a008587274c43f3d5a8af29aa88366cc366632e269434458734701a
+  metadata.gz: 0b7e7eeb5050180c3b14d958a102ec895196783203ea0fe201996a38f9f0bd9137bdd2402f8260671abcbc5e264443e1847c3b1e6b0e465d7cea11e1ff403871
+  data.tar.gz: 3b591c4f0a8b1359a318ea753f2d1d77efe2dd5e7e903e0a77cad3d40f7318e79a1416ce0958fbafb1d02a43a48f6c29bfd62f5221b14dd943a1470511fe7007

data/isodoc.gemspec

@@ -28,7 +28,7 @@ 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"

data/lib/isodoc/convert.rb

@@ -110,11 +110,12 @@ 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
-    rescue
+    rescue ::Error => e
       require "debug"; binding.b
     end
 
@@ -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,15 +136,26 @@ module IsoDoc
       end
 
       def html_toc_entries(docxml, path)
+        xml = html_toc_entries_prep(docxml, path)
         path.each_with_index.with_object([]) do |(p, i), m|
-          docxml.xpath(p.join(" | ")).each do |h|
-            h["id"] ||= "_#{UUIDTools::UUID.random_create}"
+          xml.xpath(p.join(" | ")).each do |h|
             m << { entry: html_toc_entry("h#{i + 1}", h),
                    line: h.line }
           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|
+            h["id"] ||= "_#{UUIDTools::UUID.random_create}"
+          end
+        end
+        xml = Nokogiri::XML(docxml.to_xml, &:noblanks)
+        xml.remove_namespaces!
+        xml
+      end
+
       def toc_exclude_class
         "[not(@class = 'TermNum')][not(@class = 'noTOC')]" \
           "[string-length(normalize-space(.))>0]"

data/lib/isodoc/metadata_date.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
-                   updated issued received transmitted copied unchanged
+                   updated corrected issued received transmitted copied unchanged
                    circulated vote-started
                    vote-ended}.freeze
 

data/lib/isodoc/presentation_function/bibdata.rb

@@ -17,7 +17,8 @@ module IsoDoc
 
     def extension_insert(docxml, path = [])
       ins = docxml.at(ns("//metanorma-extension")) ||
-        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
+        docxml.at(ns("//bibdata"))&.after("<metanorma-extension/>")&.next_element ||
+        docxml.root.elements.first.before("<metanorma-extension/>").previous_element
       path.each do |n|
         ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
       end
@@ -25,9 +26,39 @@ module IsoDoc
     end
 
     def preprocess_xslt_insert(docxml)
-      content = preprocess_xslt_read or return
+      content = ""
+      p = passthrough_xslt and content += p
+      p = preprocess_xslt_read and content += File.read(p)
+      content.empty? and return
       ins = extension_insert(docxml, %w(render))
-      ins << File.read(content)
+      ins << content
+    end
+
+    def passthrough_xslt
+      @output_formats.nil? and return nil
+      @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>
+        XSLT
+      end.join("\n")
     end
 
     # read in from file, but with `<preprocess-xslt @format="">` wrapper
@@ -45,7 +76,7 @@ module IsoDoc
         ins << "<toc type='table'><title>#{@i18n.toc_tables}</title></toc>"
       @tocfigures and
         ins << "<toc type='recommendation'><title>#{@i18n.toc_recommendations}" \
-               "</title></toc>"
+        "</title></toc>"
     end
 
     def address_precompose(bib)
@@ -152,8 +183,8 @@ module IsoDoc
       when Array
         hash.reject { |a| blank?(a) }.each_with_object([])
           .with_index do |(v1, g), i|
-          i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
-        end
+            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
+          end
       else [i18n_tag(pref, hash)]
       end
     end

data/lib/isodoc/presentation_function/inline.rb

@@ -99,8 +99,43 @@ module IsoDoc
       elem.replace(@i18n.date(elem["value"], elem["format"].strip))
     end
 
+    def inline_format(docxml)
+      custom_charset(docxml)
+    end
+
+    def custom_charset(docxml)
+      charsets = extract_custom_charsets(docxml)
+      docxml.xpath(ns("//span[@custom-charset]")).each do |s|
+        s["style"] ||= ""
+        s["style"] += ";font-family:#{charsets[s['custom-charset']]}"
+      end
+    end
+
+    def passthrough(docxml)
+      formats = @output_formats.keys
+      docxml.xpath(ns("//passthrough")).each do |p|
+        passthrough1(p, formats)
+      end
+    end
+
+    def passthrough1(elem, formats)
+      (elem["formats"] && !elem["formats"].empty?) or elem["formats"] = "all"
+      f = elem["formats"].split(",")
+      (f - formats).size == f.size or elem["formats"] = "all"
+      elem["formats"] == "all" and elem["formats"] = formats.join(",")
+      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)
+          m[kv[0]] = kv[1]
+        end
+    end
+
     def found_matching_variant_sibling(node)
       prev = node.xpath("./preceding-sibling::xmlns:variant")
       foll = node.xpath("./following-sibling::xmlns:variant")

data/lib/isodoc/presentation_xml_convert.rb

@@ -89,6 +89,8 @@ module IsoDoc
       variant docxml
       identifier docxml
       date docxml
+      passthrough docxml
+      inline_format docxml
     end
 
     def terms(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.6.6".freeze
+  VERSION = "2.7.1".freeze
 end

data/lib/isodoc/xref/xref_counter.rb

@@ -15,15 +15,17 @@ module IsoDoc
     end
 
     class Counter
+      attr_accessor :prefix_override
+
       def initialize(num = 0, opts = { numerals: :arabic })
         @unnumbered = false
         @num = num
         @letter = ""
         @subseq = ""
-        @letter_override = nil
-        @number_override = nil
+        reset_overrides
         @style = opts[:numerals]
         @skip_i = opts[:skip_i]
+        @prefix = opts[:prefix]
         @base = ""
         if num.is_a? String
           if /^\d+$/.match?(num)
@@ -36,6 +38,12 @@ module IsoDoc
         end
       end
 
+      def reset_overrides
+        @letter_override = nil
+        @number_override = nil
+        @prefix_override = nil
+      end
+
       def new_subseq_increment(node)
         @subseq = node["subsequence"]
         @num += 1 unless @num.nil?
@@ -57,7 +65,9 @@ module IsoDoc
       end
 
       def sequence_increment(node)
-        if node["number"]
+        if node["branch-number"]
+          @prefix_override = node["branch-number"]
+        elsif node["number"]
           @base = @letter_override = @number_override = ""
           /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
           if blank?(n)
@@ -130,9 +140,7 @@ module IsoDoc
 
       def increment(node)
         @unnumbered = (node["unnumbered"] || node["hidden"]) and return self
-
-        @letter_override = nil
-        @number_override = nil
+        reset_overrides
         if node["subsequence"] != @subseq &&
             !(blank?(node["subsequence"]) && blank?(@subseq))
           new_subseq_increment(node)
@@ -143,11 +151,11 @@ module IsoDoc
       end
 
       def print
-        return nil if @unnumbered
-
+        @unnumbered and return nil
+        @prefix_override and return @prefix_override
         num = @number_override || @num
         out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
-        "#{@base}#{out}#{@letter_override || @letter}"
+        "#{@prefix}#{@base}#{out}#{@letter_override || @letter}"
       end
 
       def ol_type(list, depth)

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -14,12 +14,13 @@ module IsoDoc
 
       def clause_order_main(docxml)
         [
-          { path: "//clause[@type = 'scope']" },
+          { path: "//sections/clause[@type = 'scope']" },
           { path: @klass.norm_ref_xpath },
           { path: "//sections/terms | " \
-                  "//sections/clause[descendant::terms]" },
+            "//sections/clause[descendant::terms]" },
           { path: "//sections/definitions | " \
-                  "//sections/clause[descendant::definitions][not(descendant::terms)]" },
+            "//sections/clause[descendant::definitions]" \
+            "[not(descendant::terms)]" },
           { path: @klass.middle_clause(docxml), multi: true },
         ]
       end
@@ -168,17 +169,18 @@ module IsoDoc
         clause.nil? and return num
         num.increment(clause)
         section_name_anchors(clause, num.print, lvl)
-        clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
-          section_names1(c, "#{num.print}.#{i.increment(c).print}", lvl + 1)
+        clause.xpath(ns(SUBCLAUSES))
+          .each_with_object(Counter.new(0, prefix: "#{num.print}.")) do |c, i|
+          section_names1(c, i.increment(c).print, lvl + 1)
         end
         num
       end
 
       def section_names1(clause, num, level)
         section_name_anchors(clause, num, level)
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          section_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
+          section_names1(c, i.increment(c).print, level + 1)
         end
       end
 
@@ -216,8 +218,9 @@ module IsoDoc
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
                        num.to_s, 1)
         else
-          clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
-            annex_names1(c, "#{num}.#{i.increment(c).print}", 2)
+          clause.xpath(ns(SUBCLAUSES))
+            .each_with_object(Counter.new(0, prefix: "#{num}.")) do |c, i|
+            annex_names1(c, i.increment(c).print, 2)
           end
         end
         hierarchical_asset_names(clause, num)
@@ -225,18 +228,18 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         annex_name_anchors(clause, num, level)
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          annex_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
+          annex_names1(c, i.increment(c).print, level + 1)
         end
       end
 
       def reference_names(ref)
         ids = @klass.bibitem_ref_code(ref)
         identifiers = @klass.render_identifier(ids)
-        reference = @klass
-          .docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
-                                     identifiers[:ordinal] || identifiers[:doi])
+        reference = @klass.
+          docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
+                      identifiers[:ordinal] || identifiers[:doi])
         @anchors[ref["id"]] = { xref: reference }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-11-27 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