isodoc 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ddab8465c1411d1596aa170ddda0affb869a0989e4fb0351d2b68c4a02e4a07
-  data.tar.gz: 0aaecaa60940f2177781ca3b51610c2be9f0ac0fef3e8f01227b9afba9330571
+  metadata.gz: b42d786cf8fa0f78ac01afba8de3e886b35eddd191551b6ce20ec680d7441d39
+  data.tar.gz: 5db56071fb06162e738b7eff5c5726bf0eae2acc80dbcbfaf1c589ba04729a55
 SHA512:
-  metadata.gz: ab482ce07d9ff45b532e3ffa83f98334171e75d5c91eded8c81070b2065690ee2cd1b246fe63ce55a61e04a3fe11fd259cdf1e800885a1151003add5fca1e41b
-  data.tar.gz: 77df20df67c7adb582dbbfb4a69ec8198d5d811ebe490d08bd023a4e3261083f64da759ca2d1fa231cb3dba3e7b254d7a1331a3e6b3a085ed9586fc1a81b0778
+  metadata.gz: 546f673176c4c6757567e43c3221c9e019d7f88f515636e9287e3e8016625a0741277b02d4b3de02cb09e301a76ac39dd8a7b7a62aa90a272c94b9f93529e84f
+  data.tar.gz: 6f1db97d1acb6c413bc84265e6e9182b46a645509780457074584d4d37bf1f958e2220eac71958f0167438ed99da7ff12029a1beeda010f23229c47ec5976b50

data/isodoc.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
   spec.add_dependency "mathml2asciimath"
+  spec.add_dependency "metanorma-utils"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/lib/isodoc/presentation_function/block.rb

@@ -2,10 +2,10 @@ require "base64"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def lower2cap(s)
-      return s if /^[[:upper:]][[:upper:]]/.match?(s)
+    def lower2cap(text)
+      return text if /^[[:upper:]][[:upper:]]/.match?(text)
 
-      s.capitalize
+      text.capitalize
     end
 
     def figure(docxml)
@@ -13,8 +13,7 @@ module IsoDoc
       docxml.xpath(ns("//figure")).each { |f| figure1(f) }
       docxml.xpath(ns("//svgmap")).each do |s|
         if f = s.at(ns("./figure")) then s.replace(f)
-        else
-          s.remove
+        else s.remove
         end
       end
     end
@@ -30,26 +29,28 @@ module IsoDoc
       elem.replace(x)
     end
 
-    def figure1(f)
-      return sourcecode1(f) if f["class"] == "pseudocode" || f["type"] == "pseudocode"
-      return if labelled_ancestor(f) && f.ancestors("figure").empty?
-      return if f.at(ns("./figure")) and !f.at(ns("./name"))
+    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"))
 
