isodoc 2.6.4 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7006fe8d8b97cf4224ddb1887323ed738c7710641451295fe87caf164e158059
-  data.tar.gz: 63926717876a67586dd1182af72a3c777690b7993f4b10b9b58fd09449a17739
+  metadata.gz: 5facc53bb7c8a88619fbf516d9d4d749ee960311f32dcf9f536375ee0c25a806
+  data.tar.gz: a6fc8b7e15083a368e3527d4e745977de12fddf02d907163fcc142f41fa96fa2
 SHA512:
-  metadata.gz: 30c171d99b4ca59293c0679ca8906c46bd21d5deba795a39f731c8705f53f2ec38bbd4f4c4b4578536e440088de8e67b985c75f057453d39bc89e4163b6351e1
-  data.tar.gz: 52a0c50bdd62a0a973905c71984bf19d12c4b9e9734cf804d89aabff958a922fb77ef0d62e98983fb44994afdfdc5c52d1a39628f88c606b970e52576ab8063c
+  metadata.gz: 55858670ba62d093769824d5888ba78d4af4170626c18e2f575e0fcfbaa6ea2e461b920664ad60911304329536846b89cd54d55688f43c9674938e426a366472
+  data.tar.gz: 0aded4a1dd614f01e6d5cff9ed4e8b6f7d4065694e156ec0023fdb7f9525243bd64bc9579a008587274c43f3d5a8af29aa88366cc366632e269434458734701a

data/isodoc.gemspec

@@ -36,9 +36,9 @@ Gem::Specification.new do |spec|
   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.1"
+  spec.add_dependency "mn-requirements", "~> 0.3.4"
 
-  spec.add_dependency "relaton-render", "~> 0.5.2"
+  spec.add_dependency "relaton-render", "~> 0.6.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"

data/lib/isodoc/convert.rb

@@ -50,6 +50,7 @@ module IsoDoc
     # sourcehighlighter: whether to apply sourcecode highlighting
     # semantic_xml_insert: whether to insert into presentation XML
     #   a copy of semantic XML
+    # output_formats: hash of supported output formats and suffixes
     def initialize(options) # rubocop:disable Lint/MissingSuper
       @options = options_preprocess(options)
       init_stylesheets(@options)
@@ -97,7 +98,7 @@ module IsoDoc
     end
 
     def convert_init(file, input_filename, debug)
-      docxml = Nokogiri::XML(file) { |config| config.huge }
+      docxml = Nokogiri::XML(file, &:huge)
       filename, dir = init_file(input_filename, debug)
       docxml.root.default_namespace = ""
       convert_i18n_init(docxml)

data/lib/isodoc/function/blocks.rb

@@ -205,6 +205,8 @@ module IsoDoc
           end
         end
       end
+
+      def columnbreak_parse(node, out); end
     end
   end
 end

data/lib/isodoc/function/references.rb

@@ -34,12 +34,14 @@ module IsoDoc
         #{SKIP_DOCID} or @type = 'metanorma-ordinal' or @type = 'metanorma'
       XPATH
 
+      PRIMARY_ID = "docidentifier[@primary = 'true']".freeze
+
       def pref_ref_code(bib)
         bib["suppress_identifier"] == "true" and return nil
         lang = "[@language = '#{@lang}']"
-        ret = bib.xpath(ns("./docidentifier[@primary = 'true']#{lang}"))
+        ret = bib.xpath(ns("./#{PRIMARY_ID}[not(#{SKIP_DOCID})]#{lang}"))
         ret.empty? and
-          ret = bib.xpath(ns("./docidentifier[@primary = 'true']"))
+          ret = bib.xpath(ns("./#{PRIMARY_ID}[not(#{SKIP_DOCID})]"))
         ret.empty? and
           ret = bib.at(ns("./docidentifier[not(#{SKIP_DOC1})]#{lang}")) ||
             bib.at(ns("./docidentifier[not(#{SKIP_DOC1})]"))

data/lib/isodoc/function/to_word_html.rb

