isodoc 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec504b3b905ec960bef74398b3789ab5b7eb248dc05a7c3f64590db77d31cac6
-  data.tar.gz: c2de4c1589a7ff282715f4930a1851393358a64fd407c5a1e3bda02beddc0782
+  metadata.gz: f13a3c3a1018484dfa9518b6831d188803ca83c2d89ee872ff17723994c0fae7
+  data.tar.gz: b4461e1537e949cbfbc851309cc1f29c974a38fda8728f405591dc586267943c
 SHA512:
-  metadata.gz: 34a1c43f6f34f90aa326ed7ff50ede791eadaf22c05ebf0f4183fb2cb3c708bd4f0512572b638a94e236b807f5a873986c24579fe126eb88ad15ef1e178c64d2
-  data.tar.gz: 23fbe4f295729ad565ab787903e9c4b49388671766b91477dc3d26302b8499da892f77d6e034ce4f6cc4ba1b0956c8dbb051e94a3a336acdb661d1e6d30e584b
+  metadata.gz: eb0cf999d3a0155a13913543101228f4c1d60c4705dfdd67ca76f4e21fd00e59853040e4bbe516b64d4fc11a0aaf7da3573f8932f6bf7112dd3293ccc82263a2
+  data.tar.gz: c43855701417ffcad7a7e85086b489995ac1af483752c5b9ad1f958fbf944e38a94ca5fd3b4dcf90103608cad6a2d9b6d08fa46a877dffaeef14475212e7056c

data/Gemfile

@@ -9,3 +9,5 @@ gemspec
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+
+gem "reline", "~> 0.2.8.pre.11"

data/isodoc.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
 
-  spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

data/lib/isodoc/class_utils.rb

@@ -16,7 +16,7 @@ module IsoDoc
       xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1")
         .gsub(%r{::([a-zA-z])}, "::xmlns:\\1")
         .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]* ?=)}, "[xmlns:\\1")
-        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*\])}, "[xmlns:\\1")
+        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*[/\]])}, "[xmlns:\\1")
     end
 
     def liquid(doc)

data/lib/isodoc/function/cleanup.rb

@@ -2,17 +2,7 @@ module IsoDoc
   module Function
     module Cleanup
       def textcleanup(docxml)
-        termref_cleanup(passthrough_cleanup(docxml))
-      end
-
-      def termref_cleanup(docxml)
-        docxml
-          .gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/,
-                l10n(", #{@i18n.modified} [/TERMREF]"))
-          .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ")
-          .gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source}: "))
-          .gsub(%r{\s*\[/TERMREF\]\s*}, l10n("]"))
-          .gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
+        passthrough_cleanup(docxml)
       end
 
       def passthrough_cleanup(docxml)

data/lib/isodoc/function/inline.rb

@@ -5,7 +5,7 @@ module IsoDoc
     module Inline
       def link_parse(node, out)
         url = node["target"]
-        node["updatetype"] == "true" and url = suffix_url(url)
+        node["update-type"] == "true" and url = suffix_url(url)
         out.a **attr_code(href: url, title: node["alt"]) do |l|
           if node.text.empty?
             l << node["target"].sub(/^mailto:/, "")
@@ -41,8 +41,8 @@ module IsoDoc
       end
 
       def eref_target(node)
-        return "##{node['bibitemid']}" unless url = @bibitems[node["bibitemid"]]
-          &.at(ns("./uri[@type = 'citation']"))
+        return "##{node['bibitemid']}" unless (!@bibitems.nil? &&
+          url = @bibitems[node["bibitemid"]]&.at(ns("./uri[@type = 'citation']")))
 
         href = suffix_url(url.text)
         anchor = node&.at(ns(".//locality[@type = 'anchor']"))&.text&.strip

data/lib/isodoc/function/terms.rb

@@ -6,7 +6,6 @@ module IsoDoc
       end
 
       def modification_parse(node, out)
-        out << "[MODIFICATION]"
         para = node.at(ns("./p"))
         para.children.each { |n| parse(n, out) }
       end
@@ -58,9 +57,7 @@ module IsoDoc
 
       def termref_parse(node, out)
         out.p do |p|
-          p << "[TERMREF]"
           node.children.each { |n| parse(n, p) }
-          p << "[/TERMREF]"
         end
       end
 

