metanorma-standoc 2.4.8 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce54912310b9af4d98ddc7626191a27b3dd982afbcbba47af1f2b1503d1eaac1
-  data.tar.gz: db2b1f1bafa6875952c611db4bc4f31568d63102545fb15b9236afd69e77f84b
+  metadata.gz: 1d6a56b88b9f58482764ff6aede297e389577151d0d112a215b2215d5cfb41cf
+  data.tar.gz: cb0a1a1d73930e89169a27185bcce3d19130f1150a22fd7345da61a73dbd759f
 SHA512:
-  metadata.gz: 43d771eebc8879517b65e977a74add3008cc6bfc636f8408a48c0761352a31e113cb2a5720406ce0748faccdbad4e6ff1f290b2a4c446fd576f2a0f91c6bb054
-  data.tar.gz: 73da28422191e64bd324959c1fa63fc29b82074284fc1dc9a25ea70a5982bdb471d1961a3259d26455c9ea470b9f77ee3cc7c64a03f6e645acd9e8e69aa93787
+  metadata.gz: 158547c563e269b769f39123cbd03f749a4891f7e4c772e9462ea40a9221ee4b58839991b2580fc40d9a24007387866d2741867ee6a8f5f39770fa3d38a57138
+  data.tar.gz: ba7b26ed9ebfae0f92dedc50750aad4e31c53b5e5b16defe3e2a2ea6583049fab738f07449846ac62aa74af06944d725389fed9d54357bf9ff9c33b3196cac2f

data/lib/isodoc/html/htmlstyle.css