@@ -252,6 +252,7 @@ module IsoDoc
           when "variant-title" then variant_title(node, out)
           when "span" then span_parse(node, out)
           when "location" then location_parse(node, out)
+          when "columnbreak" then columnbreak_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/function/utils.rb

@@ -3,6 +3,9 @@ require "metanorma-utils"
 module IsoDoc
   module Function
     module Utils
+      Hash.include Metanorma::Utils::Hash
+      Array.include Metanorma::Utils::Array
+
       def to_xml(node)
         self.class.to_xml(node)
       end
@@ -166,8 +169,8 @@ module IsoDoc
           .merge(@labels ? { labels: @labels } : {})
           .merge(@meta.labels ? { labels: @meta.labels } : {})
           .merge(fonts_options || {})
-        template = liquid(docxml)
-        template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
+        liquid(docxml).render(meta.stringify_all_keys
+          .transform_values { |v| empty2nil(v) })
           .gsub("<", "<").gsub(">", ">").gsub("&", "&")
       end
 

data/lib/isodoc/init.rb

@@ -48,6 +48,7 @@ module IsoDoc
       @aligncrosselements = options[:aligncrosselements]
       @modspecidentifierbase = options[:modspecidentifierbase]
       @sourcehighlighter = options[:sourcehighlighter]
+      @output_formats = options[:output_formats] || {}
     end
 
     def init_arrangement(options)

data/lib/isodoc/metadata.rb

@@ -3,7 +3,7 @@ require_relative "metadata_contributor"
 
 module IsoDoc
   class Metadata
-    attr_accessor :fonts_options
+    attr_accessor :fonts_options, :labels
 
     def ns(xpath)
       Common::ns(xpath)

data/lib/isodoc/presentation_function/block.rb

@@ -106,69 +106,12 @@ module IsoDoc
       docxml.xpath(ns("//td | //th")).each do |d|
         d.traverse do |n|
           n.text? or next
-          ret = break_up_long_str(n.text)
+          ret = Metanorma::Utils::break_up_long_str(n.text)
           n.content = ret
         end
       end
     end
 
