isodoc 2.3.2 → 2.3.4

data/lib/isodoc/presentation_function/inline.rb

@@ -10,8 +10,8 @@ module IsoDoc
     end
 
     def get_linkend(node)
-      c1 = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
-      return unless c1.empty?
+      node["style"] == "id" and anchor_id_postprocess(node)
+      return unless xref_empty?(node)
 
       link = anchor_linkend(node, docid_l10n(node["target"] ||
                                              expand_citeas(node["citeas"])))
@@ -23,11 +23,26 @@ module IsoDoc
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
+    def xref_empty?(node)
+      c1 = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
+      c1.empty?
+    end
+
+    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)}")
@@ -147,7 +162,6 @@ module IsoDoc
       end
     end
 
-    # TODO: move to localization file
     def eref_localities1_zh(_target, type, from, upto, node)
       ret = "第#{from}" if from
       ret += "&#x2013;#{upto}" if upto
@@ -156,7 +170,6 @@ module IsoDoc
       ret
     end
 
-    # TODO: move to localization file
     def eref_localities1(target, type, from, upto, node, lang = "en")
       return nil if type == "anchor"
 
@@ -182,10 +195,12 @@ module IsoDoc
 
     def xref(docxml)
       docxml.xpath(ns("//xref")).each { |f| xref1(f) }
+      docxml.xpath(ns("//xref//xref")).each { |f| f.replace(f.children) }
     end
 
     def eref(docxml)
       docxml.xpath(ns("//eref")).each { |f| xref1(f) }
+      docxml.xpath(ns("//erefstack")).each { |f| erefstack1(f) }
     end
 
     def origin(docxml)
@@ -212,9 +227,9 @@ module IsoDoc
     end
 
     def variant1(node)
-      if (!node["lang"] || node["lang"] == @lang) &&
-          (!node["script"] || node["script"] == @script)
-      elsif found_matching_variant_sibling(node)
+      if !((!node["lang"] || node["lang"] == @lang) &&
+          (!node["script"] || node["script"] == @script)) &&
+          found_matching_variant_sibling(node)
         node["remove"] = "true"
       end
     end

data/lib/isodoc/presentation_function/refs.rb

@@ -38,17 +38,13 @@ module IsoDoc
     end
 
     def bibrender(xml, renderings)
-      if f = xml.at(ns("./formattedref"))
+      if f = xml.at(ns("./formattedref")) && xml.at(ns("./title")).nil?
         bibrender_formattedref(f, xml)
       else bibrender_relaton(xml, renderings)
       end
     end
 
-    def bibrender_formattedref(formattedref, xml)
-      code = render_identifier(bibitem_ref_code(xml))
-      (code[:sdo] && xml["suppress_identifier"] != "true") and
-        formattedref << " [#{code[:sdo]}] "
-    end
+    def bibrender_formattedref(formattedref, xml); end
 
     def bibrender_relaton(xml, renderings)
       f = renderings[xml["id"]][:formattedref]

data/lib/isodoc/presentation_function/section.rb