@@ -98,7 +98,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -121,14 +121,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -594,7 +598,7 @@ ul, ol {
 ul li {
   list-style: none; }
 
-ul li:before {
+ul li::before {
   content: "—";
   display: inline-block;
   width: 1em;
@@ -612,7 +616,7 @@ ul li:first-child {
 #toc-list li {
   list-style-type: none; }
 
-#toc li:before {
+#toc li::before {
   content: " ";
   display: none; }
 
@@ -633,13 +637,13 @@ ol[class="alphabet"] > li {
 ol[class="alphabet"] ol[class="alphabet"] > li {
   list-style: inherit; }
 
-ol[class="alphabet"] > li:before {
+ol[class="alphabet"] > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") ";
   position: absolute;
   left: -1.4em; }
 
-ol[class="alphabet"] ol[class="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li::before {
   counter-increment: none;
   content: initial; }
 
@@ -653,13 +657,13 @@ ol[class="roman"] > li {
 ol[class="roman"] ol[class="roman"] > li {
   list-style: inherit; }
 
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   counter-increment: roman;
   content: "(" counter(roman, lower-roman) ") ";
   position: absolute;
   left: -2.0em; }
 
-ol[class="roman"] ol[class="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li::before {
   counter-increment: none;
   content: initial; }
 

data/lib/isodoc/html/htmlstyle.scss

@@ -230,7 +230,7 @@ ul  li {
   list-style: none;
 }
 
-ul li:before {
+ul li::before {
   content: "—";
   display: inline-block; width: 1em;
   margin-left: -1.2em;
@@ -252,7 +252,7 @@ ul li:first-child {
   list-style-type: none;
 }
 
-#toc li:before {
+#toc li::before {
   content: " ";
   display: none;
 }
@@ -275,13 +275,13 @@ ol[class="alphabet"] > li {
 ol[class="alphabet"] ol[class="alphabet"] > li {
   list-style: inherit;
 }
-ol[class="alphabet"] > li:before {
+ol[class="alphabet"] > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") ";
   position: absolute;
   left: -1.4em;
 }
-ol[class="alphabet"] ol[class="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li::before {
   counter-increment: none;
   content: initial;
 }
@@ -295,13 +295,13 @@ ol[class="roman"] > li {
 ol[class="roman"] ol[class="roman"] > li {
   list-style: inherit;
 }
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   counter-increment: roman;
   content: "("counter(roman, lower-roman)") ";
   position: absolute;
   left: -2.0em;
 }
-ol[class="roman"] ol[class="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li::before {
   counter-increment: none;
   content: initial;
 }

data/lib/metanorma/standoc/blocks.rb

@@ -76,7 +76,7 @@ module Metanorma
       def stem(node)
         noko do |xml|
           xml.formula **formula_attrs(node) do |s|
-            stem_parse(node.lines.join("\n"), s, node.style.to_sym)
+            stem_parse(node.lines.join("\n"), s, node.style.to_sym, node.block?)
           end
         end
       end

data/lib/metanorma/standoc/cleanup.rb

@@ -1,24 +1,24 @@
 require "nokogiri"
 require "pathname"
 require "html2doc"
-require_relative "./cleanup_block"
-require_relative "./cleanup_table"
-require_relative "./cleanup_footnotes"
-require_relative "./cleanup_ref"
-require_relative "./cleanup_asciibib"
-require_relative "./cleanup_boilerplate"
-require_relative "./cleanup_bibdata"
-require_relative "./cleanup_section"
-require_relative "./cleanup_terms"
-require_relative "./cleanup_symbols"
-require_relative "./cleanup_xref"
-require_relative "./cleanup_inline"
-require_relative "./cleanup_amend"
-require_relative "./cleanup_maths"
-require_relative "./cleanup_image"
-require_relative "./cleanup_reqt"
-require_relative "./cleanup_text"
-require_relative "./cleanup_toc"
+require_relative "cleanup_block"
+require_relative "cleanup_table"
+require_relative "cleanup_footnotes"
+require_relative "cleanup_ref"
+require_relative "cleanup_asciibib"
+require_relative "cleanup_boilerplate"
+require_relative "cleanup_bibdata"
+require_relative "cleanup_section"
+require_relative "cleanup_terms"
+require_relative "cleanup_symbols"
+require_relative "cleanup_xref"
+require_relative "cleanup_inline"
+require_relative "cleanup_amend"
+require_relative "cleanup_maths"
+require_relative "cleanup_image"
+require_relative "cleanup_reqt"
+require_relative "cleanup_text"
+require_relative "cleanup_toc"
 require "relaton_iev"
 
 module Metanorma
@@ -51,6 +51,7 @@ module Metanorma
         normref_cleanup(xmldoc)
         biblio_cleanup(xmldoc)
         reference_names(xmldoc)
+        asciimath_cleanup(xmldoc) # feeds: mathml_cleanup, termdef_cleanup, symbols_cleanup
         symbols_cleanup(xmldoc) # feeds: termdef_cleanup
         xref_cleanup(xmldoc) # feeds: concept_cleanup, origin_cleanup
         concept_cleanup(xmldoc) # feeds: related_cleanup, termdef_cleanup
@@ -79,6 +80,7 @@ module Metanorma
         empty_element_cleanup(xmldoc)
         img_cleanup(xmldoc)
         anchor_cleanup(xmldoc)
+        link_cleanup(xmldoc)
         xmldoc
       end
 
@@ -107,7 +109,7 @@ module Metanorma
       end
 
       def element_name_cleanup(xmldoc)
-        xmldoc.traverse { |n| n.name = n.name.gsub(/_/, "-") }
+        xmldoc.traverse { |n| n.name = n.name.gsub("_", "-") }
       end
 
       # allows us to deal with doc relation localities,

data/lib/metanorma/standoc/cleanup_block.rb

@@ -233,6 +233,7 @@ module Metanorma
       def unnumbered_blocks_cleanup(xmldoc)
         @blockunnumbered&.each do |b|
           xmldoc.xpath("//#{b}").each do |e|
+            /^[^_]/.match?(e["id"]) and e["unnumbered"] = "false"
             e["unnumbered"] ||= "true"
           end
         end

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -78,7 +78,7 @@ module Metanorma
       def concept_cleanup1(elem)
         elem.children.remove if elem&.children&.text&.strip&.empty?
         key_extract_locality(elem)
-        if /:/.match?(elem["key"]) then concept_termbase_cleanup(elem)
+        if elem["key"].include?(":") then concept_termbase_cleanup(elem)
         elsif refid? elem["key"] then concept_eref_cleanup(elem)
         else concept_xref_cleanup(elem)
         end
@@ -95,15 +95,14 @@ module Metanorma
       end
 
       def key_extract_locality(elem)
-        return unless /,/.match?(elem["key"])
-
+        elem["key"].include?(",") or return
         elem.add_child("<locality>#{elem['key'].sub(/^[^,]+,/, '')}</locality>")
         elem["key"] = elem["key"].sub(/,.*$/, "")
       end
 
       def concept_termbase_cleanup(elem)
         t = elem&.at("./xrefrender")&.remove&.children
-        termbase, key = elem["key"].split(/:/, 2)
+        termbase, key = elem["key"].split(":", 2)
         elem.add_child(%(<termref base="#{termbase}" target="#{key}">) +
                        "#{t&.to_xml}</termref>")
       end
@@ -207,6 +206,21 @@ module Metanorma
         end
       end
 
+      def link_cleanup(xmldoc)
+        xmldoc.xpath("//link[@target]").each do |l|
+          l["target"] = URI.parse(l["target"]).to_s
+        rescue StandardError
+          err = "Malformed URI: #{l['target']}"
+          @log.add("Anchors", l, err)
+          @fatalerror << err
+          warn err
+        end
+      end
+
+      def uri_component_encode(comp)
+        CGI.escape(comp).gsub("+", "%20")
+      end
+
       private
 
       # skip ZWNJ inserted to prevent regexes operating in asciidoctor

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -3,17 +3,28 @@ require "asciimath2unitsml"
 module Metanorma
   module Standoc
     module Cleanup
-      def asciimath2mathml(text)
-        text = text.gsub(%r{<stem type="AsciiMath">(.+?)</stem>}m) do
-          "<amathstem>#{@c.decode($1)}</amathstem>"
+      def asciimath_cleanup(xml)
+        !@keepasciimath and asciimath2mathml(xml)
+      end
+
+      def asciimath2mathml(xml)
+        xpath = xml.xpath("//stem[@type = 'AsciiMath']")
+        xpath.each_with_index do |x, i|
+          progress_conv(i, 500, xpath.size, 1000, "AsciiMath")
+          asciimath2mathml_indiv(x)
         end
-        text = Html2Doc.new({})
-          .asciimath_to_mathml(text, ["<amathstem>", "</amathstem>"],
-                               retain_asciimath: true)
-        asciimath2mathml_wrap(text)
+        asciimath2mathml_wrap(xml)
+      end
+
+      def asciimath2mathml_indiv(elem)
+        elem["type"] = "MathML"
+        expr = @c.decode(elem.text)
+        ret = Plurimath::Math.parse(expr, "asciimath")
+          .to_mathml(display_style: elem["block"])
+        ret += "<asciimath>#{@c.encode(@c.decode(expr), :basic)}</asciimath>"
+        elem.children = ret
       rescue StandardError => e
-        asciimath2mathml_err(text, e)
-        text
+        asciimath2mathml_err(elem.to_xml, e)
       end
 
       def asciimath2mathml_err(text, expr)
@@ -23,25 +34,27 @@ module Metanorma
         warn err
       end
 
-      def asciimath2mathml_wrap(text)
-        x = Nokogiri::XML(text)
-        x.xpath("//*[local-name() = 'math'][@display]").each do |y|
+      def asciimath2mathml_wrap(xml)
+        xml.xpath("//*[local-name() = 'math'][@display]").each do |y|
           y.delete("display")
         end
-        x.xpath("//*[local-name() = 'math'][not(parent::stem)]").each do |y|
-          y.wrap("<stem type='MathML'></stem>")
-        end
-        x.xpath("//stem").each do |y|
-          y.next_element&.name == "asciimath" and y << y.next_element
-        end
-        to_xml(x)
+        # x.xpath("//stem").each do |y|
+        # y.next_element&.name == "asciimath" and y << y.next_element
+        # end
+        xml
+      end
+
+      def progress_conv(idx, step, total, threshold, msg)
+        return unless (idx % step).zero? && total > threshold && idx.positive?
+
+        warn "#{msg} #{idx} of #{total}"
       end
 
       def xml_unescape_mathml(xml)
         return if xml.children.any?(&:element?)
 
-        math = xml.text.gsub(/&lt;/, "<").gsub(/&gt;/, ">")
-          .gsub(/&quot;/, '"').gsub(/&apos;/, "'").gsub(/&amp;/, "&")
+        math = xml.text.gsub("&lt;", "<").gsub("&gt;", ">")
+          .gsub("&quot;", '"').gsub("&apos;", "'").gsub("&amp;", "&")
           .gsub(/<[^: \r\n\t\/]+:/, "<").gsub(/<\/[^ \r\n\t:]+:/, "</")
         xml.children = math
       end

data/lib/metanorma/standoc/cleanup_symbols.rb

@@ -1,3 +1,5 @@
+require "metanorma/standoc/utils"
+
 module Metanorma
   module Standoc
     module Cleanup
@@ -8,31 +10,12 @@ module Metanorma
       def symbol_key(sym)
         @c.decode(asciimath_key(sym).text)
           .gsub(/[\[\]{}<>()]/, "").gsub(/\s/m, "")
-          .gsub(/[[:punct:]]|[_^]/, ":\\0").gsub(/`/, "")
+          .gsub(/[[:punct:]]|[_^]/, ":\\0").gsub("`", "")
           .gsub(/[0-9]+/, "þ\\0")
           .tr("AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz",
               "ABCFEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")
       end
 
-      def asciimath_key(sym)
-        key = sym.dup
-        key.traverse do |n|
-          if n.name == "stem" && a = n.at(".//asciimath")
-            n.children = @c.encode(
-              @c.decode(grkletters(a.text)), :basic
-            )
-          end
-        end
-        key.xpath(".//asciimath").each(&:remove)
-        Nokogiri::XML(key.to_xml)
-      end
-
-      def grkletters(text)
-        text.gsub(/\b(alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|kappa|
-                      lambda|mu|nu|xi|omicron|pi|rho|sigma|tau|upsilon|phi|chi|
-                      psi|omega)\b/xi, "&\\1;")
-      end
-
       def extract_symbols_list(dlist)
         dl_out = []
         dlist.xpath("./dt | ./dd").each do |dtd|

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -111,6 +111,7 @@ module Metanorma
         term_dl_to_metadata(xmldoc)
         term_termsource_to_designation(xmldoc)
         term_designation_reorder(xmldoc)
+        term_designation_redundant(xmldoc)
         termdef_from_termbase(xmldoc)
         termdomain_cleanup(xmldoc)
         termdef_stem_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_terms_designations.rb

@@ -101,7 +101,7 @@ module Metanorma
 
       def term_dl_to_designation_category(prev, category)
         cat = prev.at(".//expression/grammar/#{category}")
-        /,/.match?(cat&.text) and
+        cat&.text&.include?(",") and
           cat.replace(cat.text.split(/,\s*/)
             .map { |x| "<#{category}>#{x}</#{category}>" }.join)
       end
@@ -148,13 +148,15 @@ module Metanorma
         end
       end
 
+      DESIGNATOR = %w(preferred admitted deprecates related).freeze
+
       def term_termsource_to_designation(xmldoc)
         xmldoc.xpath("//term/termsource").each do |t|
           p = t.previous_element
           while %w(domain subject).include? p&.name
             p = p.previous_element
           end
-          %w(preferred admitted deprecates related).include?(p&.name) or
+          DESIGNATOR.include?(p&.name) or
             next
           related2pref(p) << t.remove
         end
@@ -162,8 +164,7 @@ module Metanorma
 
       def term_designation_reorder(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          des = %w(preferred admitted deprecates related)
-            .each_with_object([]) do |tag, m|
+          des = DESIGNATOR.each_with_object([]) do |tag, m|
             t.xpath("./#{tag}").each { |x| m << x.remove }
           end.reverse
           t << " "
@@ -174,7 +175,21 @@ module Metanorma
       end
 
       def related2pref(elem)
-        elem&.name == "related" ? elem = elem.at("./preferred") : elem
+        elem&.name == "related" ? elem.at("./preferred") : elem
+      end
+
+      def term_designation_redundant(xmldoc)
+        xmldoc.xpath("//term").each do |t|
+          DESIGNATOR.each do |n|
+            t.xpath("./#{n}/expression/name").each_with_object([]) do |d, m|
+              if m.include?(d.text)
+                @log.add("Terms", t, "Removed duplicate designation #{d.text}")
+                d.parent.parent.remove
+              end
+              m << d.text
+            end
+          end
+        end
       end
     end
   end

data/lib/metanorma/standoc/cleanup_text.rb

@@ -3,7 +3,6 @@ module Metanorma
     module Cleanup
       def textcleanup(result)
         text = result.flatten.map { |l| l.sub(/\s*\Z/, "") } * "\n"
-        !@keepasciimath and text = asciimath2mathml(text)
         text = text.gsub(/\s+<fn /, "<fn ")
         %w(passthrough passthrough-inline).each do |v|
           text.gsub!(%r{<#{v}\s+formats="metanorma">([^<]*)

data/lib/metanorma/standoc/converter.rb

@@ -20,6 +20,8 @@ module Metanorma
     # schema encapsulation of the document for validation
     class Converter
       Asciidoctor::Extensions.register do
+        preprocessor Metanorma::Standoc::EmbedIncludeProcessor
+        preprocessor Metanorma::Standoc::NamedEscapePreprocessor
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
@@ -60,8 +62,6 @@ module Metanorma
         treeprocessor Metanorma::Standoc::ToDoInlineAdmonitionBlock
         block Metanorma::Standoc::PlantUMLBlockMacro
         block Metanorma::Standoc::PseudocodeBlockMacro
-        preprocessor Metanorma::Standoc::EmbedIncludeProcessor
-        preprocessor Metanorma::Standoc::NamedEscapePreprocessor
       end
 
       include ::Asciidoctor::Converter

data/lib/metanorma/standoc/inline.rb

@@ -138,9 +138,10 @@ module Metanorma
         noko { |xml| xml.hr }.join
       end
 
-      def latex_parse1(text)
+      def latex_parse1(text, block)
         lxm_input = Unicode2LaTeX.unicode2latex(@c.decode(text))
-        results = Plurimath::Math.parse(lxm_input, "latex").to_mathml
+        results = Plurimath::Math.parse(lxm_input, "latex")
+          .to_mathml(display_style: block)
         if results.nil?
           @log.add("Math", nil,
                    "latexmlmath failed to process equation:\n#{lxm_input}")
@@ -149,22 +150,23 @@ module Metanorma
         results.sub(%r{<math ([^>]+ )?display="block"}, "<math \\1")
       end
 
-      def stem_parse(text, xml, style)
+      def stem_parse(text, xml, style, block)
         if /&lt;([^:>&]+:)?math(\s+[^>&]+)?&gt; |
           <([^:>&]+:)?math(\s+[^>&]+)?>/x.match? text
           math = xml_encode(text)
-          xml.stem type: "MathML" do |s|
+          xml.stem type: "MathML", block: block do |s|
             s << math
           end
-        elsif style == :latexmath then latex_parse(text, xml)
+        elsif style == :latexmath then latex_parse(text, xml, block)
         else
-          xml.stem text&.gsub(/&amp;#/, "&#"), type: "AsciiMath"
+          xml.stem text&.gsub("&amp;#", "&#"), type: "AsciiMath", block: block
         end
       end
 
-      def latex_parse(text, xml)
-        latex = latex_parse1(text) or return xml.stem type: "MathML"
-        xml.stem type: "MathML" do |s|
+      def latex_parse(text, xml, block)
+        latex = latex_parse1(text, block) or
+          return xml.stem type: "MathML", block: block
+        xml.stem type: "MathML", block: block do |s|
           math = Nokogiri::XML.fragment(latex.sub(/<\?[^>]+>/, ""))
             .elements[0]
           math.delete("alttext")
@@ -187,8 +189,8 @@ module Metanorma
           when :single then xml << "'#{node.text}'"
           when :superscript then xml.sup { |s| s << node.text }
           when :subscript then xml.sub { |s| s << node.text }
-          when :asciimath then stem_parse(node.text, xml, :asciimath)
-          when :latexmath then stem_parse(node.text, xml, :latexmath)
+          when :asciimath then stem_parse(node.text, xml, :asciimath, false)
+          when :latexmath then stem_parse(node.text, xml, :latexmath, false)
           when :mark then highlight_parse(node.text, xml)
           else
             case node.role
@@ -215,7 +217,14 @@ module Metanorma
       end
 
       def image_attributes(node)
-        uri = node.image_uri (node.attr("target") || node.target)
+        nodetarget = node.attr("target") || node.target
+        if Gem.win_platform? && /^[a-zA-Z]:/.match?(nodetarget)
+          nodetarget.prepend("/")
+        end
+        uri = node.image_uri (nodetarget)
+        if Gem.win_platform? && /^\/[a-zA-Z]:/.match?(uri)
+          uri = uri[1..-1]
+        end
         types = if /^data:/.match?(uri) then Metanorma::Utils::datauri2mime(uri)
                 else MIME::Types.type_for(uri)
                 end

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.2 -->
+<!-- VERSION v1.2.3 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>

data/lib/metanorma/standoc/macros.rb

@@ -1,5 +1,3 @@
-require "asciidoctor/extensions"
-require "fileutils"
 require "uuidtools"
 require "yaml"
 require "csv"

data/lib/metanorma/standoc/ref_sect.rb

@@ -85,13 +85,14 @@ module Metanorma
         end
       end
 
-      def fetchable_ref_code?(ref)
-        ref[:code].nil? || ref[:code].empty? || ref[:no_year] ||
+      def unfetchable_ref_code?(ref)
+        ref[:code].nil? || ref[:code].empty? || ref[:no_year] || 
+          /^\(.+\)$/.match?(ref[:code]) ||
           (@bibdb.nil? && !ref[:localfile])
       end
 
       def fetch_ref_async(ref, idx, res)
-        if fetchable_ref_code?(ref)
+        if unfetchable_ref_code?(ref)
           res << [ref, idx, nil]
         elsif ref[:localfile]
           res << [ref, idx, @local_bibdb.get(ref[:code], ref[:localfile])]

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -1,11 +1,10 @@
-# frozen_string_literal: true.
 require "metanorma/standoc/utils"
 
 module Metanorma
   module Standoc
     # Intelligent term lookup xml modifier
     class TermLookupCleanup
-      AUTOMATIC_GENERATED_ID_REGEXP = /\A_/.freeze
+      AUTO_GEN_ID_REGEXP = /\A_/.freeze
       EXISTING_TERM_REGEXP = /\Aterm-/.freeze
       EXISTING_SYMBOL_REGEXP = /\Asymbol-/.freeze
 
@@ -16,6 +15,8 @@ module Metanorma
         @log = log
         @termlookup = { term: {}, symbol: {}, secondary2primary: {} }
         @idhash = {}
+        @unique_designs = {}
+        @c = HTMLEntities.new
         @terms_tags = xmldoc.xpath("//terms").each_with_object({}) do |t, m|
           m[t["id"]] = true
         end
@@ -23,63 +24,102 @@ module Metanorma
 
       def call
         @idhash = populate_idhash
+        @unique_designs = unique_designators
         @termlookup = replace_automatic_generated_ids_terms
         set_termxref_tags_target
         concept_cleanup
         related_cleanup
+        remove_missing_refs
+        concept_cleanup2
       end
 
       private
 
+      def unique_designators
+        ret = xmldoc
+          .xpath("//preferred/expression/name | //admitted/expression/name | " \
+                 "//deprecated/expression/name").each_with_object({}) do |n, m|
+          m[n.text] ||= 0
+          m[n.text] += 1
+        end
+        ret.each { |k, v| v == 1 or ret.delete(k) }
+        ret
+      end
+
       def concept_cleanup
         xmldoc.xpath("//concept").each do |n|
-          n.delete("type")
           refterm = n.at("./refterm") or next
-          p = @termlookup[:secondary2primary][refterm.text] and
-            refterm.children = p
+          lookup = normalize_ref_id_text(refterm.text.strip)
+          p = @termlookup[:secondary2primary][lookup] and
+            refterm.children = @c.encode(p)
         end
       end
 
+      def concept_cleanup2
+        xmldoc.xpath("//concept").each { |n| n.delete("type") }
+      end
+
       def related_cleanup
         xmldoc.xpath("//related").each do |n|
           refterm = n.at("./refterm") or next
-          p = @termlookup[:secondary2primary][refterm.text] and
-            refterm.children = p
-          refterm.replace("<preferred><expression>" \
-                          "<name>#{refterm.children.to_xml}" \
-                          "</name></expression></preferred>")
+          lookup = normalize_ref_id_text(refterm.text.strip)
+          p = @termlookup[:secondary2primary][lookup] and
+            refterm.children = @c.encode(p)
+          p || @termlookup[:term][lookup] and
+            refterm.replace("<preferred><expression>" \
+                            "<name>#{refterm.children.to_xml}" \
+                            "</name></expression></preferred>")
         end
       end
 
       def populate_idhash
         xmldoc.xpath("//*[@id]").each_with_object({}) do |n, mem|
-          next unless /^(term|symbol)-/.match?(n["id"])
-
+          /^(term|symbol)-/.match?(n["id"]) or next
           mem[n["id"]] = true
         end
       end
 
       def set_termxref_tags_target
         xmldoc.xpath("//termxref").each do |node|
-          target = normalize_ref_id(node)
-          if termlookup[:term][target].nil? && termlookup[:symbol][target].nil?
-            remove_missing_ref(node, target)
-            next
-          end
+          target = normalize_ref_id1(node)
           x = node.at("../xrefrender") and modify_ref_node(x, target)
           node.name = "refterm"
         end
       end
 
+      def remove_missing_refs
+        xmldoc.xpath("//refterm").each do |node|
+          remove_missing_ref?(node) or next
+          lookup_refterm(node)
+        end
+      end
+
+      def remove_missing_ref?(node)
+        node.at("../eref | ../termref") and return false
+        xref = node.at("../xref") or return true
+        xref["target"] && !xref["target"]&.empty? and return false
+        xref.remove # if xref supplied by user, we won't delete
+        true
+      end
+
+      def lookup_refterm(node)
+        target = normalize_ref_id1(node)
+        if termlookup[:term][target].nil? && termlookup[:symbol][target].nil?
+          remove_missing_ref(node, target)
+        else
+          x = node.at("../xrefrender") and x.name = "xref"
+        end
+      end
+
       def remove_missing_ref(node, target)
         if node.at("./parent::concept[@type = 'symbol']")
           log.add("AsciiDoc Input", node,
                   remove_missing_ref_msg(node, target, :symbol))
-          remove_missing_ref_symbol(node, target)
+          remove_missing_ref_term(node, target, "symbol")
         else
           log.add("AsciiDoc Input", node,
                   remove_missing_ref_msg(node, target, :term))
-          remove_missing_ref_term(node, target)
+          remove_missing_ref_term(node, target, "term")
         end
       end
 
@@ -94,7 +134,7 @@ module Metanorma
       end
 
       def remove_missing_ref_msg1(_node, target, ret)
-        target2 = "_#{target.downcase.gsub(/-/, '_')}"
+        target2 = "_#{target.downcase.gsub('-', '_')}"
         if @terms_tags[target] || @terms_tags[target2]
           ret.strip!
           ret += ". Did you mean to point to a subterm?"
@@ -102,23 +142,13 @@ module Metanorma
         ret
       end
 
-      def remove_missing_ref_term(node, target)
-        node.name = "strong"
-        node.at("../xrefrender")&.remove
-        display = node.at("../renderterm")&.remove&.children
-        display = [] if display.nil? || display.to_xml == node.text
-        d = display.empty? ? "" : ", display <tt>#{display.to_xml}</tt>"
-        node.children = "term <tt>#{node.text}</tt>#{d} " \
-                        "not resolved via ID <tt>#{target}</tt>"
-      end
-
-      def remove_missing_ref_symbol(node, target)
+      def remove_missing_ref_term(node, target, type)
         node.name = "strong"
-        node.at("../xrefrender")&.remove
+        node.xpath("../xrefrender | ../xref").each(&:remove)
         display = node.at("../renderterm")&.remove&.children
         display = [] if display.nil? || display.to_xml == node.text
         d = display.empty? ? "" : ", display <tt>#{display.to_xml}</tt>"
-        node.children = "symbol <tt>#{node.text}</tt>#{d} " \
+        node.children = "#{type} <tt>#{@c.encode(node.text)}</tt>#{d} " \
                         "not resolved via ID <tt>#{target}</tt>"
       end
 
@@ -137,35 +167,50 @@ module Metanorma
 
       def replace_automatic_generated_ids_terms
         r = xmldoc.xpath("//term").each.with_object({}) do |n, res|
-          normalize_id_and_memorize(n, res, "./preferred//name", "term")
-          normalize_id_and_memorize(n, res, "./admitted//name", "term")
+          norm_id_memorize(n, res, "./preferred//name", "term", true)
+          norm_id_memorize(n, res, "./admitted//name", "term", true)
         end
         s = xmldoc.xpath("//definitions//dt").each.with_object({}) do |n, res|
-          normalize_id_and_memorize(n, res, ".", "symbol")
+          norm_id_memorize(n, res, ".", "symbol", false)
         end
         { term: r, symbol: s, secondary2primary: pref_secondary2primary }
       end
 
       def pref_secondary2primary
-        term = ""
         xmldoc.xpath("//term").each.with_object({}) do |n, res|
-          n.xpath("./preferred//name").each_with_index do |p, i|
-            i.zero? and term = p.text
-            i.positive? and res[p.text] = term
-          end
-          n.xpath("./admitted//name").each { |p| res[p.text] = term }
+          primary = domain_prefix(n, n.at("./preferred//name")&.text)
+          pref_secondary2primary_preferred(n, res, primary)
+          pref_secondary2primary_admitted(n, res, primary)
+        end
+      end
+
+      def pref_secondary2primary_preferred(term, res, primary)
+        term.xpath("./preferred//name").each_with_index do |p, i|
+          t = p.text.strip
+          i.positive? and
+            res[normalize_ref_id_text(domain_prefix(term, t))] = primary
+          @unique_designs[t] && term.at(".//domain") and
+            res[normalize_ref_id_text(t)] = primary
+        end
+      end
+
+      def pref_secondary2primary_admitted(term, res, primary)
+        term.xpath("./admitted//name").each do |p|
+          t = p.text.strip
+          res[normalize_ref_id_text(domain_prefix(term, t))] = primary
+          @unique_designs[t] && term.at(".//domain") and
+            res[normalize_ref_id_text(t)] = primary
         end
       end
 
-      def normalize_id_and_memorize(node, res_table, text_selector, prefix)
-        normalize_id_and_memorize_init(node, res_table, text_selector, prefix)
-        memorize_other_pref_terms(node, res_table, text_selector)
+      def norm_id_memorize(node, res_table, selector, prefix, use_domain)
+        norm_id_memorize_init(node, res_table, selector, prefix, use_domain)
+        memorize_other_pref_terms(node, res_table, selector, use_domain)
       end
 
-      def normalize_id_and_memorize_init(node, res_table, text_selector, prefix)
-        term_text = normalize_ref_id(node.at(text_selector)) or return
-        unless AUTOMATIC_GENERATED_ID_REGEXP.match(node["id"]).nil? &&
-            !node["id"].nil?
+      def norm_id_memorize_init(node, res_table, selector, prefix, use_domain)
+        term_text = normalize_ref_id(node, selector, use_domain) or return
+        unless AUTO_GEN_ID_REGEXP.match(node["id"]).nil? && !node["id"].nil?
           id = unique_text_id(term_text, prefix)
           node["id"] = id
           @idhash[id] = true
@@ -173,34 +218,46 @@ module Metanorma
         res_table[term_text] = node["id"]
       end
 
-      def memorize_other_pref_terms(node, res_table, text_selector)
+      def memorize_other_pref_terms(node, res_table, text_selector, use_domain)
         node.xpath(text_selector).each_with_index do |p, i|
-          next unless i.positive?
-
-          res_table[normalize_ref_id(p)] = node["id"]
+          i.positive? or next
+          res_table[normalize_ref_id1(p, use_domain ? node : nil)] = node["id"]
         end
       end
 
-      def normalize_ref_id(term)
-        return nil if term.nil?
+      def domain_prefix(node, term)
+        d = node&.at(".//domain") or return term
+        "<#{d.text}> #{term}"
+      end
+
+      def normalize_ref_id(node, selector, use_domain)
+        term = node.at(selector) or return nil
+        normalize_ref_id1(term, use_domain ? node : nil)
+      end
 
+      def normalize_ref_id1(term, node = nil)
         t = term.dup
         t.xpath(".//index").map(&:remove)
-        Metanorma::Utils::to_ncname(t.text.strip
-          .gsub(/[[:space:]]+/, "-"))
+        ret = asciimath_key(t).text.strip
+        node and ret = domain_prefix(node, ret)
+        normalize_ref_id_text(ret)
+      end
+
+      def normalize_ref_id_text(text)
+        Metanorma::Utils::to_ncname(text.gsub(/[[:space:]]+/, "-"))
       end
 
       def unique_text_id(text, prefix)
-        unless @idhash["#{prefix}-#{text}"]
+        @idhash["#{prefix}-#{text}"] or
           return "#{prefix}-#{text}"
-        end
-
         (1..Float::INFINITY).lazy.each do |index|
           unless @idhash["#{prefix}-#{text}-#{index}"]
             break("#{prefix}-#{text}-#{index}")
           end
         end
       end
+
+      include ::Metanorma::Standoc::Utils
     end
   end
 end

data/lib/metanorma/standoc/utils.rb

@@ -70,10 +70,10 @@ module Metanorma
 
       def xml_encode(text)
         @c.encode(text, :basic, :hexadecimal)
-          .gsub(/&amp;gt;/, ">").gsub(/&amp;lt;/, "<").gsub(/&amp;amp;/, "&")
-          .gsub(/&gt;/, ">").gsub(/&lt;/, "<").gsub(/&amp;/, "&")
-          .gsub(/&quot;/, '"').gsub(/&#xa;/, "\n").gsub(/&amp;#/, "&#")
-          .gsub(/&apos;/, "'")
+          .gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;amp;", "&")
+          .gsub("&gt;", ">").gsub("&lt;", "<").gsub("&amp;", "&")
+          .gsub("&quot;", '"').gsub("&#xa;", "\n").gsub("&amp;#", "&#")
+          .gsub("&apos;", "'")
       end
 
       # wrapped in <sections>
@@ -85,6 +85,25 @@ module Metanorma
         Nokogiri::XML(c).at("//xmlns:sections")
       end
 
+      def asciimath_key(sym)
+        key = sym.dup
+        key.traverse do |n|
+          if n.name == "stem" && a = n.at(".//asciimath")
+            n.children = @c.encode(
+              @c.decode(grkletters(a.text)), :basic
+            )
+          end
+        end
+        key.xpath(".//asciimath").each(&:remove)
+        Nokogiri::XML(key.to_xml)
+      end
+
+      def grkletters(text)
+        text.gsub(/\b(alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|kappa|
+                      lambda|mu|nu|xi|omicron|pi|rho|sigma|tau|upsilon|phi|chi|
+                      psi|omega)\b/xi, "&\\1;")
+      end
+
       module_function :adoc2xml
 
       class EmptyAttr

data/lib/metanorma/standoc/validate.rb

@@ -1,7 +1,7 @@
 require "metanorma/standoc/utils"
-require_relative "./validate_section"
-require_relative "./validate_table"
-require_relative "./validate_xref"
+require_relative "validate_section"
+require_relative "validate_table"
+require_relative "validate_term"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -10,38 +10,6 @@ require "pngcheck"
 module Metanorma
   module Standoc
     module Validate
-      SOURCELOCALITY = "./origin//locality[@type = 'clause']/" \
-                       "referenceFrom".freeze
-
-      def init_iev
-        @no_isobib and return nil
-        @iev and return @iev
-        @iev = Iev::Db.new(@iev_globalname, @iev_localname) unless @no_isobib
-        @iev
-      end
-
-      def iev_validate(xmldoc)
-        @iev = init_iev or return
-        xmldoc.xpath("//term").each do |t|
-          t.xpath(".//termsource").each do |src|
-            (/^IEC[  ]60050-/.match(src.at("./origin/@citeas")&.text) &&
-          loc = src.xpath(SOURCELOCALITY)&.text) or next
-            iev_validate1(t, loc, xmldoc)
-          end
-        end
-      end
-
-      def iev_validate1(term, loc, xmldoc)
-        iev = @iev.fetch(loc,
-                         xmldoc.at("//language")&.text || "en") or return
-        pref = term.xpath("./preferred//name").inject([]) do |m, x|
-          m << x.text&.downcase
-        end
-        pref.include?(iev.downcase) or
-          @log.add("Bibliography", term, %(Term "#{pref[0]}" does not match ) +
-                   %(IEV #{loc} "#{iev}"))
-      end
-
       def content_validate(doc)
         repeat_id_validate(doc.root) # feeds xref_validate
         xref_validate(doc) # feeds nested_asset_validate
@@ -51,6 +19,7 @@ module Metanorma
         iev_validate(doc.root)
         concept_validate(doc, "concept", "refterm")
         concept_validate(doc, "related", "preferred//name")
+        preferred_validate(doc)
         table_validate(doc)
         @fatalerror += requirement_validate(doc)
         image_validate(doc)
@@ -73,7 +42,7 @@ module Metanorma
       def mathml_sanitise(math)
         math.to_xml(encoding: "US-ASCII").gsub(/ xmlns=["'][^"']+["']/, "")
           .gsub(%r{<[^:/>]+:}, "<").gsub(%r{</[^:/>]+:}, "</")
-          #.gsub(/&#([^;]+);/) { |x| "&#x#{$1.to_i.to_s(16)};" }
+        # .gsub(/&#([^;]+);/) { |x| "&#x#{$1.to_i.to_s(16)};" }
       end
 
       def math_validate_error(math, elem, error)
@@ -125,37 +94,6 @@ module Metanorma
         # @fatalerror << err2
       end
 
-      def concept_validate(doc, tag, refterm)
-        found = false
-        concept_validate_ids(doc)
-        doc.xpath("//#{tag}/xref").each do |x|
-          @concept_ids[x["target"]] and next
-          @log.add("Anchors", x, concept_validate_msg(doc, tag, refterm, x))
-          found = true
-        end
-        found and @fatalerror << "#{tag.capitalize} not cross-referencing " \
-                                 "term or symbol"
-      end
-
-      def concept_validate_ids(doc)
-        @concept_ids ||= doc.xpath("//term | //definitions//dt")
-          .each_with_object({}) { |x, m| m[x["id"]] = true }
-        @concept_terms_tags ||= doc.xpath("//terms")
-          .each_with_object({}) { |t, m| m[t["id"]] = true }
-        nil
-      end
-
-      def concept_validate_msg(_doc, tag, refterm, xref)
-        ret = <<~LOG
-          #{tag.capitalize} #{xref.at("../#{refterm}")&.text} is pointing to #{xref['target']}, which is not a term or symbol
-        LOG
-        if @concept_terms_tags[xref["target"]]
-          ret = ret.strip
-          ret += ". Did you mean to point to a subterm?"
-        end
-        ret
-      end
-
       def schema_validate(doc, schema)
         Tempfile.open(["tmp", ".xml"], encoding: "UTF-8") do |f|
           schema_validate1(f, doc, schema)
@@ -247,6 +185,33 @@ module Metanorma
         schema_validate(formattedstr_strip(doc.dup),
                         File.join(File.dirname(__FILE__), "isodoc-compile.rng"))
       end
+
+      def repeat_id_validate1(elem)
+        if @doc_ids[elem["id"]]
+          @log.add("Anchors", elem, "Anchor #{elem['id']} has already been " \
+                                    "used at line #{@doc_ids[elem['id']]}")
+          @fatalerror << "Multiple instances of same ID: #{elem['id']}"
+        end
+        @doc_ids[elem["id"]] = elem.line
+      end
+
+      def repeat_id_validate(doc)
+        @doc_ids = {}
+        doc.xpath("//*[@id]").each do |x|
+          repeat_id_validate1(x)
+        end
+      end
+
+      # manually check for xref/@target, xref/@to integrity
+      def xref_validate(doc)
+        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
+          .each_with_object({}) do |x, m|
+          m[x.text] = x
+          @doc_ids[x.text] and next
+          @log.add("Anchors", x.parent,
+                   "Crossreference target #{x} is undefined")
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/validate_term.rb

@@ -0,0 +1,89 @@
+module Metanorma
+  module Standoc
+    module Validate
+      SOURCELOCALITY = "./origin//locality[@type = 'clause']/" \
+                       "referenceFrom".freeze
+
+      def init_iev
+        @no_isobib and return nil
+        @iev and return @iev
+        @iev = Iev::Db.new(@iev_globalname, @iev_localname) unless @no_isobib
+        @iev
+      end
+
+      def iev_validate(xmldoc)
+        @iev = init_iev or return
+        xmldoc.xpath("//term").each do |t|
+          t.xpath(".//termsource").each do |src|
+            (/^IEC[  ]60050-/.match(src.at("./origin/@citeas")&.text) &&
+          loc = src.xpath(SOURCELOCALITY)&.text) or next
+            iev_validate1(t, loc, xmldoc)
+          end
+        end
+      end
+
+      def iev_validate1(term, loc, xmldoc)
+        iev = @iev.fetch(loc,
+                         xmldoc.at("//language")&.text || "en") or return
+        pref = term.xpath("./preferred//name").inject([]) do |m, x|
+          m << x.text&.downcase
+        end
+        pref.include?(iev.downcase) or
+          @log.add("Bibliography", term, %(Term "#{pref[0]}" does not match ) +
+                   %(IEV #{loc} "#{iev}"))
+      end
+
+      def concept_validate(doc, tag, refterm)
+        found = false
+        concept_validate_ids(doc)
+        doc.xpath("//#{tag}/xref").each do |x|
+          @concept_ids[x["target"]] and next
+          @log.add("Anchors", x, concept_validate_msg(doc, tag, refterm, x))
+          found = true
+        end
+        found and @fatalerror << "#{tag.capitalize} not cross-referencing " \
+                                 "term or symbol"
+      end
+
+      def concept_validate_ids(doc)
+        @concept_ids ||= doc.xpath("//term | //definitions//dt")
+          .each_with_object({}) { |x, m| m[x["id"]] = true }
+        @concept_terms_tags ||= doc.xpath("//terms")
+          .each_with_object({}) { |t, m| m[t["id"]] = true }
+        nil
+      end
+
+      def concept_validate_msg(_doc, tag, refterm, xref)
+        ret = <<~LOG
+          #{tag.capitalize} #{xref.at("../#{refterm}")&.text} is pointing to #{xref['target']}, which is not a term or symbol
+        LOG
+        if @concept_terms_tags[xref["target"]]
+          ret = ret.strip
+          ret += ". Did you mean to point to a subterm?"
+        end
+        ret
+      end
+
+      def preferred_validate(doc)
+        out = []
+        ret = doc.xpath("//term").each_with_object({}) do |t, m|
+          prefix = t.at("./domain")&.text
+          t.xpath("./preferred//name").each do |n|
+            ret = n.text
+            prefix and ret = "<#{prefix}> #{ret}"
+            (m[ret] and out << ret) or m[ret] = t
+          end
+        end
+        preferred_validate_report(out, ret)
+      end
+
+      def preferred_validate_report(terms, locations)
+        terms.each do |e|
+          err = "Term #{e} occurs twice as preferred designation"
+          @log.add("Terms", locations[e], err)
+          @fatalerror << err
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.4.8".freeze
+    VERSION = "2.5.0".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.5.4"
+  spec.add_dependency "isodoc", "~> 2.6.0"
   spec.add_dependency "metanorma", ">= 1.5.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.1.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -529,7 +529,7 @@ files:
 - lib/metanorma/standoc/validate.rb
 - lib/metanorma/standoc/validate_section.rb
 - lib/metanorma/standoc/validate_table.rb
-- lib/metanorma/standoc/validate_xref.rb
+- lib/metanorma/standoc/validate_term.rb
 - lib/metanorma/standoc/version.rb
 - lib/metanorma/standoc/views/datamodel/model_representation.adoc.erb
 - lib/metanorma/standoc/views/datamodel/plantuml_representation.adoc.erb

data/lib/metanorma/standoc/validate_xref.rb

@@ -1,32 +0,0 @@
-module Metanorma
-  module Standoc
-    module Validate
-      def repeat_id_validate1(elem)
-        if @doc_ids[elem["id"]]
-          @log.add("Anchors", elem, "Anchor #{elem['id']} has already been " \
-                                    "used at line #{@doc_ids[elem['id']]}")
-          @fatalerror << "Multiple instances of same ID: #{elem['id']}"
-        end
-        @doc_ids[elem["id"]] = elem.line
-      end
-
-      def repeat_id_validate(doc)
-        @doc_ids = {}
-        doc.xpath("//*[@id]").each do |x|
-          repeat_id_validate1(x)
-        end
-      end
-
-      # manually check for xref/@target, xref/@to integrity
-      def xref_validate(doc)
-        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
-          .each_with_object({}) do |x, m|
-          m[x.text] = x
-          @doc_ids[x.text] and next
-          @log.add("Anchors", x.parent,
-                   "Crossreference target #{x} is undefined")
-        end
-      end
-    end
-  end
-end