-    LONGSTR_THRESHOLD = 10
-    LONGSTR_NOPUNCT = 2
-
-    def break_up_long_str(text)
-      /^\s*$/.match?(text) and return text
-      text.split(/(?=\s)/).map do |w|
-        if /^\s*$/.match(text) || (w.size < LONGSTR_THRESHOLD) then w
-        else
-          w.scan(/.{,#{LONGSTR_THRESHOLD}}/o).map.with_index do |w1, i|
-            w1.size < LONGSTR_THRESHOLD ? w1 : break_up_long_str1(w1, i + 1)
-          end.join
-        end
-      end.join
-    end
-
-    STR_BREAKUP_RE = %r{
-     (?<=[=_—–\u2009→?+;]) | # break after any of these
-     (?<=[,.:])(?!\d) | # break on punct only if not preceding digit
-     (?<=[>])(?![>]) | # > not >->
-     (?<=[\]])(?![\]]) | # ] not ]-]
-     (?<=//) | # //
-     (?<=[/])(?![/]) | # / not /-/
-     (?<![<])(?=[<]) | # < not <-<
-     (?<=\p{L})(?=[(\{\[]\p{L}) # letter and bracket, followed by letter
-    }x.freeze
-
-
-    CAMEL_CASE_RE = %r{
-      (?<=\p{Ll}\p{Ll})(?=\p{Lu}\p{Ll}\p{Ll}) # 2 lowerc / upperc, 2 lowerc
-    }x.freeze
-
-    # break on punct every LONGSTRING_THRESHOLD chars, with zero width space
-    # if punct fails, try break on camel case, with soft hyphen
-    # break regardless every LONGSTRING_THRESHOLD * LONGSTR_NOPUNCT,
-    # with soft hyphen
-    def break_up_long_str1(text, iteration)
-      s, separator = break_up_long_str2(text)
-      if s.size == 1 # could not break up
-        (iteration % LONGSTR_NOPUNCT).zero? and
-          text += "\u00ad" # force soft hyphen
-        text
-      else
-        s[-1] = "#{separator}#{s[-1]}"
-        s.join
-      end
-    end
-
-    def break_up_long_str2(text)
-      s = text.split(STR_BREAKUP_RE, -1)
-      separator = "\u200b"
-      if s.size == 1
-        s = text.split(CAMEL_CASE_RE)
-        separator = "\u00ad"
-      end
-      [s, separator]
-    end
-
     # we use this to eliminate the semantic amend blocks from rendering
     def amend(docxml)
       docxml.xpath(ns("//amend")).each { |f| amend1(f) }

data/lib/isodoc/presentation_function/image.rb

@@ -109,6 +109,7 @@ module IsoDoc
     end
 
     def svg_to_emf(node)
+      @output_formats[:doc] or return
       uri = svg_to_emf_uri(node)
       svg_impose_height_attr(node)
       ret = imgfile_suffix(uri, "emf")

data/lib/isodoc/version.rb

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

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -31,8 +31,7 @@ module IsoDoc
         <<~TOC
           <p class="MsoToc#{toclevel}"><span class="MsoHyperlink"><span lang="EN-GB" style='mso-no-proof:yes'>
           <a href="#_Toc#{bookmark}">#{heading}<span lang="EN-GB" class="MsoTocTextSpan">
-          <span style='mso-tab-count:1 dotted'>. </span>
-          </span><span lang="EN-GB" class="MsoTocTextSpan">
+          <span style='mso-tab-count:1 dotted'>. </span></span><span lang="EN-GB" class="MsoTocTextSpan">
           <span style='mso-element:field-begin'></span></span>
           <span lang="EN-GB" class="MsoTocTextSpan"> PAGEREF _Toc#{bookmark} \\h </span>
             <span lang="EN-GB" class="MsoTocTextSpan"><span style='mso-element:field-separator'></span></span><span

data/lib/isodoc/xref/xref_gen.rb

@@ -1,12 +1,5 @@
 require_relative "xref_gen_seq"
-
-module Enumerable
-  def noblank
-    reject do |n|
-      n["id"].nil? || n["id"].empty?
-    end
-  end
-end
+require_relative "xref_util"
 
 module IsoDoc
   module XrefGen
@@ -15,14 +8,6 @@ module IsoDoc
                            recommendation permission figure table formula
                            admonition sourcecode).freeze
 
-      def blank?(text)
-        text.nil? || text.empty?
-      end
-
-      def noblank(xpath)
-        xpath.reject { |n| blank?(n["id"]) }
-      end
-
       def amend_preprocess(xmldoc)
         xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
           autonum = amend_autonums(a)
@@ -84,23 +69,6 @@ module IsoDoc
         end
       end
 
-      SECTIONS_XPATH =
-        "//foreword | //introduction | //acknowledgements | " \
-        "//preface/terms | preface/definitions | preface/references | " \
-        "//preface/clause | //sections/terms | //annex | " \
-        "//sections/clause | //sections/definitions | " \
-        "//bibliography/references | //bibliography/clause".freeze
-
-      def sections_xpath
-        SECTIONS_XPATH
-      end
-
-      def child_asset_path(asset)
-        "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and " \
-        "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:X | " \
-        "./xmlns:X".gsub("X", asset)
-      end
-
       def note_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(child_asset_path("note")) -
@@ -118,9 +86,6 @@ module IsoDoc
         end
       end
 
-      CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
-                       "./references".freeze
-
       def admonition_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(child_asset_path("admonition[@type = 'box']"))
@@ -239,16 +204,33 @@ refer_list)
         Common::to_xml(label.children)
       end
 
-      def bookmark_anchor_names(xml)
-        xml.xpath(ns(".//bookmark")).noblank.each do |n|
-          parent = nil
-          n.ancestors.each do |a|
-            next unless a["id"] && parent = @anchors.dig(a["id"], :xref)
+      def id_ancestor(node)
+        parent = nil
+        node.ancestors.each do |a|
+          (a["id"] && (parent = a) && @anchors.dig(a["id"], :xref)) or next
+          break
+        end
+        parent ? [parent, parent["id"]] : [nil, nil]
+      end
 
-            break
+      def bookmark_container(parent)
+        if parent
+          clause = parent.xpath(CLAUSE_ANCESTOR)&.last
+          if clause["id"] == id
+            nil
+          else
+            @anchors.dig(clause["id"], :xref)
           end
+        end
+      end
+
+      def bookmark_anchor_names(xml)
+        xml.xpath(ns(".//bookmark")).noblank.each do |n|
+          _parent, id = id_ancestor(n)
+          #container = bookmark_container(parent)
           @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,
-                                xref: parent || "???" }
+                                xref: @anchors.dig(id, :xref) || "???",
+                                container: @anchors.dig(id, :container) }
         end
       end
     end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -84,11 +84,9 @@ module IsoDoc
       FIRST_LVL_REQ_RULE = <<~XPATH.freeze
         [not(ancestor::permission or ancestor::requirement or ancestor::recommendation)]
       XPATH