-      lbl = @xrefs.anchor(f['id'], :label, false) or return
-      prefix_name(f, "&nbsp;&mdash; ",
+      lbl = @xrefs.anchor(elem["id"], :label, false) or return
+      prefix_name(elem, "&nbsp;&mdash; ",
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
-    def prefix_name(f, delim, number, elem)
+    def prefix_name(node, delim, number, elem)
       return if number.nil? || number.empty?
 
-      unless name = f.at(ns("./#{elem}"))
-        f.children.empty? and f.add_child("<#{elem}></#{elem}>") or
-          f.children.first.previous = "<#{elem}></#{elem}>"
-          name = f.children.first
+      unless name = node.at(ns("./#{elem}"))
+        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)
+      else (name.children.first.previous = "#{number}#{delim}")
       end
-      name.children.empty? ? name.add_child(number) :
-        ( name.children.first.previous = "#{number}#{delim}" )
     end
 
     def sourcecode(docxml)
@@ -58,12 +59,13 @@ module IsoDoc
       end
     end
 
-    def sourcecode1(f)
-      return if labelled_ancestor(f)
-      return unless f.ancestors("example").empty?
+    def sourcecode1(elem)
+      return if labelled_ancestor(elem)
+      return unless elem.ancestors("example").empty?
 
-      lbl = @xrefs.anchor(f['id'], :label, false) or return
-      prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
+      lbl = @xrefs.anchor(elem["id"], :label, false) or return
+      prefix_name(elem, "&nbsp;&mdash; ",
+                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
     def formula(docxml)
@@ -73,9 +75,9 @@ module IsoDoc
     end
 
     # introduce name element
-    def formula1(f)
-      lbl = @xrefs.anchor(f['id'], :label, false)
-      prefix_name(f, "", lbl, "name")
+    def formula1(elem)
+      lbl = @xrefs.anchor(elem["id"], :label, false)
+      prefix_name(elem, "", lbl, "name")
     end
 
     def example(docxml)
@@ -90,11 +92,14 @@ module IsoDoc
       end
     end
 
-    def example1(f)
-      n = @xrefs.get[f["id"]]
-      lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example:
-        l10n("#{@i18n.example} #{n[:label]}")
-      prefix_name(f, "&nbsp;&mdash; ", lbl, "name")
+    def example1(elem)
+      n = @xrefs.get[elem["id"]]
+      lbl = if n.nil? || n[:label].nil? || n[:label].empty?
+              @i18n.example
+            else
+              l10n("#{@i18n.example} #{n[:label]}")
+            end
+      prefix_name(elem, "&nbsp;&mdash; ", lbl, "name")
     end
 
     def note(docxml)
@@ -104,13 +109,16 @@ module IsoDoc
     end
 
     # introduce name element
-    def note1(f)
-      return if f.parent.name == "bibitem"
+    def note1(elem)
+      return if elem.parent.name == "bibitem"
 
-      n = @xrefs.get[f["id"]]
-      lbl = (@i18n.note if n.nil? || n[:label].nil? || n[:label].empty?) ?
-        @i18n.note: l10n("#{@i18n.note} #{n[:label]}")
-      prefix_name(f, "", lbl, "name")
+      n = @xrefs.get[elem["id"]]
+      lbl = if n.nil? || n[:label].nil? || n[:label].empty?
+              @i18n.note
+            else
+              l10n("#{@i18n.note} #{n[:label]}")
+            end
+      prefix_name(elem, "", lbl, "name")
     end
 
     def termnote(docxml)
@@ -120,9 +128,27 @@ module IsoDoc
     end
 
     # introduce name element
-    def termnote1(f)
-      lbl = l10n(@xrefs.anchor(f["id"], :label) || "???")
-      prefix_name(f, "", lower2cap(lbl), "name")
+    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)
@@ -144,10 +170,10 @@ module IsoDoc
     end
 
     # introduce name element
-    def recommendation1(f, type)
-      n = @xrefs.anchor(f["id"], :label, false)
+    def recommendation1(elem, type)
+      n = @xrefs.anchor(elem["id"], :label, false)
       lbl = (n.nil? ? type : l10n("#{type} #{n}"))
-      prefix_name(f, "", lbl, "name")
+      prefix_name(elem, "", lbl, "name")
     end
 
     def table(docxml)
@@ -156,12 +182,13 @@ module IsoDoc
       end
     end
 
-    def table1(f)
-      return if labelled_ancestor(f)
-      return if f["unnumbered"] && !f.at(ns("./name"))
+    def table1(elem)
+      return if labelled_ancestor(elem)
+      return if elem["unnumbered"] && !elem.at(ns("./name"))
 
-      n = @xrefs.anchor(f["id"], :label, false)
-      prefix_name(f, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.table} #{n}"), "name")
+      n = @xrefs.anchor(elem["id"], :label, false)
+      prefix_name(elem, "&nbsp;&mdash; ", l10n("#{lower2cap @i18n.table} #{n}"),
+                  "name")
     end
 
     # we use this to eliminate the semantic amend blocks from rendering
@@ -171,11 +198,11 @@ module IsoDoc
       end
     end
 
-    def amend1(f)
-      f.xpath(ns("./autonumber")).each(&:remove)
-      f.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
-      f.xpath(ns("./description")).each { |a| a.replace(a.children) }
-      f.replace(f.children)
+    def amend1(elem)
+      elem.xpath(ns("./autonumber")).each(&:remove)
+      elem.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
+      elem.xpath(ns("./description")).each { |a| a.replace(a.children) }
+      elem.replace(elem.children)
     end
   end
 end

data/lib/isodoc/presentation_function/inline.rb

@@ -1,3 +1,5 @@
+require "metanorma-utils"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, _target)
@@ -130,7 +132,7 @@ module IsoDoc
       loc = @i18n.locality[type] || type.sub(/^locality:/, "")
       loc = case node["case"]
             when "lowercase" then loc.downcase
