isodoc 1.7.7 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df030f2a89267d4acde57361f2c6338b29bf5928b5bb3c7b24a18903adf1531
-  data.tar.gz: 7e1923d7293b6b0703a15799e9bc3334637145adf8219c4230c63809267770cf
+  metadata.gz: e798df14fbf858fd0540d3fb2837774ec6a1924d5590ad4a628699888eff8425
+  data.tar.gz: 8f3e143a4c3cbcba0c4c349c315c6bf7b067164cd4cc22bd06a85dce71268e73
 SHA512:
-  metadata.gz: 24e8cf7a71167da62d5bdea85b009f982996e1513db82b42d6c01edf031b045dac7f9992a10e29946368df70dc32301e5edfa5937fad11e49e661edf8311058c
-  data.tar.gz: f61bb6a9b3833c0c4080c0804ae12869f15051ebec0f3fa6b3cc7d925b44de41559d472dde0ad737f54b02b040532a0a944e90a563fd1fcec4566965bda26fa4
+  metadata.gz: 6a0fbbabc25df62e19eeefecbf3369188194e28348ac6758f59024b58c0e4e23695440e41263c049455a12b1ce210e602c58e6142e9b8b95ac79d2fa8a64d341
+  data.tar.gz: 888429742fbf4ee0ab902b1a34d5edb8d7657b2fb561ecf3fe872fe48de14267e0e7edcae1e27c86ed5b36dc8d0becccd0ca6f96f6f1239936fb1bd287dc0130

data/isodoc.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciimath"
-  spec.add_dependency "html2doc", "~> 1.1.1"
+  spec.add_dependency "html2doc", "~> 1.2.0"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "liquid", "~> 4"
   # spec.add_dependency "metanorma", ">= 1.2.0"

data/lib/isodoc/function/cleanup.rb

@@ -165,6 +165,10 @@ module IsoDoc
             t << a.remove
           end
         end
+        table_footnote_cleanup_propagate(docxml)
+      end
+
+      def table_footnote_cleanup_propagate(docxml)
         docxml.xpath("//p[not(self::*[@class])]"\
                      "[ancestor::*[@class = 'TableFootnote']]").each do |p|
           p["class"] = "TableFootnote"

data/lib/isodoc/presentation_function/block.rb

@@ -54,12 +54,6 @@ module IsoDoc
       end
     end
 
-    def termexample(docxml)
-      docxml.xpath(ns("//termexample")).each do |f|
-        example1(f)
-      end
-    end
-
     def example1(elem)
       n = @xrefs.get[elem["id"]]
       lbl = if n.nil? || n[:label].nil? || n[:label].empty?
@@ -89,36 +83,6 @@ module IsoDoc
       prefix_name(elem, "", lbl, "name")
     end
 
-    def termnote(docxml)
-      docxml.xpath(ns("//termnote")).each do |f|
-        termnote1(f)
-      end
-    end
-
-    # introduce name element
-    def termnote1(elem)
-      lbl = l10n(@xrefs.anchor(elem["id"], :label) || "???")
-      prefix_name(elem, "", lower2cap(lbl), "name")
-    end
-
-    def termdefinition(docxml)
-      docxml.xpath(ns("//term[definition]")).each do |f|
-        termdefinition1(f)
-      end
-    end
-
-    def termdefinition1(elem)
-      return unless elem.xpath(ns("./definition")).size > 1
-
-      d = elem.at(ns("./definition"))
-      d = d.replace("<ol><li>#{d.children.to_xml}</li></ol>").first
-      elem.xpath(ns("./definition")).each do |f|
-        f = f.replace("<li>#{f.children.to_xml}</li>").first
-        d << f
-      end
-      d.wrap("<definition></definition>")
-    end
-
     def recommendation(docxml)
       docxml.xpath(ns("//recommendation")).each do |f|
         recommendation1(f, lower2cap(@i18n.recommendation))

data/lib/isodoc/presentation_function/inline.rb

