isodoc 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f5ade977fc572df7d9b8a417ecdb8a039679d0f44e009cf4bede35b358459b
-  data.tar.gz: 2f930e670d69bbe3994a17478fcd2e69723f9267177cdd5cf2d8d5b8da2936ef
+  metadata.gz: fa570f1c978671ee699be488fae2f0fe3835db689bfa7c5c0c1183e0a87f1854
+  data.tar.gz: 2ae14cde9d26714858c4240012d29e4483b22044d8112256627a709bc2704aee
 SHA512:
-  metadata.gz: 4f43abf35c4932886917f672be83286c264e70f1e924599b721c930bb326e25aa1da22b87c01dc5c884d0988a0087b40b3ba22b68e3a0f82c7df76c750451a1f
-  data.tar.gz: 77944109ecfc4397f86b0f8e22236b3c9e8f89059db34dfa84491f540be0c1a6ed6171797a9dce2a91c34e35e2878bc26c2c7be7642d3481bc2b52999706fab6
+  metadata.gz: 39d02fd071cd42d4e3771e1d6c6ed938024a2fd0842820d775b35cd5494371c31c09232b39c5526a921b81d660f9e2d9d3222e35c347b899d09c2fab8e35fed1
+  data.tar.gz: 3da1407baf7cd7a36e414925755436fbf4547f8f64da8c739c2e53edcda4e7a3d72a40efd5bb9be93bc9f9f28c626f59903b802e58b764f68e571e5172455398

data/isodoc.gemspec

@@ -52,7 +52,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rexml"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "sassc", "~> 2.4.0"

data/lib/isodoc/base_style/nav.scss

@@ -30,6 +30,18 @@
     padding-left: 50px;
   }
 
