isodoc 3.2.7 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a931ab5244c4320d81c3d050af1135ea7abc6e8f353cab6f000bc1fb70fd5526
-  data.tar.gz: db5d97c194f42a1b99b0839b2ae13b246871f7d353d44ea146a1ca3fc36dd18f
+  metadata.gz: bb4af3689c8908e75e4b6919cb448f2f909b35de01d4fdf44e30d2f080b7a7ce
+  data.tar.gz: 18ac32a56d90f11d83ebfc57d6ab17044228b7ab7a7aba65a90e2f6436505793
 SHA512:
-  metadata.gz: eee3ba25e7638d1d972cf86950eea148f11fdd713b8ad126eaffc375715624d060fe7c562a7ab1c5764ad92943f36c401e3a1a49ca614a3a13f5a8439950ea6a
-  data.tar.gz: 13004963d08b08371fe5c5ca24da18ac1321aebb849a97dc3ee23e26653f2d7dadf91bd8eb5aca50a2fe0014930927e21a0f4d80c8689edb3268a324d854358f
+  metadata.gz: 36124955f274bdc52944895c0b7742e89da9ec7646ad0801e1711393a266e405ab22087aeb475a513a46c4b8e4421b83e6b09c4092add9782cd5320ecb28c471
+  data.tar.gz: 462d5b598a87eaa3016b2cb5cc81ec94bf5da6a02608f9e5e008bc142c7dc5d67dfc043255ec773929132035f882b8d7555a886bc6ea0288c32487a6ba9614ec

data/isodoc.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
 
-  spec.add_dependency "relaton-render", "~> 0.9.0"
+  spec.add_dependency "relaton-render", "~> 0.10.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"

data/lib/isodoc/convert.rb

@@ -86,8 +86,9 @@ module IsoDoc
     end
 
     def bibrenderer(options = {})
-      ::Relaton::Render::IsoDoc::General.new(options.merge(language: @lang,
-                                                           i18nhash: @i18n.get))
+      ::Relaton::Render::IsoDoc::General
+        .new(options.merge(language: @lang, script: @script,
+                           i18nhash: @i18n.get))
     end
 
     def convert1_namespaces(html)

data/lib/isodoc/function/terms.rb

@@ -36,6 +36,12 @@ module IsoDoc
         end
       end
 
+      def related_parse(node, out)
+        out.div class: "RelatedTerms", style: "text-align:left;" do |p|
+          node.children.each { |c1| parse(c1, p) }
+        end
+      end
+
       def semx_term_parse(node, out); end
 
       def semx_related_parse(node, out); end

data/lib/isodoc/function/to_word_html.rb

@@ -180,6 +180,7 @@ module IsoDoc
           when "termsource" then semx_termref_parse(node, out)
           when "fmt-termsource" then termref_parse(node, out)
           when "related" then semx_related_parse(node, out)
+          when "fmt-related" then related_parse(node, out)
           when "modification" then modification_parse(node, out)
           when "termnote" then termnote_parse(node, out)
           when "terms" then terms_parse(node, out)

data/lib/isodoc/init.rb

@@ -14,8 +14,9 @@ module IsoDoc
                                      i18nyaml: i18nyaml || @i18nyaml)
     end
 
-    def l10n(expr, lang = @lang, script = @script, locale = @locale)
-      @i18n.l10n(expr, lang, script, locale)
+    def l10n(expr, lang = @lang, script = @script, opt = {})
+      opt[:locale] ||= @locale
+      @i18n.l10n(expr, lang, script, opt)
     end
 
     def toc_init(docxml)
@@ -170,8 +171,8 @@ module IsoDoc
 
     def omit_docid_prefix(prefix)
       prefix.nil? || prefix.empty? and return true
-      %w(ISO IEC IEV ITU W3C BIPM csd metanorma repository metanorma-ordinal)
-        .include? prefix
+      %w(ISO IEC IEV ITU W3C BIPM csd metanorma repository metanorma-ordinal
+         title).include? prefix
     end
 
     def connectives_spans(text)

data/lib/isodoc/metadata.rb

@@ -9,8 +9,9 @@ module IsoDoc
       Common::ns(xpath)
     end
 