-            else loc.capitalize
+            else Metanorma::Utils.strict_capitalize_first(loc)
             end
       " #{loc}"
     end
@@ -161,32 +163,62 @@ module IsoDoc
 
     def concept1(node)
       xref = node&.at(ns("./xref/@target"))&.text or
-        return concept_render(node, node["ital"] || "true",
-                              node["ref"] || "true")
+        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, node["ital"] || "false", node["ref"] || "false")
-      else concept_render(node, node["ital"] || "true", node["ref"] || "true")
+        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, ital, ref)
+    def concept_render(node, opts)
       node&.at(ns("./refterm"))&.remove
       r = node.at(ns("./renderterm"))
-      r&.next = " " if node.at(ns("./xref | ./eref | ./termref")) && ref != "false"
-      if ital == "true" then r&.name = "em"
-      else r&.replace(r&.children)
+      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
-      concept1_ref(node, ref)
       node.replace(node.children)
     end
 
-    def concept1_ref(node, ref)
-      r = node.at(ns("./xref | ./eref | ./termref")) or return
-      return r.remove if ref == "false"
+    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
 
-      if non_locality_elems(r).select { |c| !c.text? || /\S/.match(c) }.empty?
-        r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml))
-      else r.replace("[#{r.to_xml}]")
+    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
 

data/lib/isodoc/presentation_xml_convert.rb

@@ -49,6 +49,7 @@ module IsoDoc
       termexample docxml
       note docxml
       termnote docxml
+      termdefinition docxml
       permission docxml
       requirement docxml
       recommendation docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.7.4".freeze
+  VERSION = "1.7.5".freeze
 end

data/spec/isodoc/inline_spec.rb

@@ -209,8 +209,7 @@ RSpec.describe IsoDoc do
               <renderterm>word</renderterm>
               <termref base='IEV' target='135-13-13'>The IEV database</termref>
             </concept></li>
-            <li><concept><refterm>term</refterm>
-              <renderterm>word</renderterm>
+            <li><concept>
               <strong>error!</strong>
               </concept>
               </li>
@@ -295,7 +294,7 @@ RSpec.describe IsoDoc do
             <li>
               <em>word</em> [<termref base="IEV" target="135-13-13">The IEV database</termref>]
             </li>
-             <li> <em>word</em> <strong>error!</strong> </li>
+             <li> <strong>error!</strong> </li>
             </ul>
           </p>
           </foreword></preface>
@@ -380,7 +379,7 @@ RSpec.describe IsoDoc do
                      <i>word</i>
                       [The IEV database]
                    </li>
-                   <li> <i>word</i> <b>error!</b> </li>
+                   <li> <b>error!</b> </li>
                  </ul>
                </p>
              </div>
@@ -418,13 +417,22 @@ RSpec.describe IsoDoc do
        <preface><foreword>
        <p>
        <ul>
-       <li>
-       <concept ital="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-         <li><concept ref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ital="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
        <li><concept ital="true" ref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-        <li><concept ital="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
-         <li><concept ref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ital="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
        <li><concept ital="false" ref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ital="true" ref="true" linkmention="true" linkref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ital="true" ref="true" linkmention="true" linkref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ital="true" ref="true" linkmention="false" linkref="true"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ital="true" ref="true" linkmention="false" linkref="false"><refterm>term</refterm><renderterm>term</renderterm><xref target='clause1'/></concept>,</li>
+       <li><concept ital="true" ref="true" linkmention="true" linkref="true"><strong>error!</strong></concept></li>
+       <li><concept ital="false" ref="false" linkmention="true">
+<refterm>CV_DiscreteCoverage</refterm>
+<renderterm>CV_DiscreteCoverage</renderterm>
+<xref target="term-cv_discretecoverage"/>
+</concept></li>
         </ul></p>
          </foreword></preface>
        <sections>