data/lib/isodoc/function/utils.rb

@@ -37,10 +37,9 @@ module IsoDoc
       end
 
       def attr_code(attributes)
-        attributes = attributes.compact.map
-        attributes.map do |k, v|
-          [k, v.is_a?(String) ? HTMLEntities.new.decode(v) : v]
-        end.to_h
+        attributes.compact.transform_values do |v|
+          v.is_a?(String) ? HTMLEntities.new.decode(v) : v
+        end
       end
 
       DOCTYPE_HDR = "<!DOCTYPE html SYSTEM "\
@@ -188,10 +187,17 @@ module IsoDoc
       end
 
       def image_localfile(img)
+        case img["src"]
+        when /^data:/
+          save_dataimage(img["src"], false)
+        when %r{^([A-Z]:)?/}
+          img["src"]
+=begin
         if /^data:/.match? img["src"]
           save_dataimage(img["src"], false)
         elsif %r{^([A-Z]:)?/}.match? img["src"]
           img["src"]
+=end
         else
           File.join(@localdir, img["src"])
         end
@@ -211,7 +217,6 @@ module IsoDoc
         c = HTMLEntities.new
         text.split(/([<>])/).each_slice(4).map do |a|
           a[0] = c.encode(c.decode(a[0]), :hexadecimal)
-          a[2] = c.encode(c.decode(a[2]), :hexadecimal) if a.size >= 3
           a
         end.join
       end

data/lib/isodoc/i18n.rb

@@ -55,8 +55,8 @@ module IsoDoc
       @labels = y
       @labels["language"] = @lang
       @labels["script"] = @script
-      @labels.each do |k, v|
-        self.class.send(:define_method, k.downcase) { v }
+      @labels.each do |k, _v|
+        self.class.send(:define_method, k.downcase) { get[k] }
       end
     end
 
@@ -68,19 +68,40 @@ module IsoDoc
     # function localising spaces and punctuation.
     # Not clear if period needs to be localised for zh
     def l10n(text, lang = @lang, script = @script)
-      if lang == "zh" && script == "Hans"
-        xml = Nokogiri::HTML::DocumentFragment.parse(text)
-        xml.traverse do |n|
-          next unless n.text?
+      if lang == "zh" && script == "Hans" then l10n_zh(text)
+      else bidiwrap(text, lang, script)
+      end
+    end
 
-          n.replace(n.text.gsub(/ /, "").gsub(/:/, "：").gsub(/,/, "、")
-            .gsub(/\(/, "（").gsub(/\)/, "）").gsub(/\[/, "【").gsub(/\]/, "】"))
-        end
-        xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
+    def bidiwrap(text, lang, script)
+      my_script, my_rtl, outer_rtl = bidiwrap_vars(lang, script)
+      if my_rtl && !outer_rtl
+        mark = %w(Arab Aran).include?(my_script) ? "&#x61c;" : "&#x200f;"
+        "#{mark}#{text}#{mark}"
+      elsif !my_rtl && outer_rtl then "&#x200e;#{text}&#x200e;"
       else text
       end
     end
 
+    def bidiwrap_vars(lang, script)
+      my_script = script || Metanorma::Utils.default_script(lang)
+      [my_script,
+       Metanorma::Utils.rtl_script?(my_script),
+       Metanorma::Utils.rtl_script?(@script || Metanorma::Utils
+         .default_script(@lang))]
+    end
+
+    def l10n_zh(text)
+      xml = Nokogiri::HTML::DocumentFragment.parse(text)
+      xml.traverse do |n|
+        next unless n.text?
+
+        n.replace(n.text.gsub(/ /, "").gsub(/:/, "：").gsub(/,/, "、")
+          .gsub(/\(/, "（").gsub(/\)/, "）").gsub(/\[/, "【").gsub(/\]/, "】"))
+      end
+      xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
+    end
+
     def multiple_and(names, andword)
       return "" if names.empty?
       return names[0] if names.length == 1

data/lib/isodoc/presentation_function/block.rb

@@ -12,11 +12,11 @@ module IsoDoc
       return if number.nil? || number.empty?
 
       unless name = node.at(ns("./#{elem}"))
-        node.children.empty? and node.add_child("<#{elem}></#{elem}>") or
+        (node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
           node.children.first.previous = "<#{elem}></#{elem}>"
         name = node.children.first
       end
-      if name.children.empty? then name.add_child(number)
+      if name.children.empty? then name.add_child(cleanup_entities(number))
       else (name.children.first.previous = "#{number}#{delim}")
       end
     end
@@ -29,7 +29,6 @@ module IsoDoc
 
     def sourcecode1(elem)
       return if labelled_ancestor(elem)
-      return unless elem.ancestors("example").empty?
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, "&nbsp;&mdash; ",

data/lib/isodoc/presentation_function/image.rb

@@ -29,8 +29,8 @@ module IsoDoc
     def figure1(elem)
       return sourcecode1(elem) if elem["class"] == "pseudocode" ||
         elem["type"] == "pseudocode"
-      return if labelled_ancestor(elem) && elem.ancestors("figure").empty? ||
-        elem.at(ns("./figure")) && !elem.at(ns("./name"))
+      return if (labelled_ancestor(elem) && elem.ancestors("figure").empty?) ||
+        (elem.at(ns("./figure")) && !elem.at(ns("./name")))
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, " — ",

data/lib/isodoc/presentation_function/terms.rb

@@ -28,11 +28,7 @@ module IsoDoc
       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_linkmention(ref, r, opts)
       concept1_ref(node, ref, opts)
       if opts[:ital] == "false"
         r = node.at(ns(".//renderterm"))
@@ -41,6 +37,14 @@ module IsoDoc
       node.replace(node.children)
     end
 
+    def concept1_linkmention(ref, renderterm, opts)
+      if opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?
+        ref2 = ref.clone
+        r2 = renderterm.clone
+        renderterm.replace(ref2).children = r2
+      end
+    end
+
     def concept1_ref(_node, ref, opts)
       ref.nil? and return
       return ref.remove if opts[:ref] == "false"
@@ -78,39 +82,71 @@ module IsoDoc
     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
+      docxml.xpath(ns("//preferred | //admitted | //deprecates")).each do |p|
+        designation1(p)
+      end
     end
 
     def merge_second_preferred(term)
       pref = nil
-      term.xpath(ns("./preferred")).each_with_index do |p, i|
+      term.xpath(ns("./preferred[expression/name]")).each_with_index do |p, i|
         if i.zero? then pref = p
-        else
-          pref << l10n("; #{p.children.to_xml}")
+        elsif merge_preferred_eligible?(pref, p)
+          pref.at(ns("./expression/name")) <<
+            l10n("; #{p.at(ns('./expression/name')).children.to_xml}")
           p.remove
         end
       end
     end
 
+    def merge_preferred_eligible?(first, second)
+      firstex = first.at(ns("./expression")) || {}
+      secondex = second.at(ns("./expression")) || {}
+      first["geographic-area"] == second["geographic-area"] &&
+        firstex["language"] == secondex["language"] &&
+        !first.at(ns("./pronunciation | ./grammar")) &&
+        !second.at(ns("./pronunciation | ./grammar"))
+    end
+
     def designation1(desgn)
       s = desgn.at(ns("./termsource"))
       name = desgn.at(ns("./expression/name | ./letter-symbol/name | "\
                          "./graphical-symbol")) or return
 
+      designation_annotate(desgn, name)
+      s and desgn.next = s
+    end
+
+    def designation_annotate(desgn, name)
+      designation_boldface(desgn)
+      designation_field(desgn, name)
       g = desgn.at(ns("./expression/grammar")) and
-        name << " #{designation_grammar(g).join(', ')}"
+        name << ", #{designation_grammar(g).join(', ')}"
+      designation_localization(desgn, name)
+      designation_pronunciation(desgn, name)
       desgn.children = name.children
-      s and desgn.next = s
+    end
+
+    def designation_boldface(desgn)
+      desgn.name == "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)
+      f = desgn.xpath(ns("./field-of-application | ./usage-info"))
+        &.map { |u| u.children.to_xml }&.join(", ")
+      return nil if f&.empty?
+
+      name << ", &#x3c;#{f}&#x3e;"
     end
 
     def designation_grammar(grammar)
       ret = []
-      grammar.xpath(ns("./gender")).each do |x|
+      grammar.xpath(ns("./gender | ./number")).each do |x|
         ret << @i18n.grammar_abbrevs[x.text]
       end
       %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
@@ -121,20 +157,28 @@ module IsoDoc
       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 designation_localization(desgn, name)
+      loc = [desgn&.at(ns("./expression/@language"))&.text,
+             desgn&.at(ns("./expression/@script"))&.text,
+             desgn&.at(ns("./@geographic-area"))&.text].compact
+      return if loc.empty?
+
+      name << ", #{loc.join(' ')}"
+    end
+
+    def designation_pronunciation(desgn, name)
+      f = desgn.at(ns("./expression/pronunciation")) or return
 
-            def termexample(docxml)
+      name << ", /#{f.children.to_xml}/"
+    end
+
+    def termexample(docxml)
       docxml.xpath(ns("//termexample")).each do |f|
         example1(f)
       end
     end
 
-                def termnote(docxml)
+    def termnote(docxml)
       docxml.xpath(ns("//termnote")).each do |f|
         termnote1(f)
       end
@@ -155,7 +199,7 @@ module IsoDoc
     def termdefinition1(elem)
       unwrap_definition(elem)
       multidef(elem) if elem.xpath(ns("./definition")).size > 1
-      end
+    end
 
     def multidef(elem)
       d = elem.at(ns("./definition"))
@@ -167,13 +211,34 @@ module IsoDoc
       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
+    def unwrap_definition(elem)
+      elem.xpath(ns("./definition")).each do |d|
+        %w(verbal-definition non-verbal-representation).each do |e|
+          v = d&.at(ns("./#{e}"))
+          v&.replace(v.children)
         end
+      end
+    end
+
+    def termsource(docxml)
+      docxml.xpath(ns("//termsource")).each do |f|
+        termsource1(f)
+      end
+    end
+
+    def termsource1(elem)
+      mod = elem.at(ns("./modification")) and
+        termsource_modification(mod)
+      elem.children = l10n("[#{@i18n.source}: #{elem.children.to_xml.strip}]")
+      elem&.next_element&.name == "termsource" and elem.next = "; "
+    end
+
+    def termsource_modification(mod)
+      mod.previous_element.next = ", #{@i18n.modified}"
+      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
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -18,7 +18,7 @@ module IsoDoc
       info docxml, nil
       conversions(docxml)
       docxml.root["type"] = "presentation"
-      docxml.to_xml
+      docxml.to_xml.gsub(/</, "<").gsub(/>/, ">")
     end
 
     def conversions(docxml)
@@ -68,6 +68,7 @@ module IsoDoc
       termnote docxml
       termdefinition docxml
       designation docxml
+      termsource docxml
       concept docxml
       related docxml
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.8.1".freeze
+  VERSION = "1.8.3".freeze
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -63,11 +63,8 @@ module IsoDoc
             c.increment(n)
             idx = increment_label(examples, n, c, false)
             @anchors[n["id"]] =
-              # { type: "termexample", label: idx, value: c.print,
-              # xref: l10n("#{anchor(t['id'], :xref)}, "\
-              # "#{@labels['example_xref']} #{c.print}") }
-              anchor_struct(idx, n,
-                            @labels["example_xref"], "termexample", n["unnumbered"])
+              anchor_struct(idx, n, @labels["example_xref"], "termexample",
+                            n["unnumbered"])
           end
         end
       end
@@ -170,8 +167,7 @@ module IsoDoc
 
       def deflist_term_anchor_names(list, list_anchor)
         list.xpath(ns("./dt")).each do |li|
-          label = li.text
-          label = l10n("#{list_anchor[:xref]}: #{label}")
+          label = l10n("#{list_anchor[:xref]}: #{dt2xreflabel(li)}")
           li["id"] and @anchors[li["id"]] =
                          { xref: label, type: "deflistitem",
                            container: list_anchor[:container] }
@@ -181,6 +177,13 @@ module IsoDoc
         end
       end
 
+      def dt2xreflabel(dterm)
+        label = dterm.dup
+        label.xpath(ns(".//p")).each { |x| x.replace(x.children) }
+        label.xpath(ns(".//index")).each(&:remove)
+        label.children.to_xml
+      end
+
       def bookmark_anchor_names(xml)
         xml.xpath(ns(".//bookmark")).reject { |n| blank?(n["id"]) }.each do |n|
           parent = nil