-
       FIRST_LVL_REQ = <<~XPATH.freeze
         .//permission#{FIRST_LVL_REQ_RULE} | .//requirement#{FIRST_LVL_REQ_RULE} | .//recommendation#{FIRST_LVL_REQ_RULE}
       XPATH
-
       REQ_CHILDREN = <<~XPATH.freeze
         ./permission | ./requirement | ./recommendation
       XPATH
@@ -234,7 +232,6 @@ module IsoDoc
           block, anchor_struct(id, nil,
                                label, klass, block["unnumbered"])
         )
-
         model.permission_parts(block, id, label, klass).each do |n|
           @anchors[n[:id]] = anchor_struct(n[:number], nil, n[:label],
                                            n[:klass], false)

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -231,12 +231,6 @@ module IsoDoc
         end
       end
 
-      ISO_PUBLISHER_XPATH =
-        "./contributor[xmlns:role/@type = 'publisher']/" \
-        "organization[abbreviation = 'ISO' or xmlns:abbreviation = 'IEC' or " \
-        "xmlns:name = 'International Organization for Standardization' or " \
-        "xmlns:name = 'International Electrotechnical Commission']".freeze
-
       def reference_names(ref)
         ids = @klass.bibitem_ref_code(ref)
         identifiers = @klass.render_identifier(ids)

data/lib/isodoc/xref/xref_util.rb

@@ -0,0 +1,41 @@
+module Enumerable
+  def noblank
+    reject do |n|
+      n["id"].nil? || n["id"].empty?
+    end
+  end
+end
+
+module IsoDoc
+  module XrefGen
+    module Blocks
+      def blank?(text)
+        text.nil? || text.empty?
+      end
+
+      def noblank(xpath)
+        xpath.reject { |n| blank?(n["id"]) }
+      end
+
+      SECTIONS_XPATH =
+        "//foreword | //introduction | //acknowledgements | " \
+        "//preface/terms | preface/definitions | preface/references | " \
+        "//preface/clause | //sections/terms | //annex | " \
+        "//sections/clause | //sections/definitions | " \
+        "//bibliography/references | //bibliography/clause".freeze
+
+      def sections_xpath
+        SECTIONS_XPATH
+      end
+
+      def child_asset_path(asset)
+        "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and " \
+        "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:X | " \
+        "./xmlns:X".gsub("X", asset)
+      end
+
+            CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
+                       "./references".freeze
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -451,6 +451,7 @@ files:
 - lib/isodoc/xref/xref_gen.rb
 - lib/isodoc/xref/xref_gen_seq.rb
 - lib/isodoc/xref/xref_sect_gen.rb
+- lib/isodoc/xref/xref_util.rb
 - lib/isodoc/xslfo_convert.rb
 - lib/metanorma/output.rb
 - lib/metanorma/output/base.rb