@@ -3,9 +3,12 @@ require_relative "refs"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def clause(docxml)
-      docxml.xpath(ns("//clause | "\
+      docxml.xpath(ns("//clause | " \
                       "//terms | //definitions | //references"))
         .each do |f|
+        f.parent.name == "annex" &&
+          @xrefs.klass.single_term_clause?(f.parent) and next
+
         clause1(f)
       end
     end
@@ -23,8 +26,8 @@ module IsoDoc
     end
 
     def floattitle(docxml)
-      docxml.xpath(ns("//clause | //annex | //appendix | //introduction | "\
-                      "//foreword | //preface/abstract | //acknowledgements | "\
+      docxml.xpath(ns("//clause | //annex | //appendix | //introduction | " \
+                      "//foreword | //preface/abstract | //acknowledgements | " \
                       "//terms | //definitions | //references"))
         .each do |f|
         floattitle1(f)
@@ -42,9 +45,11 @@ module IsoDoc
 
     def annex(docxml)
       docxml.xpath(ns("//annex")).each do |f|
+        @xrefs.klass.single_term_clause?(f) and single_term_clause_retitle(f)
         annex1(f)
-        @xrefs.klass.single_term_clause?(f) and single_term_clause(f)
+        @xrefs.klass.single_term_clause?(f) and single_term_clause_unnest(f)
       end
+      @xrefs.parse_inclusions(clauses: true).parse(docxml)
     end
 
     def annex1(elem)
@@ -55,9 +60,16 @@ module IsoDoc
       prefix_name(elem, "<br/><br/>", lbl, "title")
     end
 
-    def single_term_clause(elem)
+    def single_term_clause_retitle(elem)
+      t = elem.at(ns("./terms | ./definitions | ./references"))
+      title1 = elem.at(ns("./title"))
+      title2 = t.at(ns("./title"))&.remove
+      !title1 && title2 and
+        elem.first_element_child.previous = title2
+    end
+
+    def single_term_clause_unnest(elem)
       t = elem.at(ns("./terms | ./definitions | ./references"))
-      t.at(ns("./title"))&.remove
       t.xpath(ns(".//clause | .//terms | .//definitions | .//references"))
         .each do |c|
           tit = c.at(ns("./title")) or return
@@ -72,7 +84,7 @@ module IsoDoc
     end
 
     def term1(elem)
-      lbl = @xrefs.get[elem["id"]][:label] or return
+      lbl = @xrefs.anchor(elem["id"], :label) or return
       prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
     end
 
@@ -101,7 +113,7 @@ module IsoDoc
       i = display_order_xpath(docxml, "//preface/*", i)
       i = display_order_at(docxml, "//clause[@type = 'scope']", i)
       i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-      i = display_order_at(docxml, "//sections/terms | "\
+      i = display_order_at(docxml, "//sections/terms | " \
                                    "//sections/clause[descendant::terms]", i)
       i = display_order_at(docxml, "//sections/definitions", i)
       i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)

data/lib/isodoc/presentation_function/xrefs.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def prefix_container(container, linkend, _target)
-      l10n("#{@xrefs.anchor(container, :xref)}, #{linkend}")
+    def prefix_container(container, linkend, node, _target)
+      l10n("#{anchor_xref(node, container)}, #{linkend}")
     end
 
     def anchor_value(id)
@@ -10,27 +10,42 @@ module IsoDoc
     end
 
     def anchor_linkend(node, linkend)
-      if node["citeas"].nil? && node["bibitemid"]
+      node["style"] == "id" and
+        return anchor_id_postproc(node)
+      node["citeas"].nil? && node["bibitemid"] and
         return @xrefs.anchor(node["bibitemid"], :xref) || "???"
-      elsif node.at(ns("./location"))
-        linkend = combine_xref_locations(node)
-      elsif node["target"] && node["droploc"]
+      node.at(ns("./location")) and
+        return combine_xref_locations(node) || "???"
+      node["target"] && node["droploc"] and
         return anchor_value(node["target"]) || "???"
-      elsif node["target"] && !/.#./.match(node["target"])
-        linkend = anchor_linkend1(node)
-      end
-
+      node["target"] && !/.#./.match(node["target"]) and
+        return anchor_linkend1(node) || "???"
       linkend || "???"
     end
 
+    def anchor_id_postproc(node)
+      node["target"]
+    end
+
     def anchor_linkend1(node)
-      linkend = @xrefs.anchor(node["target"], :xref)
+      linkend = anchor_xref(node, node["target"])
       container = @xrefs.anchor(node["target"], :container, false)
       prefix_container?(container, node) and
-        linkend = prefix_container(container, linkend, node["target"])
+        linkend = prefix_container(container, linkend, node, node["target"])
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
+    def anchor_xref(node, target)
+      x = @xrefs.anchor(target, :xref)
+      t = @xrefs.anchor(target, :title)
+      if node["style"] == "basic" && t then t
+      elsif node["style"] == "full" && t
+        l10n("#{x}, #{t}")
+      else
+        x
+      end
+    end
+
     def prefix_container?(container, node)
       type = @xrefs.anchor(node["target"], :type)
       container &&
@@ -55,7 +70,8 @@ module IsoDoc
       container = @xrefs.anchor(locs.first[:node]["target"], :container,
                                 false)
       prefix_container?(container, locs.first[:node]) and
-        ret = prefix_container(container, ret, locs.first[:node]["target"])
+        ret = prefix_container(container, ret, locs.first[:node],
+                               locs.first[:node]["target"])
       ret
     end
 

data/lib/isodoc/presentation_xml_convert.rb

@@ -36,9 +36,9 @@ module IsoDoc
       references docxml
       # triggers xrefs reparse, so put references before all other sections,
       # which alter titles and thus can alter xrefs
+      annex docxml
       clause docxml
       term docxml
-      annex docxml
       index docxml
       clausetitle docxml
       floattitle docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.3.2".freeze
+  VERSION = "2.3.4".freeze
 end

data/lib/isodoc/word_function/inline.rb

@@ -38,6 +38,8 @@ module IsoDoc
       def image_parse(node, out, caption)
         if emf = node.at(ns("./emf"))
           node["src"] = emf["src"]
+          node["height"] ||= emf["height"]
+          node["width"] ||= emf["width"]
           node["mimetype"] = "image/x-emf"
           node.children.remove
         end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -30,7 +30,7 @@ module IsoDoc
           n = Counter.new
           n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
           n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-          n = section_names(doc.at(ns("//sections/terms | "\
+          n = section_names(doc.at(ns("//sections/terms | " \
                                       "//sections/clause[descendant::terms]")), n, 1)
           n = section_names(doc.at(ns("//sections/definitions")), n, 1)
           clause_names(doc, n)
@@ -51,8 +51,13 @@ module IsoDoc
         bookmark_anchor_names(doc)
       end
 
-      def preface_clause_name(clause)
-        clause.at(ns("./title"))&.text || clause.name.capitalize
+      def clause_title(clause, use_elem_name: false)
+        ret = clause.at(ns("./title"))&.text
+        if use_elem_name && !ret
+          clause.name.capitalize
+        else
+          ret
+        end
       end
 
       SUBCLAUSES =
@@ -62,63 +67,71 @@ module IsoDoc
       def preface_names(clause)
         return if clause.nil?
 
-        @anchors[clause["id"]] =
-          { label: nil, level: 1, xref: preface_clause_name(clause),
-            type: "clause", elem: @labels["clause"] }
+        preface_name_anchors(clause, 1,
+                             clause_title(clause, use_elem_name: true))
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names1(c, c.at(ns("./title"))&.text,
-                         "#{preface_clause_name(clause)}, #{i + 1}", 2)
+                         "#{clause_title(clause)}, #{i + 1}", 2)
         end
       end
 
       def preface_names1(clause, title, parent_title, level)
         label = title || parent_title
-        @anchors[clause["id"]] = { label: nil, level: level, xref: label,
-                                   type: "clause", elem: @labels["clause"] }
+        preface_name_anchors(clause, level, title || parent_title)
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i + 1}",
                          level + 1)
         end
       end
 
+      def preface_name_anchors(clause, level, title)
+        @anchors[clause["id"]] =
+          { label: nil, level: level,
+            xref: title, title: nil,
+            type: "clause", elem: @labels["clause"] }
+      end
+
       def middle_section_asset_names(doc)
-        middle_sections = "//clause[@type = 'scope'] | "\
-                          "#{@klass.norm_ref_xpath} | "\
-                          "//sections/terms | //preface/* | "\
+        middle_sections = "//clause[@type = 'scope'] | " \
+                          "#{@klass.norm_ref_xpath} | " \
+                          "//sections/terms | //preface/* | " \
                           "//sections/definitions | //clause[parent::sections]"
         sequential_asset_names(doc.xpath(ns(middle_sections)))
       end
 
       def clause_names(docxml, num)
-        docxml.xpath(ns(@klass.middle_clause(docxml))).each_with_index do |c, _i|
+        docxml.xpath(ns(@klass.middle_clause(docxml)))
+          .each_with_index do |c, _i|
           section_names(c, num, 1)
         end
       end
 
       def section_names(clause, num, lvl)
-        return num if clause.nil?
+        clause.nil? and return num
 
         num.increment(clause)
-        @anchors[clause["id"]] =
-          { label: num.print, xref: l10n("#{@labels['clause']} #{num.print}"),
-            level: lvl, type: "clause", elem: @labels["clause"] }
-        i = Counter.new
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
+        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)
         end
         num
       end
 
       def section_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, level: level, xref: l10n("#{@labels['clause']} #{num}"),
-            type: "clause", elem: @labels["clause"] }
+        section_name_anchors(clause, num, level)
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           section_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
         end
       end
 
+      def section_name_anchors(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, xref: l10n("#{@labels['clause']} #{num}"),
+            title: clause_title(clause), level: level, type: "clause",
+            elem: @labels["clause"] }
+      end
+
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
         clause["obligation"] == "normative" and
@@ -127,21 +140,25 @@ module IsoDoc
         l10n("<strong>#{title} #{num}</strong><br/>#{obl}")
       end
 
-      def annex_name_anchors(clause, num)
-        { label: annex_name_lbl(clause, num),
-          elem: @labels["annex"], type: "clause",
-          subtype: "annex", value: num.to_s, level: 1,
-          xref: "#{@labels['annex']} #{num}" }
+      def annex_name_anchors(clause, num, level)
+        label = num
+        level == 1 && clause.name == "annex" and
+          label = annex_name_lbl(clause, num)
+        @anchors[clause["id"]] =
+          { label: label,
+            elem: @labels["annex"], type: "clause",
+            subtype: "annex", value: num.to_s, level: level,
+            title: clause_title(clause),
+            xref: "#{@labels['annex']} #{num}" }
       end
 
       def annex_names(clause, num)
-        @anchors[clause["id"]] = annex_name_anchors(clause, num)
+        annex_name_anchors(clause, num, 1)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
                        num.to_s, 1)
         else
-          i = Counter.new
-          clause.xpath(ns(SUBCLAUSES)).each do |c|
+          clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
             annex_names1(c, "#{num}.#{i.increment(c).print}", 2)
           end
         end
@@ -149,9 +166,7 @@ module IsoDoc
       end
 
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { xref: "#{@labels['annex']} #{num}",
-                                   elem: @labels["annex"], type: "clause",
-                                   label: num, level: level, subtype: "annex" }
+        annex_name_anchors(clause, num, level)
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           annex_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
@@ -159,9 +174,9 @@ module IsoDoc
       end
 
       ISO_PUBLISHER_XPATH =
-        "./contributor[xmlns:role/@type = 'publisher']/"\
-        "organization[abbreviation = 'ISO' or xmlns:abbreviation = 'IEC' or "\
-        "xmlns:name = 'International Organization for Standardization' or "\
+        "./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)

data/lib/isodoc-yaml/i18n-en.yaml

@@ -61,7 +61,7 @@ table: Table
 requirement: Requirement
 recommendation: Recommendation
 permission: Permission
-# OGC
+# Modspec
 recommendationtest: Recommendation test
 requirementtest: Requirement test
 permissiontest: Permission test

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -8,10 +8,10 @@ introduction: Introduction
 foreword: Avant-propos
 abstract: Résumé
 acknowledgements: Remerciements
-termsdef: Terms et définitions
-termsdefsymbolsabbrev: Terms, définitions, symboles et termes abrégés
-termsdefsymbols: Terms, définitions et symboles
-termsdefabbrev: Terms, définitions et termes abrégés
+termsdef: Termes et définitions
+termsdefsymbolsabbrev: Termes, définitions, symboles et termes abrégés
+termsdefsymbols: Termes, définitions et symboles
+termsdefabbrev: Termes, définitions et termes abrégés
 normref: Références normatives
 bibliography: Bibliographie
 preface: Préface
@@ -19,7 +19,7 @@ clause: Article
 annex: Annexe
 appendix: Appendice
 no_terms_boilerplate: |
-          <p>Aucun terme n’est defini dans le présent document.</p>
+          <p>Aucun terme n’est défini dans le présent document.</p>
 internal_terms_boilerplate: |
          <p>Pour les besoins du présent document, les termes et définitions suivants s’appliquent.</p>
 norm_with_refs_pref: 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -385,6 +385,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".hound.yml"
+- ".oss-guides.rubocop.yml"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -446,6 +449,7 @@ files:
 - lib/isodoc/html_function/html.rb
 - lib/isodoc/html_function/mathvariant_to_plain.rb
 - lib/isodoc/html_function/postprocess.rb
+- lib/isodoc/html_function/postprocess_cover.rb
 - lib/isodoc/html_function/postprocess_footnotes.rb
 - lib/isodoc/i18n.rb
 - lib/isodoc/init.rb
@@ -499,14 +503,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.