@@ -433,88 +441,101 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-          <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-       <preface><foreword displayorder="1">
-       <p>
-       <ul>
-       <li>
-
-           <em>term</em>
-           [term defined in <xref target="clause1">Clause 1</xref>],
-         </li>
-         <li>
-           <em>term</em>
-           [term defined in <xref target="clause1">Clause 1</xref>],
-         </li>
-       <li>
-           <em>term</em>
-           [term defined in <xref target="clause1">Clause 1</xref>],
-         </li>
-        <li>
-           term
-           [term defined in <xref target="clause1">Clause 1</xref>],
-         </li>
-         <li>
-           <em>term</em>,
-
-         </li>
-       <li>
-           term,
-
-         </li>
-        </ul></p>
-         </foreword></preface>
-       <sections>
-       <clause id="clause1" displayorder="2"><title depth="1">1.<tab/>Clause 1</title></clause>
-       </sections>
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+      <preface><foreword displayorder="1">
+      <p>
+      <ul>
+      <li><em>term</em> [term defined in <xref target="clause1">Clause 1</xref>],</li>
+      <li><em>term</em> [term defined in <xref target="clause1">Clause 1</xref>],</li>
+      <li><em>term</em> [term defined in <xref target="clause1">Clause 1</xref>],</li>
+      <li>term [term defined in <xref target="clause1">Clause 1</xref>],</li>
+      <li><em>term</em>,</li>
+      <li>term,</li>
+      <li><xref target="clause1"><em>term</em></xref> [term defined in <xref target="clause1">Clause 1</xref>],</li>
+      <li><xref target="clause1"><em>term</em></xref> [term defined in Clause 1],</li>
+      <li><em>term</em> [term defined in <xref target="clause1">Clause 1</xref>],</li>
+      <li><em>term</em> [term defined in Clause 1],</li>
+      <li><strong>error!</strong></li>
+      <li><xref target='term-cv_discretecoverage'>CV_DiscreteCoverage</xref></li>
+      </ul></p>
+      </foreword></preface>
+      <sections>
+      <clause id="clause1" displayorder="2"><title depth="1">1.<tab/>Clause 1</title></clause>
+      </sections>
       </iso-standard>
     OUTPUT
     output = <<~OUTPUT
-               #{HTML_HDR}
-           <br/>
-           <div>
-             <h1 class='ForewordTitle'>Foreword</h1>
-                            <p>
-                <ul>
-                  <li>
-                    <i>term</i>
-                     [term defined in
-                    <a href='#clause1'>Clause 1</a>
-                    ],
-                  </li>
-                  <li>
-                    <i>term</i>
-                     [term defined in
-                    <a href='#clause1'>Clause 1</a>
-                    ],
-                  </li>
-                  <li>
-                    <i>term</i>
-                     [term defined in
-                    <a href='#clause1'>Clause 1</a>
-                    ],
-                  </li>
-                  <li>
-                     term [term defined in
-                    <a href='#clause1'>Clause 1</a>
-                    ],
-                  </li>
-                  <li>
-                    <i>term</i>,
-                  </li>
-                  <li>term,</li>
-                </ul>
-              </p>
-            </div>
-            <p class='zzSTDTitle1'/>
-            <div id='clause1'>
-              <h1>1.&#160; Clause 1</h1>
-            </div>
-          </div>
-        </body>
-      </html>
+                     #{HTML_HDR}
+                 <br/>
+                 <div>
+                   <h1 class='ForewordTitle'>Foreword</h1>
+                                  <p>
+                      <ul>
+                        <li>
+                          <i>term</i>
+                           [term defined in
+                          <a href='#clause1'>Clause 1</a>
+                          ],
+                        </li>
+                        <li>
+                          <i>term</i>
+                           [term defined in
+                          <a href='#clause1'>Clause 1</a>
+                          ],
+                        </li>
+                        <li>
+                          <i>term</i>
+                           [term defined in
+                          <a href='#clause1'>Clause 1</a>
+                          ],
+                        </li>
+                        <li>
+                           term [term defined in
+                          <a href='#clause1'>Clause 1</a>
+                          ],
+                        </li>
+                        <li>
+                          <i>term</i>,
+                        </li>
+                        <li>term,</li>
+                        <li>
+        <a href='#clause1'>
+          <i>term</i>
+        </a>
+         [term defined in
+        <a href='#clause1'>Clause 1</a>
+        ],
+      </li>
+      <li>
+        <a href='#clause1'>
+          <i>term</i>
+        </a>
+         [term defined in Clause 1],
+      </li>
+      <li>
+        <i>term</i>
+         [term defined in
+        <a href='#clause1'>Clause 1</a>
+        ],
+      </li>
+      <li>
+        <i>term</i>
+         [term defined in Clause 1],
+      </li>
+      <li> <b>error!</b> </li>
+      <li> <a href='#term-cv_discretecoverage'>CV_DiscreteCoverage</a> </li>
+                      </ul>
+                    </p>
+                  </div>
+                  <p class='zzSTDTitle1'/>
+                  <div id='clause1'>
+                    <h1>1.&#160; Clause 1</h1>
+                  </div>
+                </div>
+              </body>
+            </html>
     OUTPUT
