isodoc 2.6.3 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d77a199eaa1452ad1dd61e4db65e4a4eec3d7856942033c2e6f31019db08708
-  data.tar.gz: 5f2bf413d05d58707097e3bb605c0b778088554c7238f5588102afbd6d07985a
+  metadata.gz: d1b8b00c0831edf5095dd6d4e24e93f9f6c5fb1fb5fa54d7b9ee67d6821f46d4
+  data.tar.gz: 991204e016a3bc3817ecab867cbdfce29dfec3d9c58b46d84a08e1a557828f22
 SHA512:
-  metadata.gz: c7dc8fe34c7df07195377ff5c42e85b1597d5eb55e1c45951652f20521b16bf534f326c8e68a2058e4fa60b6b2f7bacbd5182da5488bca9ede76a4a9bfbb8c22
-  data.tar.gz: e2834d76979c5ceffe4a10b2a8471f2178b0d850e8d4b8fab3b321fed52d4902cb10624a3b4e72c164a70b1520cda41ba27f241fae1f367404b192059eaf70da
+  metadata.gz: d2fe45089897f94107456c2b5035b30fb1b5b4ec30b102e7a057aadd4df3e46a00bef8b61bbbcd97265ee526bbd4ed758ead5c01c6d1086a6f22fa7f76558ed5
+  data.tar.gz: 1b9bb6319fc0f65c4b613080cc05fe04da20cfec092b62976ea4664d58d3998eb3ad4c87ff6645d03a22f84b2dcc000e43de39d4351b55befac7b01471d6ddf7

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/function/inline.rb

@@ -7,7 +7,7 @@ module IsoDoc
         url = node["target"]
         node["update-type"] == "true" and url = suffix_url(url)
         out.a **attr_code(href: url, title: node["alt"]) do |l|
-          if node.text.empty?
+          if node.elements.empty? && node.text.strip.empty?
             l << node["target"].sub(/^mailto:/, "")
           else node.children.each { |n| parse(n, l) }
           end
@@ -37,7 +37,7 @@ module IsoDoc
       end
 
       def xref_parse(node, out)
-        target = if /#/.match?(node["target"])
+        target = if node["target"].include?("#")
                    node["target"].sub("#", ".html#")
                  else
                    "##{node['target']}"

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

@@ -77,7 +77,9 @@ module IsoDoc
         img = emf_encode(img)
         img.children.first.previous = emf_to_svg(img)
       elsif img["mimetype"] == "image/svg+xml"
-        src = svg_to_emf(img) and img << "<emf src='#{src}'/>"
+        src = svg_to_emf(img) or return
+        img.add_child("<emf/>")
+        img.elements.last["src"] = src
       end
     end
 
@@ -136,7 +138,6 @@ module IsoDoc
       File.exist?(file) and return Metanorma::Utils::datauri(file)
       file2 = uri + File.extname(file)
       warn "Checking #{file2}"
-      warn `ls #{File.dirname(file2)}`
       File.exist?(file2) and return Metanorma::Utils::datauri(file2)
       raise %(Fail on #{exe} #{option} #{uri} outputting #{file}: status #{err})
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.6.3".freeze
+  VERSION = "2.6.5".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.3
+  version: 2.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-10-09 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