-    def l10n(expr, lang = @lang, script = @script, locale = @locale)
-      @i18n.l10n(expr, lang, script, locale)
+        def l10n(expr, lang = @lang, script = @script, opt = {})
+      opt[:locale] ||= @locale
+      @i18n.l10n(expr, lang, script, opt)
     end
 
     def connectives_strip(text)
@@ -115,7 +116,7 @@ module IsoDoc
       draftinfo = " (#{@labels['draft_label']} #{draft}"
       draftinfo += ", #{revdate}" if revdate
       draftinfo += ")"
-      l10n(draftinfo, @lang, @script, @locale)
+      l10n(draftinfo, @lang, @script)
     end
 
     def version(isoxml, _out)

data/lib/isodoc/presentation_function/autonum.rb

@@ -78,7 +78,7 @@ module IsoDoc
     end
 
     def semx(node, label, element = "autonum")
-      id = node["id"] || node[:id]
+      id = node["id"] || node[:id] || elem['original-id']
       /<semx element='[^']+' source='#{id}'/.match?(label) and return label
       l = stripsemx(label)
       %(<semx element='#{element}' source='#{id}'>#{l}</semx>)
@@ -118,7 +118,7 @@ module IsoDoc
         prefix_container_fmt_xref_label(container_container,
                                         @xrefs.anchor(container, :xref, false))
       l10n(connectives_spans(@i18n.nested_xref
-        .sub("%1", "<span class='fmt-xref-container'>#{container_label}</span>")
+        .sub("%1", "<span class='fmt-xref-container'><esc>#{container_label}</esc></span>")
         .sub("%2", xref)))
     end
 

data/lib/isodoc/presentation_function/bibdata.rb

@@ -6,6 +6,7 @@ module IsoDoc
       a = bibdata_current(docxml) or return
       address_precompose(a)
       bibdata_i18n(a)
+      @xrefs.klass.localdir ||= @localdir
       @xrefs.klass.info docxml, nil
     end
 

data/lib/isodoc/presentation_function/block.rb

@@ -87,7 +87,8 @@ module IsoDoc
 
     def admonition_label(elem, num)
       lbl = if elem["type"] == "box" then @i18n.box
-            else @i18n.admonition[elem["type"]]&.upcase end
+            else @i18n.admonition[elem["type"]]&.upcase
+            end
       labelled_autonum(lbl, elem["id"], num)
     end
 
@@ -107,7 +108,7 @@ module IsoDoc
       elem["unnumbered"] && !elem.at(ns("./name")) and return
       n = @xrefs.anchor(elem["id"], :label, false)
       lbl = labelled_autonum(lower2cap(@i18n.table), elem["id"], n)
-      prefix_name(elem, { caption: table_delim }, l10n(lbl), "name")
+      prefix_name(elem, { caption: table_delim }, lbl, "name")
     end
 
     def table_css(elem)
@@ -184,17 +185,29 @@ module IsoDoc
       source1(elem, :figure)
     end
 
+    def source_join_delim(_elem)
+      "; "
+    end
+
     def source1(elem, ancestor)
-      n = elem
-      while n = n&.next_element
-        case n.name
+      source_elems = source1_gather(elem)
+      source_elems.each do |e|
+        elem << "#{source_join_delim(elem)}#{to_xml(e.remove.children).strip}"
+      end
+      source1_label(elem, to_xml(elem.children).strip, ancestor)
+    end
+
+    def source1_gather(elem)
+      source_elems = []
+      while elem = elem&.next_element
+        case elem.name
         when "source"
         when "fmt-source"
-          elem << "; #{to_xml(n.remove.children)}"
+          source_elems << elem
         else break
         end
       end
-      source1_label(elem, to_xml(elem.children).strip, ancestor)
+      source_elems
     end
 
     def source1_label(elem, sources, _ancestor)

data/lib/isodoc/presentation_function/concepts.rb

@@ -104,153 +104,5 @@ module IsoDoc
       ref.previous = prev
       ref.next = foll
     end
-
-    def related(docxml)
-      docxml.xpath(ns("//fmt-related/semx")).each { |f| related1(f) }
-    end
-
-    def related1(node)
-      p, ref, orig = related1_prep(node)
-      label = @i18n.relatedterms[orig["type"]].upcase
-      ret = "<strong>**RELATED TERM NOT FOUND**</strong>"
-      p && ref and ret = "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})"
-      node.children = (l10n("<p><strong>#{label}:</strong> #{ret}</p>"))
-    end
-
-    def related1_prep(node)
-      p = node.at(ns("./fmt-preferred"))&.children
-      ref = node.at(ns("./xref | ./eref | ./termref"))
-      orig = semx_orig(node)
-      [p, ref, orig]
-    end
-
-    def related_designation1(desgn)
-      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
-      d1 = semx_fmt_dup(desgn)
-      %w(preferred admitted deprecates).each do |w|
-        d = d1.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
-      end
-      out << d1
-    end
-
-    def designation(docxml)
-      docxml.xpath(ns("//related")).each { |p| related_designation1(p) }
-      docxml.xpath(ns("//preferred | //admitted | //deprecates"))
-        .each { |p| designation1(p) }
-      docxml.xpath(ns("//fmt-preferred | //fmt-admitted | //fmt-deprecates"))
-        .each { |t| merge_second_preferred(t) }
-      docxml.xpath(ns("//fmt-deprecates")).each { |d| deprecates(d) }
-      docxml.xpath(ns("//fmt-admitted")).each { |d| admits(d) }
-    end
-
-    def deprecates(elem)
-      elem.xpath(ns(".//semx[@element = 'deprecates']")).each do |t|
-        t.previous = @i18n.l10n("#{@i18n.deprecated}: ")
-      end
-    end
-
-    def admits(elem); end
-
-    def merge_second_preferred(term)
-      pref = nil
-      out = term.xpath(ns("./semx")).each_with_index
-        .with_object([]) do |(p, i), m|
-        if (i.zero? && (pref = p)) || merge_preferred_eligible?(pref, p)
-          m << p
-        else p.wrap("<p></p>")
-        end
-      end
-      pref&.replace(merge_second_preferred1(out, term))
-    end
-
-    def merge_second_preferred1(desgns, term)
-      desgns[1..].each(&:remove)
-      ret = l10n(desgns.map { |x| to_xml(x) }.join("; "))
-      term.ancestors("fmt-related").empty? and ret = "<p>#{ret}</p>"
-      ret
-    end
-
-    def merge_preferred_eligible?(first, second)
-      orig_first, orig_second, firstex, secondex =
-        merge_preferred_eligible_prep(first, second)
-      orig_first["geographic-area"] == orig_second["geographic-area"] &&
-        firstex["language"] == secondex["language"] &&
-        !orig_first.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
-        !orig_second.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
-        orig_first.name == "preferred" && orig_second.name == "preferred"
-    end
-
-    def merge_preferred_eligible_prep(first, second)
-      orig_first = semx_orig(first)
-      orig_second = semx_orig(second)
-      firstex = orig_first.at(ns("./expression")) || {}
-      secondex = orig_second.at(ns("./expression")) || {}
-      [orig_first, orig_second, firstex, secondex]
-    end
-
-    def designation1(desgn)
-      desgn.parent.name == "related" and return
-      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
-      d1 = semx_fmt_dup(desgn)
-      s = d1.at(ns("./source"))
-      modification_dup_align(desgn.at(ns("./source")), s)
-      name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
-                         "./graphical-symbol")) or return
-      designation_annotate(d1, name, desgn)
-      out << d1
-      s and out << s.wrap("<fmt-termsource></fmt-termsource>").parent
-    end
-
-    def designation_annotate(desgn, name, orig)
-      designation_boldface(desgn)
-      designation_field(desgn, name, orig)
-      designation_grammar(desgn, name)
-      designation_localization(desgn, name, orig)
-      designation_pronunciation(desgn, name)
-      designation_bookmarks(desgn, name)
-      desgn.children = name.children
-    end
-
-    def designation_boldface(desgn)
-      desgn["element"] == "preferred" or return
-      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
-      name.children = "<strong>#{name.children}</strong>"
-    end
-
-    def designation_field(_desgn, name, orig)
-      f = orig.xpath(ns("./field-of-application | ./usage-info"))
-        &.map { |u| to_xml(semx_fmt_dup(u)) }&.join(", ")
-      f&.empty? and return nil
-      name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>"
-    end
-
-    def designation_grammar(desgn, name)
-      g = desgn.at(ns("./expression/grammar")) or return
-      ret = g.xpath(ns("./gender | ./number")).each_with_object([]) do |x, m|
-        m << @i18n.grammar_abbrevs[x.text]
-      end
-      %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
-        .each do |x|
-        g.at(ns("./#{x}[text() = 'true']")) and ret << @i18n.grammar_abbrevs[x]
-      end
-      name << ", #{ret.join(', ')}"
-    end
-
-    def designation_localization(desgn, name, orig_desgn)
-      loc = [desgn.at(ns("./expression/@language"))&.text,
-             desgn.at(ns("./expression/@script"))&.text,
-             orig_desgn.at("./@geographic-area")&.text].compact
-      loc.empty? and return
-      name << ", #{loc.join(' ')}"
-    end
-
-    def designation_pronunciation(desgn, name)
-      f = desgn.at(ns("./expression/pronunciation")) or return
-      name << ", /#{to_xml(f.children)}/"
-    end
-
-    def designation_bookmarks(desgn, name)
-      desgn.xpath(ns(".//bookmark")).each { |b| name << b.remove }
-    end
   end
 end

data/lib/isodoc/presentation_function/designations.rb

@@ -0,0 +1,158 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def related(docxml)
+      docxml.xpath(ns("//fmt-related/semx")).each { |f| related1(f) }
+    end
+
+    # Only render related if rendered and hyperlinked
+    def related1(node)
+      p, ref, orig = related1_prep(node)
+      label = @i18n.relatedterms[orig["type"]].upcase
+      ret = if p && ref
+              if p.text == ref.text
+                "<em>#{Common::to_xml(ref)}</em>"
+              else
+                "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})"
+              end
+            else "<strong>**RELATED TERM NOT FOUND**</strong>"
+            end
+      node.children = (l10n("<p><strong>#{label}:</strong> #{ret}</p>"))
+    end
+
+    def related1_prep(node)
+      p = node.at(ns("./fmt-preferred"))&.children
+      ref = node.at(ns("./xref | ./eref | ./termref"))
+      orig = semx_orig(node)
+      [p, ref, orig]
+    end
+
+    def related_designation1(desgn)
+      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
+      d1 = semx_fmt_dup(desgn)
+      %w(preferred admitted deprecates).each do |w|
+        d = d1.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
+      end
+      out << d1
+    end
+
+    def designation(docxml)
+      docxml.xpath(ns("//related")).each { |p| related_designation1(p) }
+      docxml.xpath(ns("//preferred | //admitted | //deprecates"))
+        .each { |p| designation1(p) }
+      docxml.xpath(ns("//fmt-preferred | //fmt-admitted | //fmt-deprecates"))
+        .each { |t| merge_second_preferred(t) }
+      docxml.xpath(ns("//fmt-deprecates")).each { |d| deprecates(d) }
+      docxml.xpath(ns("//fmt-admitted")).each { |d| admits(d) }
+    end
+
+    def deprecates(elem)
+      elem.xpath(ns(".//semx[@element = 'deprecates']")).each do |t|
+        t.previous = @i18n.l10n("#{@i18n.deprecated}: ")
+      end
+    end
+
+    def admits(elem); end
+
+    def merge_second_preferred(term)
+      pref = nil
+      out = term.xpath(ns("./semx")).each_with_index
+        .with_object([]) do |(p, i), m|
+        if (i.zero? && (pref = p)) || merge_preferred_eligible?(pref, p)
+          m << p
+        else p.wrap("<p></p>")
+        end
+      end
+      pref&.replace(merge_second_preferred1(out, term))
+    end
+
+    def merge_second_preferred1(desgns, term)
+      desgns[1..].each(&:remove)
+      ret = l10n(desgns.map { |x| to_xml(x) }.join("; "))
+      term.ancestors("fmt-related").empty? and ret = "<p>#{ret}</p>"
+      ret
+    end
+
+    def merge_preferred_eligible?(first, second)
+      orig_first, orig_second, firstex, secondex =
+        merge_preferred_eligible_prep(first, second)
+      orig_first["geographic-area"] == orig_second["geographic-area"] &&
+        firstex["language"] == secondex["language"] &&
+        !orig_first.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
+        !orig_second.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
+        orig_first.name == "preferred" && orig_second.name == "preferred"
+    end
+
+    def merge_preferred_eligible_prep(first, second)
+      orig_first = semx_orig(first)
+      orig_second = semx_orig(second)
+      firstex = orig_first.at(ns("./expression")) || {}
+      secondex = orig_second.at(ns("./expression")) || {}
+      [orig_first, orig_second, firstex, secondex]
+    end
+
+    def designation1(desgn)
+      desgn.parent.name == "related" and return
+      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
+      d1 = semx_fmt_dup(desgn)
+      s = d1.at(ns("./source"))
+      modification_dup_align(desgn.at(ns("./source")), s)
+      name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
+                         "./graphical-symbol")) or return
+      designation_annotate(d1, name, desgn)
+      out << d1
+      s and out << s.wrap("<fmt-termsource></fmt-termsource>").parent
+    end
+
+    def designation_annotate(desgn, name, orig)
+      designation_boldface(desgn)
+      designation_field(desgn, name, orig)
+      designation_grammar(desgn, name)
+      designation_localization(desgn, name, orig)
+      designation_pronunciation(desgn, name)
+      designation_bookmarks(desgn, name)
+      desgn.children = name.children
+    end
+
+    def designation_boldface(desgn)
+      desgn["element"] == "preferred" or return
+      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
+      name.children = "<strong>#{name.children}</strong>"
+    end
+
+    def designation_field(_desgn, name, orig)
+      f = orig.xpath(ns("./field-of-application | ./usage-info"))
+        &.map { |u| to_xml(semx_fmt_dup(u)) }&.join(", ")
+      f&.empty? and return nil
+      name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>"
+    end
+
+    def designation_grammar(desgn, name)
+      g = desgn.at(ns("./expression/grammar")) or return
+      ret = g.xpath(ns("./gender | ./number")).each_with_object([]) do |x, m|
+        m << @i18n.grammar_abbrevs[x.text]
+      end
+      %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
+        .each do |x|
+        g.at(ns("./#{x}[text() = 'true']")) and ret << @i18n.grammar_abbrevs[x]
+      end
+      name << ", #{ret.join(', ')}"
+    end
+
+    def designation_localization(desgn, name, orig_desgn)
+      loc = [desgn.at(ns("./expression/@language"))&.text,
+             desgn.at(ns("./expression/@script"))&.text,
+             orig_desgn.at("./@geographic-area")&.text].compact
+      loc.empty? and return
+      name << ", #{loc.join(' ')}"
+    end
+
+    def designation_pronunciation(desgn, name)
+      f = desgn.at(ns("./expression/pronunciation")) or return
+      name << ", /#{to_xml(f.children)}/"
+    end
+
+    def designation_bookmarks(desgn, name)
+      desgn.xpath(ns(".//bookmark")).each { |b| name << b.remove }
+    end
+  end
+end

data/lib/isodoc/presentation_function/docid.rb

@@ -23,7 +23,7 @@ module IsoDoc
       data, = @bibrender.parse(bib)
       ret = data[:authoritative_identifier] or return nil
       ret.empty? and return nil
-      ret
+      ret.map { |x| @i18n.l10n(x) } # get rid of `<esc>` wrappers
     end
 
     # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
@@ -31,11 +31,13 @@ module IsoDoc
       id, id1, id2, id3 = bibitem_ref_code_prep(bib)
       id || id1 || id2 || id3 and return [id, id1, id2, id3]
       bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
-      [nil, no_identifier(bib), nil, nil]
+      # [nil, no_identifier(bib), nil, nil]
+      [nil, nil, nil, nil]
     end
 
     def bibitem_ref_code_prep(bib)
-      id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
+      id = bib.at(ns("./docidentifier[@type = 'metanorma']")) ||
+        bib.at(ns("./docidentifier[@type = 'title']"))
       id1 = pref_ref_code(bib)
       id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
       id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))