-    expect((IsoDoc::PresentationXMLConvert.new({})
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
@@ -1002,6 +1023,7 @@ RSpec.describe IsoDoc do
           <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality>A</eref>
           <eref type="inline" bibitemid="ISO712"><locality type="whole"></locality></eref>
           <eref type="inline" bibitemid="ISO712"><locality type="locality:prelude"><referenceFrom>7</referenceFrom></locality></eref>
+          <eref type="inline" bibitemid="ISO712"><locality type="locality:URI"><referenceFrom>7</referenceFrom></locality></eref>
           <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
           <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality></eref>
           <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality></eref>
@@ -1040,6 +1062,7 @@ RSpec.describe IsoDoc do
                 <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality>A</eref>
                 <eref type="inline" bibitemid="ISO712"><locality type="whole"/>ISO 712, Whole of text</eref>
                 <eref type="inline" bibitemid="ISO712"><locality type="locality:prelude"><referenceFrom>7</referenceFrom></locality>ISO 712, Prelude 7</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="locality:URI"><referenceFrom>7</referenceFrom></locality>ISO 712, URI 7</eref>
                 <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
                 <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality>ISO 712</eref>
                 <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, Clause 1</eref>
@@ -1082,6 +1105,7 @@ RSpec.describe IsoDoc do
                  <a href="#ISO712">A</a>
                  <a href="#ISO712">ISO 712, Whole of text</a>
                  <a href="#ISO712">ISO 712, Prelude 7</a>
+                 <a href="#ISO712">ISO 712, URI 7</a>
                  <a href="#ISO712">A</a>
                  <a href='#ISO712'>ISO 712</a>
                  <a href='#ISO712'>ISO 712, Clause 1</a>

data/spec/isodoc/section_spec.rb

@@ -1778,4 +1778,129 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
+
+    it "processes annexes containing one, or more than one special sections" do
+    input = <<~INPUT
+           <iso-standard xmlns="http://riboseinc.com/isoxml">
+                    <annex id='PP' obligation='normative'>
+        <title>Glossary</title>
+        <terms id='PP1' obligation='normative'>
+          <term id='term-glossary'>
+            <preferred>Glossary</preferred>
+          </term>
+        </terms>
+      </annex>
+            <annex id='QQ' obligation='normative'>
+                 <title>Glossary</title>
+                   <terms id='QQ1' obligation='normative'>
+                     <title>Term Collection</title>
+                     <term id='term-term-1'>
+                       <preferred>Term</preferred>
+                     </term>
+                   </terms>
+                   <terms id='QQ2' obligation='normative'>
+                     <title>Term Collection 2</title>
+                     <term id='term-term-2'>
+                       <preferred>Term</preferred>
+                     </term>
+                   </terms>
+               </annex>
+                 <annex id='RR' obligation='normative'>
+                 <title>Glossary</title>
+                   <terms id='RR1' obligation='normative'>
+                     <title>Term Collection</title>
+                     <term id='term-term-3'>
+                       <preferred>Term</preferred>
+                     </term>
+                   </terms>
+                   <references id='RR2' obligation='normative'>
+                     <title>References</title>
+                   </terms>
+               </annex>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <annex id='PP' obligation='normative' displayorder='1'>
+           <title>
+             <strong>Annex A</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Glossary</strong>
+           </title>
+           <terms id='PP1' obligation='normative'>
+             <title>A.</title>
+             <term id='term-glossary'>
+               <name>A.1.</name>
+               <preferred>Glossary</preferred>
+             </term>
+           </terms>
+         </annex>
+         <annex id='QQ' obligation='normative' displayorder='2'>
+           <title>
+             <strong>Annex B</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Glossary</strong>
+           </title>
+           <terms id='QQ1' obligation='normative'>
+             <title depth='2'>
+               B.1.
+               <tab/>
+               Term Collection
+             </title>
+             <term id='term-term-1'>
+               <name>B.1.1.</name>
+               <preferred>Term</preferred>
+             </term>
+           </terms>
+           <terms id='QQ2' obligation='normative'>
+             <title depth='2'>
+               B.2.
+               <tab/>
+               Term Collection 2
+             </title>
+             <term id='term-term-2'>
+               <name>B.2.1.</name>
+               <preferred>Term</preferred>
+             </term>
+           </terms>
+         </annex>
+         <annex id='RR' obligation='normative' displayorder='3'>
+           <title>
+             <strong>Annex C</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Glossary</strong>
+           </title>
+           <terms id='RR1' obligation='normative'>
+             <title depth='2'>
+               C.1.
+               <tab/>
+               Term Collection
+             </title>
+             <term id='term-term-3'>
+               <name>C.1.1.</name>
+               <preferred>Term</preferred>
+             </term>
+           </terms>
+           <references id='RR2' obligation='normative'>
+             <title depth='2'>
+               C.2.
+               <tab/>
+               References
+             </title>
+           </references>
+         </annex>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    end
 end

data/spec/isodoc/terms_spec.rb

@@ -261,4 +261,120 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::WordConvert.new({})
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(word)
   end
+
+  it "processes IsoXML term with multiple definitions" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+          <p>For the purposes of this document, the following terms and definitions apply.</p>
+      <term id="paddy1"><preferred>paddy</preferred>
+      <domain>rice</domain>
+      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747e">rice retaining its husk after threshing, mark 2</p>
+      <termsource status="modified">
+        <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+          <modification>
+          <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
+        </modification>
+      </termsource>
+      </definition>
+      <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892"  keep-with-next="true" keep-lines-together="true">
+        <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
+        <ul>
+        <li>A</li>
+        </ul>
+      </termexample>
+      <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
+        <ul>
+        <li>A</li>
+        </ul>
+      </termexample>
+      <termsource status='identical'>
+          <origin citeas=''>
+            <termref base='IEV' target='xyz'>t1</termref>
+          </origin>
+        </termsource>
+        <termsource status='modified'>
+          <origin citeas=''>
+            <termref base='IEV' target='xyz'/>
+          </origin>
+          <modification>
+            <p id='_'>with adjustments</p>
+          </modification>
+        </termsource>
+      </term>
+    INPUT
+    presxml = <<~PRESXML
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <sections>
+          <terms id='_terms_and_definitions' obligation='normative' displayorder='1'>
+            <title depth='1'>
+              1.
+              <tab/>
+              Terms and Definitions
+            </title>
+            <p>For the purposes of this document, the following terms and definitions apply.</p>
+            <term id='paddy1'>
+              <name>1.1.</name>
+              <preferred>paddy</preferred>
+              <domain>rice</domain>
+              <definition>
+                <ol>
+                  <li>
+                    <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+                  </li>
+                  <li>
+                    <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747e'>rice retaining its husk after threshing, mark 2</p>
+                    <termsource status='modified'>
+                      <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'>
+                        <locality type='clause'>
+                          <referenceFrom>3.1</referenceFrom>
+                        </locality>
+                        ISO 7301:2011, Clause 3.1
+                      </origin>
+                      <modification>
+                        <p id='_e73a417d-ad39-417d-a4c8-20e4e2529489'>
+                          The term "cargo rice" is shown as deprecated, and Note 1 to
+                          entry is not included here
+                        </p>
+                      </modification>
+                    </termsource>
+                  </li>
+                </ol>
+              </definition>
+              <termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f892' keep-with-next='true' keep-lines-together='true'>
+                <name>EXAMPLE 1</name>
+                <p id='_65c9a509-9a89-4b54-a890-274126aeb55c'>Foreign seeds, husks, bran, sand, dust.</p>
+                <ul>
+                  <li>A</li>
+                </ul>
+              </termexample>
+              <termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f894'>
+                <name>EXAMPLE 2</name>
+                <ul>
+                  <li>A</li>
+                </ul>
+              </termexample>
+              <termsource status='identical'>
+                <origin citeas=''>
+                  <termref base='IEV' target='xyz'>t1</termref>
+                </origin>
+              </termsource>
+              <termsource status='modified'>
+                <origin citeas=''>
+                  <termref base='IEV' target='xyz'/>
+                </origin>
+                <modification>
+                  <p id='_'>with adjustments</p>
+                </modification>
+              </termsource>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: metanorma-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement