isodoc 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec504b3b905ec960bef74398b3789ab5b7eb248dc05a7c3f64590db77d31cac6
-  data.tar.gz: c2de4c1589a7ff282715f4930a1851393358a64fd407c5a1e3bda02beddc0782
+  metadata.gz: 38ce5f3d119cf53361811f16b0ff8ed4108116c02e0816ab5ba31846934c3c29
+  data.tar.gz: 5ffb61e6729edb93e5e3ba1916e531bf7e1511bfdbd5fe0e0cd1405590971c4d
 SHA512:
-  metadata.gz: 34a1c43f6f34f90aa326ed7ff50ede791eadaf22c05ebf0f4183fb2cb3c708bd4f0512572b638a94e236b807f5a873986c24579fe126eb88ad15ef1e178c64d2
-  data.tar.gz: 23fbe4f295729ad565ab787903e9c4b49388671766b91477dc3d26302b8499da892f77d6e034ce4f6cc4ba1b0956c8dbb051e94a3a336acdb661d1e6d30e584b
+  metadata.gz: e023cfd0d05068daf11e4ccf5c6aab29ff037ec562b65e65f769f7d64c9d4a6c681895dfba5539a2b8a8ee310facba56dad371a21a5f0ced621ebacbf64a8ddf
+  data.tar.gz: 6412c5b7f2b11c4eedf1ab840461a703d1342e148ae89607ea30bb7faff05591aa33132dd2a1b660a92a0e3466060ef404cab4564c5a10bd909843293b4c9ad1

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/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:/, "")

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 << ", &lt;#{f}&gt;"
     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
+
+      name << ", /#{f.children.to_xml}/"
+    end
 
-            def termexample(docxml)
+    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,13 @@ 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
   end
 end

data/lib/isodoc/version.rb

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

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

@@ -94,6 +94,9 @@ grammar_abbrevs:
   feminine: مؤ
   neuter: محايد
   common: خنثى
+  singular: مفرد
+  dual: مزدوج
+  plural: جمع
   isPreposition: حرف جر
   isParticiple: النعت
   isAdjective: صفة

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

@@ -98,6 +98,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neutr
   common: gemein
+  singular: Sg
+  dual: Dual
+  plural: Pl
   isPreposition: Präp
   isParticiple: Part
   isAdjective: Adj

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

@@ -100,16 +100,19 @@ locality: {
                       formula: Formula
                     }
 grammar_abbrevs:
-  masculine: masc
-  feminine: fem
-  neuter: neut
+  masculine: m
+  feminine: f
+  neuter: n
   common: common
+  singular: sg
+  dual: dual
+  pl: pl
   isPreposition: prep
   isParticiple: part
   isAdjective: adj
   isAdverb: adv
-  isNoun: n
-  isVerb: v
+  isNoun: noun
+  isVerb: verb
 relatedterms:
   deprecates: deprecates
   supersedes: supersedes

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

@@ -100,6 +100,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neut
   common: epicen@
+  singular: sg
+  dual: dual
+  plural: pl
   isPreposition: prep
   isParticiple: part
   isAdjective: adj

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

@@ -97,6 +97,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neut
   common: épicène
+  singular: sg
+  dual: duel
+  plural: pl
   isPreposition: prép
   isParticiple: part
   isAdjective: adj

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

@@ -103,6 +103,9 @@ grammar_abbrevs:
   feminine: жен
   neuter: ср
   common: общего рода
+  singular: ед
+  dual: дв
+  plural: мн
   isPreposition: предл
   isParticiple: прич
   isAdjective: прил

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

@@ -98,6 +98,9 @@ grammar_abbrevs:
   feminine: 阴性
   neuter: 中性的
   common: 通性
+  singular: 单数
+  dual: 双
+  plural: 复数
   isPreposition: 介词
   isParticiple: 分词
   isAdjective: 形容词

data/spec/isodoc/i18n_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -159,7 +159,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                 <h2>3.1.&#160; Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1.</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div><div id="K"><h2>3.2.</h2>
                 <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
               </div></div>
@@ -211,7 +211,7 @@ RSpec.describe IsoDoc do
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>tlh</language>
@@ -275,6 +275,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     INPUT
+    output = <<~OUTPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
       <bibdata>
       <language current="true">tlh</language>
@@ -295,7 +296,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -336,6 +337,10 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes French" do
@@ -425,7 +430,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -496,7 +501,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                 <h2>3.1.&#160; Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1.</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div><div id="K"><h2>3.2.</h2>
                 <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
               </div></div>
@@ -644,7 +649,7 @@ RSpec.describe IsoDoc do
              <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title depth="2">3.1.<tab/>Normal Terms</title>
                <term id="J"><name>3.1.1.</name>
