metanorma-standoc 2.4.7 → 2.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a2d55d6c29842acb1b636afe7cf434c1769692a4b81ddee42fe77abf706f2a
-  data.tar.gz: 77cc311b6679b34314274cb136807747a2e029eb7ced3bdd5830c16732a15d28
+  metadata.gz: 70483d0ae3e7369ea535a02fed125b9b073c2792cc9a589c22cd94ea98948d1e
+  data.tar.gz: 9fb3bcbfb78079b25cbdfb6f49fdefc4df8928a8d0782878396be6a6f286374c
 SHA512:
-  metadata.gz: c65b3f99e33a4ad4452b05cc3c0d6c9e545179d50bc5e6bf8ff8a718287a3dfa2b344c233c7fb3adf1c95835aa0370910740b0262c8266f26dd9b8920ea074bc
-  data.tar.gz: 347dbf45508a7ab22323e24ba46abc08c1c4f1d091b17823fe941d844726774b85c0fa9c82a8399c08ac763fbb6d2cf5bb3e5e9f554e21d6e2a3e0abf39dc7e4
+  metadata.gz: f2b70e60bd3f83f8218c16bf24d9ff8a164b4a0467cf6f47e4090da745034f048a5dd91d813e0242f365eccf52ab71e2af1b477b320d1e310412c8065b02742b
+  data.tar.gz: 2008df0fab61498838336fa8ddbf94efa3845583ed1740223a877b8ad27ccfc8d257553067f3a84226ff41ef0cc2bda91b2fd90e88a2d8be2aaf3032688bebef

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/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_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/converter.rb

@@ -20,11 +20,13 @@ 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::Glossarist::DatasetPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
+        preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
         inline_macro Metanorma::Standoc::DateInlineMacro
         inline_macro Metanorma::Standoc::SpanInlineMacro
@@ -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

@@ -215,7 +215,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/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,101 @@ 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
+          p = @termlookup[:secondary2primary][@c.encode(refterm.text)] 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 = @c.encode(refterm.text)
+          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
 
@@ -102,23 +141,13 @@ module Metanorma
         ret
       end
 
-      def remove_missing_ref_term(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 = "term <tt>#{node.text}</tt>#{d} " \
-                        "not resolved via ID <tt>#{target}</tt>"
-      end
-
-      def remove_missing_ref_symbol(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 = "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 +166,47 @@ 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|
+          i.positive? and res[domain_prefix(term, p.text)] = primary
+          @unique_designs[p.text] && term.at(".//domain") and
+            res[p.text] = 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 pref_secondary2primary_admitted(term, res, primary)
+        term.xpath("./admitted//name").each do |p|
+          res[domain_prefix(term, p.text)] = primary
+          @unique_designs[p.text] && term.at(".//domain") and
+            res[p.text] = primary
+        end
+      end
+
+      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,28 +214,34 @@ 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 = t.text.strip
+        node and ret = domain_prefix(node, ret)
+        Metanorma::Utils::to_ncname(ret.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}")

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_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.7".freeze
+    VERSION = "2.4.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -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