isodoc 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cbf57138d05cbc6fb861e09c867a3f4f3a58d349be341676e3a4ff2ef3b3477
-  data.tar.gz: e201871207c3d77a4be10a66624cd40859baf0a09bf309382f4fb43b2154e0eb
+  metadata.gz: d6ca47f20afd4ccef8c44ce28bfca11c4803f9aa8988e950cf1842dc251dc855
+  data.tar.gz: 9f2ca8a82bb0528e05f8a6cc631cfad987c0fe8d819937af79580a119955a921
 SHA512:
-  metadata.gz: 4b543165a879e7e1a4992c6a6bf58baa5b606af5ea83773194666daf4605ac4fb2142a95817b9259c825e9aa1abfcb750e1a0b6d4663ff29225ff6b547958b92
-  data.tar.gz: df54828f56b89b01dea07da527868a7f6fd7cf775b7133d4877856b97d838cbe48d21dbbde53263f61e51d937b6cf278a8e897f00d726ebccf3802e254999e97
+  metadata.gz: 10170334bf2d0bbf492237695054a1a164c8c7f056a8cec5d782cd468f4a367524fc9dc841fccf4c3f7c90038af32d83e962d5cf224d66e5f7d05323b1b65083
+  data.tar.gz: 9fc62b5c28d0baff4b369f15f8811a6be8b0bd85e1b63db6a9b36017e9a84a276c9df3034c679c0bd11ecbca0d5f7056bd2aa1627873a561be29b67f5619db9a

data/lib/isodoc/convert.rb

@@ -85,7 +85,6 @@ module IsoDoc
 
     def convert1(docxml, filename, dir)
       @xrefs.parse docxml
-      bibitem_lookup(docxml)
       noko do |xml|
         xml.html lang: @lang.to_s do |html|
           html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
@@ -97,13 +96,6 @@ module IsoDoc
       end.join("\n")
     end
 
-    def bibitem_lookup(docxml)
-      @bibitems = docxml.xpath(ns("//references/bibitem"))
-        .each_with_object({}) do |b, m|
-        m[b["id"]] = b
-      end
-    end
-
     def convert_init(file, input_filename, debug)
       docxml = Nokogiri::XML(file) { |config| config.huge }
       filename, dir = init_file(input_filename, debug)

data/lib/isodoc/function/inline.rb

@@ -52,45 +52,15 @@ module IsoDoc
         url.sub(/#{File.extname(url)}$/, ".html")
       end
 
-      def eref_target(node)
-        url = suffix_url(eref_url(node["bibitemid"]))
-        anchor = node&.at(ns(".//locality[@type = 'anchor']"))
-        return url if url.nil? || /^#/.match?(url) || !anchor
-
-        "#{url}##{anchor.text.strip}"
-      end
-
-      def eref_url(id)
-        @bibitems.nil? and return nil
-
-        b = @bibitems[id]
-        b.nil? and return nil
-
-        url = b.at(ns("./uri[@type = 'citation'][@language = '#{@lang}']")) and
-          return url.text
-        url = b.at(ns("./uri[@type = 'citation']")) and return url.text
-        b["hidden"] == "true" and return b.at(ns("./uri"))&.text
-        "##{id}"
-      end
-
       def eref_parse(node, out)
-        if href = eref_target(node)
-          if node["type"] == "footnote"
-            out.sup do |s|
-              s.a(href: href) { |l| no_locality_parse(node, l) }
-            end
-          else
-            out.a(href: href) { |l| no_locality_parse(node, l) }
-          end
-        else no_locality_parse(node, out)
-        end
+        no_locality_parse(node, out)
       end
 
       def origin_parse(node, out)
         if t = node.at(ns("./termref"))
           termrefelem_parse(t, out)
         else
-          eref_parse(node, out)
+          no_locality_parse(node, out)
         end
       end
 

data/lib/isodoc/html_function/html.rb

@@ -5,7 +5,6 @@ module IsoDoc
   module HtmlFunction
     module Html
       def convert1(docxml, filename, dir)
-        bibitem_lookup(docxml)
         noko do |xml|
           xml.html lang: @lang.to_s do |html|
             info docxml, nil

data/lib/isodoc/presentation_function/block.rb

@@ -203,7 +203,7 @@ module IsoDoc
     end
 
     def source_modification(mod)
-      termsource_modification(mod)
+      termsource_modification(mod.parent)
     end
   end
 end

data/lib/isodoc/presentation_function/concepts.rb

@@ -0,0 +1,90 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def concept(docxml)
+      @definition_ids = docxml.xpath(ns("//definitions//dt"))
+        .each_with_object({}) { |x, m| m[x["id"]] = true }
+      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: "true", ref: "true", bold: "false",
+                                    linkref: "true", linkmention: "false")
+      if @definition_ids[xref]
+        concept_render(node, ital: "false", ref: "false", bold: "false",
+                             linkref: "true", linkmention: "false")
+      else concept_render(node, ital: "true", ref: "true", bold: "false",
+                                linkref: "true", linkmention: "false")
+      end
+    end
+
+    def concept_render(node, defaults)
+      opts, render, ref = concept_render_init(node, defaults)
+      node&.at(ns("./refterm"))&.remove
+      ref && opts[:ref] != "false" and render&.next = " "
+      concept1_linkmention(ref, render, opts)
+      concept1_ref(node, ref, opts)
+      concept1_style(node, opts)
+      node.replace(node.children)
+    end
+
+    def concept1_style(node, opts)
+      r = node.at(ns(".//renderterm")) or return
+      opts[:ital] == "true" and r.children = "<em>#{to_xml(r.children)}</em>"
+      opts[:bold] == "true" and
+        r.children = "<strong>#{to_xml(r.children)}</strong>"
+      r.replace(r.children)
+    end
+
+    def concept_render_init(node, defaults)
+      opts = %i(bold ital ref linkref linkmention)
+        .each_with_object({}) { |x, m| m[x] = node[x.to_s] || defaults[x] }
+      [opts, node.at(ns("./renderterm")),
+       node.at(ns("./xref | ./eref | ./termref"))]
+    end
+
+    def concept1_linkmention(ref, renderterm, opts)
+      (opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?) or return
+      ref2 = ref.clone
+      r2 = renderterm.clone
+      renderterm.replace(ref2).children = r2
+    end
+
+    def concept1_ref(_node, ref, opts)
+      ref.nil? and return
+      opts[:ref] == "false" and return ref.remove
+      concept1_ref_content(ref)
+      %w(xref eref).include? ref.name and get_linkend(ref)
+      opts[:linkref] == "false" && %w(xref eref).include?(ref.name) and
+        ref.replace(ref.children)
+    end
+
+    def concept1_ref_content(ref)
+      prev = "["
+      foll = "]"
+      non_locality_elems(ref).select do |c|
+        !c.text? || /\S/.match(c)
+      end.empty? and
+        (prev, foll = @i18n.term_defined_in.split("%"))
+      ref.previous = prev
+      ref.next = foll
+    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
+      if p && ref
+        node.replace(l10n("<p><strong>#{label}:</strong> " \
+                          "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})</p>"))
+      else
+        node.replace(l10n("<p><strong>#{label}:</strong> " \
+                          "<strong>**RELATED TERM NOT FOUND**</strong></p>"))
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/erefs.rb

@@ -179,5 +179,54 @@ module IsoDoc
             end
       " #{ret}"
     end