-               <preferred>Term2</preferred>
+               <preferred><strong>Term2</strong></preferred>
              </term>
              </terms>
              <definitions id="K"><title>3.2.</title>
@@ -728,7 +733,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                       <h2>3.1.&#12288;Normal Terms</h2>
                       <p class="TermNum" id="J">3.1.1.</p>
-                      <p class="Terms" style="text-align:left;">Term2</p>
+                      <p class="Terms" style="text-align:left;"><b>Term2</b></p>
                     </div><div id="K"><h2>3.2.</h2>
                       <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
                     </div></div>
@@ -896,7 +901,7 @@ RSpec.describe IsoDoc do
              <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title depth="2">3.1.<tab/>Normal Terms</title>
                <term id="J"><name>3.1.1.</name>
-               <preferred>Term2</preferred>
+               <preferred><strong>Term2</strong></preferred>
              </term>
              </terms>
              <definitions id="K"><title>3.2.</title>
@@ -1002,7 +1007,7 @@ RSpec.describe IsoDoc do
                      <div id='I'>
                        <h2>3.1.&#160; Normal Terms</h2>
                        <p class='TermNum' id='J'>3.1.1.</p>
-                       <p class='Terms' style='text-align:left;'>Term2</p>
+                       <p class='Terms' style='text-align:left;'><b>Term2</b></p>
                      </div>
                      <div id='K'>
                        <h2>3.2.</h2>

data/spec/isodoc/inline_spec.rb

@@ -636,11 +636,10 @@ RSpec.describe IsoDoc do
           <expression>
             <name>Second Term</name>
           </expression>
+        <field-of-application>Field</field-of-application>
+        <usage-info>Usage Info 1</usage-info>
         </preferred>
-        <usageinfo>
-          <p id='B'>Usage Info 1.</p>
-        </usageinfo>
-        <definition><verbaldefinition>Definition 1</verbaldefinition></definition>
+        <definition><verbal-definition>Definition 1</verbal-definition></definition>
       </term>
       <term id="C">
       <preferred language='fr' script='Latn' type='prefix'>
@@ -658,49 +657,40 @@ RSpec.describe IsoDoc do
           </preferred>
           <xref target='second'/>
         </related>
-        <definition><verbaldefinition>Definition 2</verbaldefinition></definition>
+        <definition><verbal-definition>Definition 2</verbal-definition></definition>
       </term>
           </terms>
         </sections>
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-           <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-         <sections>
-           <terms id='A' obligation='normative' displayorder='1'>
-             <title depth='1'>
-               1.
-               <tab/>
-               Terms and definitions
-             </title>
-             <term id='second'>
-               <name>1.1.</name>
-               <preferred>Second Term</preferred>
-               <usageinfo>
-                 <p id='B'>Usage Info 1.</p>
-               </usageinfo>
-               <definition>Definition 1</definition>
-             </term>
-             <term id='C'>
-               <name>1.2.</name>
-               <preferred language='fr' script='Latn' type='prefix'>First Designation</preferred>
-               <p>
-                 <strong>CONTRAST:</strong>
-                 <em>
-                   <preferred>Fifth Designation neut</preferred>
-                 </em>
-                  (
-                 <xref target='second'>Clause 1.1</xref>
-                 )
-               </p>
-               <definition>Definition 2</definition>
-             </term>
-           </terms>
-         </sections>
-       </iso-standard>
+       <?xml version='1.0'?>
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <sections>
+          <terms id='A' obligation='normative' displayorder='1'>
+            <title depth='1'>1.<tab/>Terms and definitions</title>
+            <term id='second'>
+              <name>1.1.</name>
+              <preferred><strong>Second Term</strong>, &lt;Field, Usage Info 1&gt;</preferred>
+              <definition>Definition 1</definition>
+            </term>
+            <term id='C'>
+              <name>1.2.</name>
+              <preferred language='fr' script='Latn' type='prefix'><strong>First Designation</strong></preferred>
+              <p>
+                <strong>CONTRAST:</strong>
+                <em>
+                  <preferred><strong>Fifth Designation</strong>, n</preferred>
+                </em> (<xref target='second'>Clause 1.1</xref>)
+              </p>
+              <definition>Definition 2</definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
     OUTPUT
-   expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes embedded inline formatting" do
@@ -802,9 +792,9 @@ RSpec.describe IsoDoc do
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <preface><foreword>
       <p>
-      <link updatetype="true" target="http://example.com"/>
-      <link updatetype="true" target="list.adoc">example</link>
-      <link updatetype="true" target="list" alt="tip">example</link>
+      <link update-type="true" target="http://example.com"/>
+      <link update-type="true" target="list.adoc">example</link>
+      <link update-type="true" target="list" alt="tip">example</link>
       </p>
       </foreword></preface>
       <sections>