@@ -1,5 +1,4 @@
 require "metanorma-utils"
-require_relative "./concept"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -35,8 +34,8 @@ module IsoDoc
 
     def capitalise_xref(node, linkend, label)
       linktext = linkend.gsub(/<[^>]+>/, "")
-      (label && !label.empty? && /^#{Regexp.escape(label)}/.match?(linktext) ||
-          linktext[0, 1].match?(/\p{Upper}/)) and return linkend
+      (label && !label.empty? && /^#{Regexp.escape(label)}/.match?(linktext)) ||
+        linktext[0, 1].match?(/\p{Upper}/) and return linkend
       node["case"] and
         return Common::case_with_markup(linkend, node["case"], @script)
 

data/lib/isodoc/presentation_function/terms.rb

@@ -0,0 +1,179 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def concept(docxml)
+      docxml.xpath(ns("//concept")).each { |f| concept1(f) }
+    end
+
+    def concept1(node)
+      xref = node&.at(ns("./xref/@target"))&.text or
+        return concept_render(node, ital: node["ital"] || "true",
+                                    ref: node["ref"] || "true",
+                                    linkref: node["linkref"] || "true",
+                                    linkmention: node["linkmention"] || "false")
+      if node.at(ns("//definitions//dt[@id = '#{xref}']"))
+        concept_render(node, ital: node["ital"] || "false",
+                             ref: node["ref"] || "false",
+                             linkref: node["linkref"] || "true",
+                             linkmention: node["linkmention"] || "false")
+      else concept_render(node, ital: node["ital"] || "true",
+                                ref: node["ref"] || "true",
+                                linkref: node["linkref"] || "true",
+                                linkmention: node["linkmention"] || "false")
+      end
+    end
+
+    def concept_render(node, opts)
+      node&.at(ns("./refterm"))&.remove
+      r = node.at(ns("./renderterm"))
+      ref = node.at(ns("./xref | ./eref | ./termref"))
+      ref && opts[:ref] != "false" and r&.next = " "
+      opts[:ital] == "true" and r&.name = "em"
+      if opts[:linkmention] == "true" && !r.nil? && !ref.nil?
+        ref2 = ref.clone
+        r2 = r.clone
+        r.replace(ref2).children = r2
+      end
+      concept1_ref(node, ref, opts)
+      if opts[:ital] == "false"
+        r = node.at(ns(".//renderterm"))
+        r&.replace(r&.children)
+      end
+      node.replace(node.children)
+    end
+
+    def concept1_ref(_node, ref, opts)
+      ref.nil? and return
+      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 | "\
+                 "./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)
+        ref.replace(ref.children)
+      end
+    end
+
+    def concept1_ref_content(ref)
+      if non_locality_elems(ref).select do |c|
+           !c.text? || /\S/.match(c)
+         end.empty?
+        ref.replace(@i18n.term_defined_in.sub(/%/,
+                                              ref.to_xml))
+      else ref.replace("[#{ref.to_xml}]")
+      end
+    end
+
+    def related(docxml)
+      docxml.xpath(ns("//related")).each { |f| related1(f) }
+    end
+
+    def related1(node)
+      p = node.at(ns("./preferred"))
+      ref = node.at(ns("./xref | ./eref | ./termref"))
+      label = @i18n.relatedterms[node["type"]].upcase
+      node.replace(l10n("<p><strong>#{label}:</strong> "\
+                        "<em>#{p.to_xml}</em> (#{ref.to_xml})</p>"))
+    end
+
+    def designation(docxml)
+      docxml.xpath(ns("//preferred | //admitted | //deprecates")).each do |p|
+        designation1(p)
+      end
+      docxml.xpath(ns("//term")).each do |t|
+        merge_second_preferred(t)
+      end
+    end
+
+    def merge_second_preferred(term)
+      pref = nil
+      term.xpath(ns("./preferred")).each_with_index do |p, i|
+        if i.zero? then pref = p
+        else
+          pref << l10n("; #{p.children.to_xml}")
+          p.remove
+        end
+      end
+    end
+
+    def designation1(desgn)
+      s = desgn.at(ns("./termsource"))
+      name = desgn.at(ns("./expression/name | ./letter-symbol/name | "\
+                         "./graphical-symbol")) or return
+
+      g = desgn.at(ns("./expression/grammar")) and
+        name << " #{designation_grammar(g).join(', ')}"
+      desgn.children = name.children
+      s and desgn.next = s
+    end
+
+    def designation_grammar(grammar)
+      ret = []
+      grammar.xpath(ns("./gender")).each do |x|
+        ret << @i18n.grammar_abbrevs[x.text]
+      end
+      %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
+        .each do |x|
+        grammar.at(ns("./#{x}[text() = 'true']")) and
+          ret << @i18n.grammar_abbrevs[x]
+      end
+      ret
+    end
+
+        def definition1(elem)
+          nodes = Nokogiri::XML::NodeSet.new(elem.document)
+          v = elem&.at(ns("./verbaldefinition"))&.children and nodes += v
+          n = elem&.at(ns("./nonverbalrepresentation"))&.children and nodes += n
+          elem.children = nodes
+        end
+
+            def termexample(docxml)
+      docxml.xpath(ns("//termexample")).each do |f|
+        example1(f)
+      end
+    end
+
+                def termnote(docxml)
+      docxml.xpath(ns("//termnote")).each do |f|
+        termnote1(f)
+      end
+    end
+
+    # introduce name element
+    def termnote1(elem)
+      lbl = l10n(@xrefs.anchor(elem["id"], :label) || "???")
+      prefix_name(elem, "", lower2cap(lbl), "name")
+    end
+
+    def termdefinition(docxml)
+      docxml.xpath(ns("//term[definition]")).each do |f|
+        termdefinition1(f)
+      end
+    end
+
+    def termdefinition1(elem)
+      unwrap_definition(elem)
+      multidef(elem) if elem.xpath(ns("./definition")).size > 1
+      end
+
+    def multidef(elem)
+      d = elem.at(ns("./definition"))
+      d = d.replace("<ol><li>#{d.children.to_xml}</li></ol>").first
+      elem.xpath(ns("./definition")).each do |f|
+        f = f.replace("<li>#{f.children.to_xml}</li>").first
+        d << f
+      end
+      d.wrap("<definition></definition>")
+    end
+
+           def unwrap_definition(elem)
+             elem.xpath(ns("./definition")).each do |d|
+          nodes = Nokogiri::XML::NodeSet.new(elem.document)
+          v = d&.at(ns("./verbaldefinition"))&.children and nodes += v
+          n = d&.at(ns("./nonverbalrepresentation"))&.children and nodes += n
+          d.children = nodes
+             end
+        end
+  end
+end

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "presentation_function/block"
+require_relative "presentation_function/terms"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/math"
 require_relative "presentation_function/section"
@@ -25,6 +26,7 @@ module IsoDoc
       @xrefs.parse docxml
       section docxml
       block docxml
+      terms docxml
       inline docxml
     end
 
@@ -46,17 +48,13 @@ module IsoDoc
       sourcecode docxml
       formula docxml
       example docxml
-      termexample docxml
       note docxml
-      termnote docxml
-      termdefinition docxml
       permission docxml
       requirement docxml
       recommendation docxml
     end
 
     def inline(docxml)
-      concept docxml
       xref docxml
       eref docxml
       origin docxml
@@ -65,6 +63,15 @@ module IsoDoc
       variant docxml
     end
 
+    def terms(docxml)
+      termexample docxml
+      termnote docxml
+      termdefinition docxml
+      designation docxml
+      concept docxml
+      related docxml
+    end
+
     def postprocess(result, filename, _dir)
       toXML(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.7.7".freeze
+  VERSION = "1.8.0".freeze
 end