+  .h4 {
+    padding-left: 70px;
+  }
+
+  .h5 {
+    padding-left: 90px;
+  }
+
+  .h6 {
+    padding-left: 110px;
+  }
+
   .toc-active, li:hover {
     background: $colorLinkActiveBg;
     box-shadow: inset -5px 0px 10px -5px $colorLinkActiveBg !important;

data/lib/isodoc/convert.rb

@@ -38,7 +38,7 @@ module IsoDoc
     # scripts_override: Override scripts file for HTML
     # scripts_pdf: Scripts file for PDF (not used in XSLT PDF)
     # datauriimage: Encode images in HTML output as data URIs
-    # break_up_urls_in_tables: whether to insert spaces in URLs in tables
+    # breakupurlsintables: whether to insert spaces in URLs in tables
     #   every 40-odd chars
     # sectionsplit: split up HTML output on sections
     # bare: do not insert any prefatory material (coverpage, boilerplate)
@@ -74,7 +74,7 @@ module IsoDoc
       @olstyle = options[:olstyle]
       @datauriimage = options[:datauriimage]
       @suppressheadingnumbers = options[:suppressheadingnumbers]
-      @break_up_urls_in_tables = options[:break_up_urls_in_tables] == "true"
+      @break_up_urls_in_tables = options[:breakupurlsintables]
       @sectionsplit = options[:sectionsplit] == "true"
       @suppressasciimathdup = options[:suppressasciimathdup] == "true"
       @bare = options[:bare]
@@ -151,9 +151,9 @@ module IsoDoc
     end
 
     def init_toc(options)
-      @wordToClevels = options[:doctoclevels].to_i
+      @wordToClevels = (options[:doctoclevels] || options[:toclevels]).to_i
       @wordToClevels = 2 if @wordToClevels.zero?
-      @htmlToClevels = options[:htmltoclevels].to_i
+      @htmlToClevels = (options[:htmltoclevels] || options[:toclevels]).to_i
       @htmlToClevels = 2 if @htmlToClevels.zero?
       @tocfigures = options[:tocfigures]
       @toctables = options[:toctables]

data/lib/isodoc/function/cleanup.rb

@@ -26,7 +26,7 @@ module IsoDoc
       end
 
       def table_long_strings_cleanup(docxml)
-        return unless @break_up_urls_in_tables == true
+        return unless @break_up_urls_in_tables
 
         docxml.xpath("//td | //th").each do |d|
           d.traverse do |n|

data/lib/isodoc/metadata_contributor.rb

@@ -2,23 +2,29 @@ module IsoDoc
   class Metadata
     def extract_person_names(authors)
       authors.reduce([]) do |ret, a|
-        if a.at(ns("./name/completename"))
-          ret << a.at(ns("./name/completename")).text
-        else
-          fn = a.xpath(ns("./name/forename"))
-            .each_with_object([]) { |f, m| m << f.text }
-          ret << "#{fn.join(' ')} #{a&.at(ns('./name/surname'))&.text}"
-        end
+        ret << if a.at(ns("./name/completename"))
+                 a.at(ns("./name/completename")).text
+               else
+                 extract_person_name_from_components(a)
+               end
       end
     end
 
+    def extract_person_name_from_components(person)
+      name = person.xpath(ns("./name/forename"))
+      name.empty? and name = person.xpath(ns("./name/formatted-initials"))
+      out = name.map(&:text)
+      out << person.at(ns("./name/surname"))&.text
+      l10n(out.compact.join(" "))
+    end
+
     def extract_person_affiliations(authors)
       authors.reduce([]) do |m, a|
-        name = a&.at(ns("./affiliation/organization/name"))&.text
-        subdivs = a&.xpath(ns("./affiliation/organization/subdivision"))&.map(&:text)&.join(", ")
+        name = a.at(ns("./affiliation/organization/name"))&.text
+        subdivs = a.xpath(ns("./affiliation/organization/subdivision"))&.map(&:text)&.join(", ")
         name and subdivs and !subdivs.empty? and
           name = l10n("#{name}, #{subdivs}")
-        location = a&.at(ns("./affiliation/organization/address/formattedAddress"))&.text
+        location = a.at(ns("./affiliation/organization/address/formattedAddress"))&.text
         m << (if !name.nil? && !location.nil?
                 l10n("#{name}, #{location}")
               else
@@ -40,7 +46,7 @@ module IsoDoc
     end
 
     def personal_authors(isoxml)
-      authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author' "\
+      authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author' " \
                                 "or xmlns:role/@type = 'editor']/person"))
       set(:authors, extract_person_names(authors))
       set(:authors_affiliations, extract_person_names_affiliations(authors))
@@ -61,10 +67,10 @@ module IsoDoc
     def agency1(xml)
       agency = ""
       publisher = []
-      xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
+      xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/" \
                    "organization")).each do |org|
-        name = org&.at(ns("./name"))&.text
-        agency1 = org&.at(ns("./abbreviation"))&.text || name
+        name = org.at(ns("./name"))&.text
+        agency1 = org.at(ns("./abbreviation"))&.text || name
         publisher << name if name
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
@@ -79,7 +85,7 @@ module IsoDoc
     end
 
     def agency_addr(xml)
-      a = xml.at(ns("//bibdata/contributor[xmlns:role/@type = 'publisher'][1]/"\
+      a = xml.at(ns("//bibdata/contributor[xmlns:role/@type = 'publisher'][1]/" \
                     "organization")) or return
       { subdivision: "./subdivision", pub_phone: "./phone[not(@type = 'fax')]",
         pub_fax: "./phone[@type = 'fax']", pub_email: "./email",

data/lib/isodoc/presentation_function/erefs.rb

@@ -0,0 +1,168 @@
+require "metanorma-utils"
+
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def expand_citeas(text)
+      text.nil? and return text
+      HTMLEntities.new.decode(text.gsub(/&amp;#x/, "&#"))
+    end
+
+    def erefstack1(elem)
+      locs = elem.xpath(ns("./eref")).map do |e|
+        [e["connective"], e.to_xml]
+      end.flatten
+      ret = resolve_eref_connectives(locs)
+      elem.replace(ret[1])
+    end
+
+    def eref_localities(refs, target, node)
+      if can_conflate_eref_rendering?(refs)
+        l10n(", #{eref_localities_conflated(refs, target, node)}")
+      else
+        ret = resolve_eref_connectives(eref_locality_stacks(refs, target, node))
+        l10n(ret.join)
+      end
+    end
+
+    def eref_localities_conflated(refs, target, node)
+      droploc = node["droploc"]
+      node["droploc"] = true
+      ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
+                                                          node))
+      node.delete("droploc") unless droploc
+      eref_localities1(target,
+                       refs.first.at(ns("./locality/@type")).text,
+                       l10n(ret[1..-1].join), nil, node, @lang)
+    end
+
+    def can_conflate_eref_rendering?(refs)
+      (refs.size > 1 &&
+        refs.all? { |r| r.name == "localityStack" } &&
+        refs.all? { |r| r.xpath(ns("./locality")).size == 1 }) or return false
+
+      first = refs.first.at(ns("./locality/@type")).text
+      refs.all? do |r|
+        r.at(ns("./locality/@type")).text == first
+      end
+    end
+
+    def resolve_eref_connectives(locs)
+      locs = resolve_comma_connectives(locs)
+      locs = resolve_to_connectives(locs)
+      return locs if locs.size < 3
+
+      locs = locs.each_slice(2).with_object([]) do |a, m|
+        m << { conn: a[0], label: a[1] }
+      end
+      [", ", combine_conn(locs)]
+    end
+
+    def resolve_comma_connectives(locs)
+      locs1 = []
+      add = ""
+      until locs.empty?
+        if [", ", " "].include?(locs[1])
+          add += locs[0..2].join
+          locs.shift(3)
+        else
+          locs1 << add unless add.empty?
+          add = ""
+          locs1 << locs.shift
+        end
+      end
+      locs1 << add unless add.empty?
+      locs1
+    end
+
+    def resolve_to_connectives(locs)
+      locs1 = []
+      until locs.empty?
+        if locs[1] == "to"
+          locs1 << @i18n.chain_to.sub(/%1/, locs[0]).sub(/%2/, locs[2])
+          locs.shift(3)
+        else locs1 << locs.shift
+        end
+      end
+      locs1
+    end
+
+    def eref_locality_stacks(refs, target, node)
+      ret = refs.each_with_index.with_object([]) do |(r, i), m|
+        added = eref_locality_stack(r, i, target, node)
+        added.empty? and next
+        added.each { |a| m << a }
+        next if i == refs.size - 1
+
+        m << eref_locality_delimiter(r)
+      end
+      ret.empty? ? ret : [", "] + ret
+    end
+
+    def eref_locality_delimiter(ref)
+      if ref&.next_element&.name == "localityStack"
+        ref.next_element["connective"]
+      else locality_delimiter(ref)
+      end
+    end
+
+    def eref_locality_stack(ref, idx, target, node)
+      ret = []
+      if ref.name == "localityStack"
+        ref.elements.each_with_index do |rr, j|
+          l = eref_localities0(rr, j, target, node) or next
+
+          ret << l
+          ret << locality_delimiter(rr) unless j == ref.elements.size - 1
+        end
+      else
+        l = eref_localities0(ref, idx, target, node) and ret << l
+      end
+      ret[-1] == ", " and ret.pop
+      ret
+    end
+
+    def locality_delimiter(_loc)
+      ", "
+    end
+
+    def eref_localities0(ref, _idx, target, node)
+      if ref["type"] == "whole" then @i18n.wholeoftext
+      else
+        eref_localities1(target, ref["type"],
+                         ref&.at(ns("./referenceFrom"))&.text,
+                         ref&.at(ns("./referenceTo"))&.text, node, @lang)
+      end
+    end
+
+    def eref_localities1_zh(_target, type, from, upto, node)
+      ret = "第#{from}" if from
+      ret += "&#x2013;#{upto}" if upto
+      loc = eref_locality_populate(type, node)
+      ret += " #{loc}" unless node["droploc"] == "true"
+      ret
+    end
+
+    def eref_localities1(target, type, from, upto, node, lang = "en")
+      return nil if type == "anchor"
+
+      lang == "zh" and
+        return l10n(eref_localities1_zh(target, type, from, upto, node))
+      ret = eref_locality_populate(type, node)
+      ret += " #{from}" if from
+      ret += "&#x2013;#{upto}" if upto
+      l10n(ret)
+    end
+
+    def eref_locality_populate(type, node)
+      return "" if node["droploc"] == "true"
+
+      loc = type.sub(/^locality:/, "")
+      ret = @i18n.locality[loc] || loc
+      ret = case node["case"]
+            when "lowercase" then loc.downcase
+            else Metanorma::Utils.strict_capitalize_first(ret)
+            end
+      " #{ret}"
+    end
+  end
+end

data/lib/isodoc/presentation_function/inline.rb

@@ -1,5 +1,4 @@
 require "metanorma-utils"
-require_relative "xrefs"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -19,10 +18,19 @@ module IsoDoc
                               link, node)
       non_locality_elems(node).each(&:remove)
       node.add_child(cleanup_entities(link))
+      unnest_linkend(node)
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
+    def unnest_linkend(node)
+      return unless node.at(ns("./xref[@nested]"))
+
+      node.xpath(ns("./xref[@nested]")).each { |x| x.delete("nested") }
+      node.xpath(ns("./location | ./locationStack")).each(&:remove)
+      node.replace(node.children)
+    end
+
     def xref_empty?(node)
       c1 = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
       c1.empty?
@@ -30,169 +38,6 @@ module IsoDoc
 
     def anchor_id_postprocess(node); end
 
-    def expand_citeas(text)
-      text.nil? and return text
-      HTMLEntities.new.decode(text.gsub(/&amp;#x/, "&#"))
-    end
-
-    def erefstack1(elem)
-      locs = elem.xpath(ns("./eref")).map do |e|
-        [e["connective"], e.to_xml]
-      end.flatten
-      ret = resolve_eref_connectives(locs)
-      elem.replace(ret[1])
-    end
-
-    def eref_localities(refs, target, node)
-      if can_conflate_eref_rendering?(refs)
-        l10n(", #{eref_localities_conflated(refs, target, node)}")
-      else
-        ret = resolve_eref_connectives(eref_locality_stacks(refs, target, node))
-        l10n(ret.join)
-      end
-    end
-
-    def eref_localities_conflated(refs, target, node)
-      droploc = node["droploc"]
-      node["droploc"] = true
-      ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
-                                                          node))
-      node.delete("droploc") unless droploc
-      eref_localities1(target,
-                       refs.first.at(ns("./locality/@type")).text,
-                       l10n(ret[1..-1].join), nil, node, @lang)
-    end
-
-    def can_conflate_eref_rendering?(refs)
-      (refs.size > 1 &&
-        refs.all? { |r| r.name == "localityStack" } &&
-        refs.all? { |r| r.xpath(ns("./locality")).size == 1 }) or return false
-
-      first = refs.first.at(ns("./locality/@type")).text
-      refs.all? do |r|
-        r.at(ns("./locality/@type")).text == first
-      end
-    end
-
-    def resolve_eref_connectives(locs)
-      locs = resolve_comma_connectives(locs)
-      locs = resolve_to_connectives(locs)
-      return locs if locs.size < 3
-
-      locs = locs.each_slice(2).with_object([]) do |a, m|
-        m << { conn: a[0], target: a[1] }
-      end
-      [", ", combine_conn(locs)]
-    end
-
-    def resolve_comma_connectives(locs)
-      locs1 = []
-      add = ""
-      until locs.empty?
-        if [", ", " "].include?(locs[1])
-          add += locs[0..2].join
-          locs.shift(3)
-        else
-          locs1 << add unless add.empty?
-          add = ""
-          locs1 << locs.shift
-        end
-      end
-      locs1 << add unless add.empty?
-      locs1
-    end
-
-    def resolve_to_connectives(locs)
-      locs1 = []
-      until locs.empty?
-        if locs[1] == "to"
-          locs1 << @i18n.chain_to.sub(/%1/, locs[0]).sub(/%2/, locs[2])
-          locs.shift(3)
-        else locs1 << locs.shift
-        end
-      end
-      locs1
-    end
-
-    def eref_locality_stacks(refs, target, node)
-      ret = refs.each_with_index.with_object([]) do |(r, i), m|
-        added = eref_locality_stack(r, i, target, node)
-        added.empty? and next
-        added.each { |a| m << a }
-        next if i == refs.size - 1
-
-        m << eref_locality_delimiter(r)
-      end
-      ret.empty? ? ret : [", "] + ret
-    end
-
-    def eref_locality_delimiter(ref)
-      if ref&.next_element&.name == "localityStack"
-        ref.next_element["connective"]
-      else locality_delimiter(ref)
-      end
-    end
-
-    def eref_locality_stack(ref, idx, target, node)
-      ret = []
-      if ref.name == "localityStack"
-        ref.elements.each_with_index do |rr, j|
-          l = eref_localities0(rr, j, target, node) or next
-
-          ret << l
-          ret << locality_delimiter(rr) unless j == ref.elements.size - 1
-        end
-      else
-        l = eref_localities0(ref, idx, target, node) and ret << l
-      end
-      ret[-1] == ", " and ret.pop
-      ret
-    end
-
-    def locality_delimiter(_loc)
-      ", "
-    end
-
-    def eref_localities0(ref, _idx, target, node)
-      if ref["type"] == "whole" then @i18n.wholeoftext
-      else
-        eref_localities1(target, ref["type"],
-                         ref&.at(ns("./referenceFrom"))&.text,
-                         ref&.at(ns("./referenceTo"))&.text, node, @lang)
-      end
-    end
-
-    def eref_localities1_zh(_target, type, from, upto, node)
-      ret = "第#{from}" if from
-      ret += "&#x2013;#{upto}" if upto
-      loc = eref_locality_populate(type, node)
-      ret += " #{loc}" unless node["droploc"] == "true"
-      ret
-    end
-
-    def eref_localities1(target, type, from, upto, node, lang = "en")
-      return nil if type == "anchor"
-
-      lang == "zh" and
-        return l10n(eref_localities1_zh(target, type, from, upto, node))
-      ret = eref_locality_populate(type, node)
-      ret += " #{from}" if from
-      ret += "&#x2013;#{upto}" if upto
-      l10n(ret)
-    end
-
-    def eref_locality_populate(type, node)
-      return "" if node["droploc"] == "true"
-
-      loc = type.sub(/^locality:/, "")
-      ret = @i18n.locality[loc] || loc
-      ret = case node["case"]
-            when "lowercase" then loc.downcase
-            else Metanorma::Utils.strict_capitalize_first(ret)
-            end
-      " #{ret}"
-    end
-
     def xref(docxml)
       docxml.xpath(ns("//xref")).each { |f| xref1(f) }
       docxml.xpath(ns("//xref//xref")).each { |f| f.replace(f.children) }
@@ -200,6 +45,7 @@ module IsoDoc
 
     def eref(docxml)
       docxml.xpath(ns("//eref")).each { |f| xref1(f) }
+      docxml.xpath(ns("//eref//xref")).each { |f| f.replace(f.children) }
       docxml.xpath(ns("//erefstack")).each { |f| erefstack1(f) }
     end
 
@@ -209,6 +55,9 @@ module IsoDoc
 
     def quotesource(docxml)
       docxml.xpath(ns("//quote/source")).each { |f| xref1(f) }
+      docxml.xpath(ns("//quote/source//xref")).each do |f|
+        f.replace(f.children)
+      end
     end
 
     def xref1(node)

data/lib/isodoc/presentation_function/terms.rb

@@ -24,7 +24,7 @@ module IsoDoc
       concept1_linkmention(ref, render, opts)
       concept1_ref(node, ref, opts)
       concept1_nonital(node, opts)
-      node.replace(node.children)
+      node.replace(node.children.to_xml.strip)
     end
 
     def concept1_nonital(node, opts)
@@ -54,8 +54,8 @@ module IsoDoc
       return ref.remove if opts[:ref] == "false"
 
       r = concept1_ref_content(ref)
-      ref = r.at("./descendant-or-self::xmlns:xref | "\
-                 "./descendant-or-self::xmlns:eref | "\
+      ref = r.at("./descendant-or-self::xmlns:xref | " \
+                 "./descendant-or-self::xmlns:eref | " \
                  "./descendant-or-self::xmlns:termref")
       %w(xref eref).include? ref&.name and get_linkend(ref)
       if opts[:linkref] == "false" && %w(xref eref).include?(ref&.name)
@@ -82,10 +82,10 @@ module IsoDoc
       ref = node.at(ns("./xref | ./eref | ./termref"))
       label = @i18n.relatedterms[node["type"]].upcase
       if p && ref
-        node.replace(l10n("<p><strong>#{label}:</strong> "\
+        node.replace(l10n("<p><strong>#{label}:</strong> " \
                           "<em>#{p.to_xml}</em> (#{ref.to_xml})</p>"))
       else
-        node.replace(l10n("<p><strong>#{label}:</strong> "\
+        node.replace(l10n("<p><strong>#{label}:</strong> " \
                           "<strong>**RELATED TERM NOT FOUND**</strong></p>"))
       end
     end
@@ -125,7 +125,7 @@ module IsoDoc
 
     def designation1(desgn)
       s = desgn.at(ns("./termsource"))
-      name = desgn.at(ns("./expression/name | ./letter-symbol/name | "\
+      name = desgn.at(ns("./expression/name | ./letter-symbol/name | " \
                          "./graphical-symbol")) or return
 
       designation_annotate(desgn, name)

data/lib/isodoc/presentation_function/xrefs.rb

@@ -41,8 +41,7 @@ module IsoDoc
       if node["style"] == "basic" && t then t
       elsif node["style"] == "full" && t
         l10n("#{x}, #{t}")
-      else
-        x
+      else x
       end
     end
 
@@ -58,15 +57,20 @@ module IsoDoc
       linkend = if can_conflate_xref_rendering?(locs)
                   combine_conflated_xref_locations(locs)
                 else
-                  out = locs.each { |l| l[:target] = anchor_linkend1(l[:node]) }
+                  out = locs.each { |l| l[:label] = anchor_linkend1(l[:node]) }
                   l10n(combine_conn(out))
                 end
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
     def combine_conflated_xref_locations(locs)
-      out = locs.each { |l| l[:target] = anchor_value(l[:target]) }
-      ret = l10n("#{locs.first[:elem]} #{combine_conn(out)}")
+      out = locs.each { |l| l[:label] = anchor_value(l[:target]) }
+      label = @i18n.inflect(locs.first[:elem], number: "pl")
+      ret = l10n("#{label} #{combine_conn(out)}")
+      combine_conflated_xref_locations_container(locs, ret)
+    end
+
+    def combine_conflated_xref_locations_container(locs, ret)
       container = @xrefs.anchor(locs.first[:node]["target"], :container,
                                 false)
       prefix_container?(container, locs.first[:node]) and
@@ -85,15 +89,23 @@ module IsoDoc
       end
     end
 
+    def loc2xref(entry)
+      if entry[:target]
+        "<xref nested='true' target='#{entry[:target]}'>#{entry[:label]}</xref>"
+      else
+        entry[:label]
+      end
+    end
+
     def combine_conn(list)
-      return list.first[:target] if list.size == 1
+      return list.first[:label] if list.size == 1
 
       if list[1..-1].all? { |l| l[:conn] == "and" }
-        @i18n.boolean_conj(list.map { |l| l[:target] }, "and")
+        @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "and")
       elsif list[1..-1].all? { |l| l[:conn] == "or" }
-        @i18n.boolean_conj(list.map { |l| l[:target] }, "or")
+        @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "or")
       else
-        ret = list[0][:target]
+        ret = loc2xref(list[0])
         list[1..-1].each { |l| ret = i18n_chain_boolean(ret, l) }
         ret
       end
@@ -101,7 +113,7 @@ module IsoDoc
 
     def i18n_chain_boolean(value, entry)
       @i18n.send("chain_#{entry[:conn]}").sub(/%1/, value)
-        .sub(/%2/, entry[:target])
+        .sub(/%2/, loc2xref(entry))
     end
 
     def can_conflate_xref_rendering?(locs)

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,5 +1,7 @@
 require_relative "presentation_function/block"
 require_relative "presentation_function/terms"
+require_relative "presentation_function/xrefs"
+require_relative "presentation_function/erefs"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/math"
 require_relative "presentation_function/section"

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.3.5".freeze
+  VERSION = "2.3.6".freeze
 end

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -26,41 +26,33 @@ module IsoDoc
       def insert_toc(intro, docxml, level)
         toc = ""
         toc += make_WordToC(docxml, level)
-        toc += make_TableWordToC(docxml)
-        toc += make_FigureWordToC(docxml)
-        toc += make_RecommendationWordToC(docxml)
+        toc += make_table_word_toc(docxml)
+        toc += make_figure_word_toc(docxml)
+        toc += make_recommendation_word_toc(docxml)
         intro.sub(/WORDTOC/, toc)
       end
 
       def word_toc_entry(toclevel, heading)
         bookmark = bookmarkid # Random.rand(1000000000)
         <<~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">
+          <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-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
+          <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
             lang="EN-GB" class="MsoTocTextSpan">1</span>
-            <span lang="EN-GB"
-            class="MsoTocTextSpan"></span><span
-            lang="EN-GB" class="MsoTocTextSpan"><span
-            style='mso-element:field-end'></span></span></a></span></span></p>
+            <span lang="EN-GB" class="MsoTocTextSpan"></span><span
+            lang="EN-GB" class="MsoTocTextSpan"><span style='mso-element:field-end'></span></span></a></span></span></p>
 
         TOC
       end
 
       def word_toc_preface(level)
-        <<~TOC.freeze
-          <span lang="EN-GB"><span
-            style='mso-element:field-begin'></span><span
-            style='mso-spacerun:yes'>&#xA0;</span>TOC
-            \\o "1-#{level}" \\h \\z \\u <span
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span
+            style='mso-spacerun:yes'>&#xA0;</span>TOC \\o "1-#{level}" \\h \\z \\u <span
             style='mso-element:field-separator'></span></span>
         TOC
       end
@@ -82,63 +74,96 @@ module IsoDoc
                 %{\\1#{word_toc_preface(level)}}) + WORD_TOC_SUFFIX1
       end
 
-      WORD_TOC_RECOMMENDATION_PREFACE1 = <<~TOC.freeze
-        <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t "RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle"
-        <span style='mso-element:field-separator'></span></span>
-      TOC
+      # inheriting gems need to add native Word name of style, if different
+      # including both CSS style name and human readable style name.
+      # Any human readable style name needs to come first for the Word template
+      # to work in regenerating the ToC
+      def table_toc_class
+        %w(TableTitle tabletitle)
+      end
 
-      WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
-        <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t "TableTitle,tabletitle" <span
-        style='mso-element:field-separator'></span></span>
-      TOC
+      def figure_toc_class
+        %w(FigureTitle figuretitle)
+      end
 
-      WORD_TOC_FIGURE_PREFACE1 = <<~TOC.freeze
-        <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t "FigureTitle,figuretitle" <span
-        style='mso-element:field-separator'></span></span>
-      TOC
+      def reqt_toc_class
+        %w(RecommendationTitle RecommendationTestTitle
+           recommendationtitle recommendationtesttitle)
+      end
 
-      def make_TableWordToC(docxml)
-        (docxml.at("//p[@class = 'TableTitle']") && @toctablestitle) or
-          return ""
+      def toc_word_class_list(classes)
+        classes.map do |x|
+          / /.match?(x) ? %(&quot;#{x}&quot;) : x
+        end.join(",")
+      end
+
+      def word_toc_reqt_preface1
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span
+          style='mso-spacerun:yes'>&#xA0;</span>TOC \\h \\z \\t #{toc_word_class_list reqt_toc_class}
+          <span style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      def word_toc_table_preface1
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
+          \\h \\z \\t #{toc_word_class_list table_toc_class} <span style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      def word_toc_figure_preface1
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
+          \\h \\z \\t #{toc_word_class_list figure_toc_class} <span style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      def table_toc_xpath
+        attr = table_toc_class.map { |x| "@class = '#{x}'" }
+        "//p[#{attr.join(' or ')}]"
+      end
+
+      def make_table_word_toc(docxml)
+        (docxml.at(table_toc_xpath) && @toctablestitle) or return ""
         toc = %{<p class="TOCTitle">#{@toctablestitle}</p>}
-        docxml.xpath("//p[@class = 'TableTitle']").each do |h|
+        docxml.xpath(table_toc_xpath).each do |h|
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) + WORD_TOC_SUFFIX1
+                %{\\1#{word_toc_table_preface1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def figure_toc_xpath
+        attr = figure_toc_class.map { |x| "@class = '#{x}'" }
+        "//p[#{attr.join(' or ')}]"
       end
 
-      def make_FigureWordToC(docxml)
-        (docxml.at("//p[@class = 'FigureTitle']") && @tocfigurestitle) or
-          return ""
+      def make_figure_word_toc(docxml)
+        (docxml.at(figure_toc_xpath) && @tocfigurestitle) or return ""
         toc = %{<p class="TOCTitle">#{@tocfigurestitle}</p>}
-        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+        docxml.xpath(figure_toc_xpath).each do |h|
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) + WORD_TOC_SUFFIX1
+                %{\\1#{word_toc_figure_preface1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def reqt_toc_xpath
+        attr = reqt_toc_class.map { |x| "@class = '#{x}'" }
+        "//p[#{attr.join(' or ')}]"
       end
 
-      def make_RecommendationWordToC(docxml)
-        (docxml.at("//p[@class = 'RecommendationTitle']") &&
-          @tocrecommendationstitle) or return ""
+      def make_recommendation_word_toc(docxml)
+        (docxml.at(reqt_toc_xpath) && @tocrecommendationstitle) or return ""
         toc = %{<p class="TOCTitle">#{@tocrecommendationstitle}</p>}
-        docxml.xpath("//p[@class = 'RecommendationTitle' or @class = 'RecommendationTestTitle']").sort_by do |h|
+        docxml.xpath(reqt_toc_xpath).sort_by do |h|
           recommmendation_sort_key(h.text)
         end.each do |h|
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) + WORD_TOC_SUFFIX1
+                %{\\1#{word_toc_reqt_preface1}}) + WORD_TOC_SUFFIX1
       end
 
       def recommmendation_sort_key(header)
@@ -160,7 +185,7 @@ module IsoDoc
 
       def authority_cleanup1(docxml, klass)
         dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
-        auth = docxml.at("//div[@id = 'boilerplate-#{klass}' "\
+        auth = docxml.at("//div[@id = 'boilerplate-#{klass}' " \
                          "or @class = 'boilerplate-#{klass}']")
         auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each(&:remove)
         auth&.xpath(".//h1 | .//h2")&.each do |h|
@@ -218,7 +243,7 @@ module IsoDoc
         docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse
           .each_with_index do |br, i|
           @landscapestyle +=
-            "\ndiv.#{sect}_#{i} {page:#{sect}"\
+            "\ndiv.#{sect}_#{i} {page:#{sect}" \
             "#{br['orientation'] == 'landscape' ? 'L' : 'P'};}\n"
           split_at_section_break(docxml, sect, br, i)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -290,20 +290,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rexml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -459,6 +445,7 @@ files:
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
+- lib/isodoc/presentation_function/erefs.rb
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/math.rb