+
+    def eref2link(docxml)
+      docxml.xpath(ns("//eref | //origin[not(termref)] | //quote/source"))
+        .each do |e|
+        href = eref_target(e) or next
+        e.xpath(ns("./locality | ./localityStack")).each(&:remove)
+        if /^#/.match?(href) then eref2xref(e)
+        else eref2link1(e, href)
+        end
+      end
+    end
+
+    def eref2xref(node)
+      node.name = "xref"
+      node["target"] = node["bibitemid"]
+      node.delete("bibitemid")
+      node.delete("citeas")
+      node["type"] == "footnote" and node.wrap("<sup></sup>")
+    end
+
+    def eref2link1(node, href)
+      repl = "<link target='#{href}'>#{node.children}</link>"
+      node["type"] == "footnote" and repl = "<sup>#{repl}</sup>"
+      node.replace(repl)
+    end
+
+    def suffix_url(url)
+      return url if url.nil? || %r{^https?://|^#}.match?(url)
+      return url unless File.extname(url).empty?
+
+      url.sub(/#{File.extname(url)}$/, ".html")
+    end
+
+    def eref_target(node)
+      url = suffix_url(eref_url(node["bibitemid"]))
+      anchor = node.at(ns(".//locality[@type = 'anchor']"))
+      return url if url.nil? || /^#/.match?(url) || !anchor
+
+      "#{url}##{anchor.text.strip}"
+    end
+
+    def eref_url(id)
+      @bibitems.nil? and return nil
+      b = @bibitems[id] or return nil
+      url = (b.at(ns("./uri[@type = 'citation'][@language = '#{@lang}']")) ||
+      b.at(ns("./uri[@type = 'citation']"))) and return url.text
+      b["hidden"] == "true" and return b.at(ns("./uri"))&.text
+      "##{id}"
+    end
   end
 end

data/lib/isodoc/presentation_function/terms.rb

@@ -1,92 +1,5 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def concept(docxml)
-      @definition_ids = docxml.xpath(ns("//definitions//dt"))
-        .each_with_object({}) { |x, m| m[x["id"]] = true }
-      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: "true", ref: "true", bold: "false",
-                                    linkref: "true", linkmention: "false")
-      if @definition_ids[xref]
-        concept_render(node, ital: "false", ref: "false", bold: "false",
-                             linkref: "true", linkmention: "false")
-      else concept_render(node, ital: "true", ref: "true", bold: "false",
-                                linkref: "true", linkmention: "false")
-      end
-    end
-
-    def concept_render(node, defaults)
-      opts, render, ref = concept_render_init(node, defaults)
-      node&.at(ns("./refterm"))&.remove
-      ref && opts[:ref] != "false" and render&.next = " "
-      concept1_linkmention(ref, render, opts)
-      concept1_ref(node, ref, opts)
-      concept1_style(node, opts)
-      node.replace(node.children)
-    end
-
-    def concept1_style(node, opts)
-      r = node.at(ns(".//renderterm")) or return
-      opts[:ital] == "true" and r.children = "<em>#{to_xml(r.children)}</em>"
-      opts[:bold] == "true" and
-        r.children = "<strong>#{to_xml(r.children)}</strong>"
-      r.replace(r.children)
-    end
-
-    def concept_render_init(node, defaults)
-      opts = %i(bold ital ref linkref linkmention)
-        .each_with_object({}) { |x, m| m[x] = node[x.to_s] || defaults[x] }
-      [opts, node.at(ns("./renderterm")),
-       node.at(ns("./xref | ./eref | ./termref"))]
-    end
-
-    def concept1_linkmention(ref, renderterm, opts)
-      (opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?) or return
-      ref2 = ref.clone
-      r2 = renderterm.clone
-      renderterm.replace(ref2).children = r2
-    end
-
-    def concept1_ref(_node, ref, opts)
-      ref.nil? and return
-      opts[:ref] == "false" and return ref.remove
-      concept1_ref_content(ref)
-      %w(xref eref).include? ref.name and get_linkend(ref)
-      opts[:linkref] == "false" && %w(xref eref).include?(ref.name) and
-        ref.replace(ref.children)
-    end
-
-    def concept1_ref_content(ref)
-      prev = "["
-      foll = "]"
-      non_locality_elems(ref).select do |c|
-        !c.text? || /\S/.match(c)
-      end.empty? and
-        (prev, foll = @i18n.term_defined_in.split("%"))
-      ref.previous = prev
-      ref.next = foll
-    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
-      if p && ref
-        node.replace(l10n("<p><strong>#{label}:</strong> " \
-                          "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})</p>"))
-      else
-        node.replace(l10n("<p><strong>#{label}:</strong> " \
-                          "<strong>**RELATED TERM NOT FOUND**</strong></p>"))
-      end
-    end
-
     def designation(docxml)
       docxml.xpath(ns("//term")).each { |t| merge_second_preferred(t) }
       docxml.xpath(ns("//preferred | //admitted | //deprecates"))
@@ -225,9 +138,7 @@ module IsoDoc
     end
 
     def termsource(docxml)
-      docxml.xpath(ns("//termsource/modification")).each do |f|
-        termsource_modification(f)
-      end
+      docxml.xpath(ns("//termsource")).each { |f| termsource_modification(f) }
       docxml.xpath(ns("//termsource")).each { |f| termsource1(f) }
     end
 
@@ -238,12 +149,25 @@ module IsoDoc
       elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
     end
 
-    def termsource_modification(mod)
-      mod.previous_element.next = l10n(", #{@i18n.modified}")
+    def termsource_modification(elem)
+      origin = elem.at(ns("./origin"))
+      s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
+      termsource_add_modification_text(elem.at(ns("./modification")))
+    end
+
+    def termsource_add_modification_text(mod)
+      mod or return
       mod.text.strip.empty? or mod.previous = " &#x2013; "
       mod.elements.size == 1 and
         mod.elements[0].replace(mod.elements[0].children)
       mod.replace(mod.children)
     end
+
+    def termsource_status(status)
+      case status
+      when "modified" then @i18n.modified
+      when "adapted" then @i18n.adapted
+      end
+    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "presentation_function/block"
+require_relative "presentation_function/concepts"
 require_relative "presentation_function/terms"
 require_relative "presentation_function/xrefs"
 require_relative "presentation_function/erefs"
@@ -17,12 +18,20 @@ module IsoDoc
 
     def convert1(docxml, _filename, _dir)
       @xrefs.parse docxml
+      bibitem_lookup(docxml)
       info docxml, nil
       conversions(docxml)
       docxml.root["type"] = "presentation"
       docxml.to_xml.gsub(/</, "<").gsub(/>/, ">")
     end
 
+    def bibitem_lookup(docxml)
+      @bibitems = docxml.xpath(ns("//references/bibitem"))
+        .each_with_object({}) do |b, m|
+        m[b["id"]] = b
+      end
+    end
+
     def conversions(docxml)
       semantic_xml_insert(docxml)
       bibdata docxml
@@ -69,9 +78,10 @@ module IsoDoc
 
     def inline(docxml)
       xref docxml
-      eref docxml
-      origin docxml
-      quotesource docxml
+      eref docxml # feeds docxml
+      origin docxml # feeds docxml
+      quotesource docxml # feeds docxml
+      eref2link docxml
       mathml docxml
       variant docxml
       identifier docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.5.4".freeze
+  VERSION = "2.5.5".freeze
 end

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

@@ -68,6 +68,7 @@ draft_label: مسودة
 inform_annex: إخباري
 norm_annex: مقياسي
 modified: معدلة
+adapted: تكيف
 deprecated: مهمل
 source: مصدر
 and: و

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

@@ -74,7 +74,8 @@ draft_label: Entwurf
 inform_annex: informativ
 norm_annex: normativ
 modified: geändert
-deprecated: DEPRECATED
+adapted: angepasst
+deprecated: VERALTET
 source: QUELLE
 and: und
 all_parts: Alle Teile

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

@@ -83,6 +83,7 @@ draft_label: draft
 inform_annex: informative
 norm_annex: normative
 modified: modified
+adapted: adapted
 deprecated: DEPRECATED
 source: SOURCE
 and: and

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

@@ -74,6 +74,7 @@ draft_label: borrador
 inform_annex: informativo
 norm_annex: normativo
 modified: modificado
+adapted: adaptado
 deprecated: OBSOLETO
 source: FUENTE
 and: y

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

@@ -71,6 +71,7 @@ draft_label: brouillon
 inform_annex: informative
 norm_annex: normative
 modified: modifié
+adapted: adapté
 deprecated: DÉCONSEILLÉ
 source: SOURCE
 edition: édition

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

@@ -79,7 +79,8 @@ wholeoftext: Whole of text
 draft_label: draft
 inform_annex: 参考
 norm_annex: 規定
-modified: modified
+modified: 修正された
+adapted: 適合しました
 deprecated: 推奨しない用語
 source: 出典
 and: and

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

@@ -79,6 +79,7 @@ draft_label: проект
 inform_annex: информативное
 norm_annex: нормативное
 modified: изменен
+adapted: адаптированный
 deprecated: НЕ РЕКОМЕНДУЕТСЯ
 source: ИСТОЧНИК
 and: и

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -69,6 +69,7 @@ draft_label: 稿
 inform_annex: 资料性附录
 norm_annex: 规范性附录
 modified: 改写
+adapted: 改编
 deprecated: 被取代
 source: 定义
 and: 和

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -433,6 +433,7 @@ files:
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
+- lib/isodoc/presentation_function/concepts.rb
 - lib/isodoc/presentation_function/erefs.rb
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb
@@ -473,7 +474,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -488,8 +489,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []