metanorma-iso 3.1.7 → 3.2.0

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -37,7 +37,8 @@ module IsoDoc
         requirement docxml
         recommendation docxml
         requirement_render docxml
-        @xrefs.anchors_previous = @xrefs.anchors.dup # store old xrefs of reqts
+        @xrefs.anchors_previous = 
+          @xrefs.anchors.transform_values(&:dup) # store old xrefs of reqts
         @xrefs.parse docxml
         # TODO move this dependency around: requirements at root should be processed before everything else
         table docxml # have table include requirements newly converted to tables
@@ -125,7 +126,6 @@ module IsoDoc
 
       def table1(elem)
         table1_key(elem)
-        #require "debug"; binding.b
         if elem["class"] == "modspec"
           if n = elem.at(ns(".//fmt-name"))
             n.remove.name = "name"

data/lib/isodoc/iso/xref.rb

@@ -250,7 +250,21 @@ container: false)
         has_table_prefix = @anchors.dig(e, :has_table_prefix)
         has_table_prefix and return
         super
-        #has_table_prefix and @anchors[e][:has_table_prefix] = true # restore
+        # has_table_prefix and @anchors[e][:has_table_prefix] = true # restore
+      end
+
+      def localise_anchors(type = nil)
+        @anchors.each do |id, v|
+          type && v[:type] != type and next
+          #v[:has_table_prefix] and next
+          # has already been l10n'd, is copied from prev iteration
+          %i(label value xref xref_bare modspec).each do |t|
+            v[t] && !v[t].empty? or next
+            # Skip if value unchanged from previous iteration
+            @anchors_previous&.dig(id, t) == v[t] and next
+            v[t] = @i18n.l10n(v[t])
+          end
+        end
       end
     end
   end

data/lib/metanorma/iso/cleanup.rb

@@ -39,8 +39,7 @@ module Metanorma
         doc.xpath("//ol[@explicit-type]").each do |x|
           x["type"] = x["explicit-type"]
           x.delete("explicit-type")
-          @log.add("Style", x,
-                   "Style override set for ordered list")
+          @log.add("ISO_1", x)
         end
       end
 

data/lib/metanorma/iso/converter.rb

@@ -16,3 +16,5 @@ module Metanorma
     end
   end
 end
+
+require "metanorma/iso/log"

data/lib/metanorma/iso/front.rb

@@ -67,8 +67,7 @@ module Metanorma
       end
 
       def report_illegal_stage(stage, substage)
-        err = "Illegal document stage: #{stage}.#{substage}"
-        @log.add("Document Attributes", nil, err)
+        @log.add("ISO_9", nil, params: [stage, substage])
       end
 
       def title_component(node, xml, lang, comp)

data/lib/metanorma/iso/front_contributor.rb

@@ -16,8 +16,6 @@ module Metanorma
         secretariat_contributor(node, xml, default_publisher)
       end
 
-      def personal_author(node, xml); end
-
       def org_organization(node, xml, org)
         if org[:committee]
           contrib_committee_build(xml, org[:agency], org)

data/lib/metanorma/iso/log.rb

@@ -0,0 +1,148 @@
+module Metanorma
+  module Iso
+    class Converter
+      ISO_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "ISO_1": { category: "Style",
+                   error: "Style override set for ordered list",
+                   severity: 2 },
+        "ISO_2": { category: "Document Attributes",
+                   error: "invalid technical committee type %s",
+                   severity: 2 },
+        "ISO_3": { category: "Document Attributes",
+                   error: "invalid subcommittee type %s",
+                   severity: 2 },
+        "ISO_4": { category: "Style",
+                   error: "term definition starts with article: %s",
+                   severity: 2 },
+        "ISO_5": { category: "Document Attributes",
+                   error: "%s is not a recognised document type", severity: 2 },
+        "ISO_6": { category: "Document Attributes",
+                   error: "%s is not a recognised iteration", severity: 2 },
+        "ISO_7": { category: "Style",
+                   error: "%s is not permitted in a subfigure", severity: 2 },
+        "ISO_8": { category: "Style",
+                   error: "Reference does not have an associated footnote indicating unpublished status",
+                   severity: 2 },
+        "ISO_9": { category: "Document Attributes",
+                   error: "Illegal document stage: %s.%s", severity: 2 },
+        "ISO_10": { category: "Style", error: "No English Title Intro!",
+                    severity: 2 },
+        "ISO_11": { category: "Style", error: "No French Title Intro!",
+                    severity: 2 },
+        "ISO_12": { category: "Style", error: "No English Title!",
+                    severity: 2 },
+        "ISO_13": { category: "Style", error: "No French Title!", severity: 2 },
+        "ISO_14": { category: "Style", error: "No English Title Part!",
+                    severity: 2 },
+        "ISO_15": { category: "Style", error: "No French Title Part!",
+                    severity: 2 },
+        "ISO_16": { category: "Style",
+                    error: "Subpart defined on non-IEC document!",
+                    severity: 2 },
+        "ISO_17": { category: "Style",
+                    error: "Main Title may name document type",
+                    severity: 2 },
+        "ISO_18": { category: "Style",
+                    error: "Title Intro may name document type",
+                    severity: 2 },
+        "ISO_19": { category: "Style",
+                    error: "%s: each first-level subclause must have a title",
+                    severity: 2 },
+        "ISO_20": { category: "Style",
+                    error: "%s: all subclauses must have a title, or none",
+                    severity: 2 },
+        "ISO_21": { category: "Style", error: "%s %s has not been cross-referenced within document",
+                    severity: 1 },
+        "ISO_22": { category: "Style", error: "(formula) %s %s has not been cross-referenced within document",
+                    severity: 2 },
+        "ISO_23": { category: "Style", error: "foreword contains subclauses",
+                    severity: 2 },
+        "ISO_24": { category: "Style",
+                    error: "normative references contains subclauses",
+                    severity: 2 },
+        "ISO_25": { category: "Style",
+                    error: "Only one Symbols and Abbreviated Terms section in the standard",
+                    severity: 2 },
+        "ISO_26": { category: "Style",
+                    error: "Symbols and Abbreviated Terms can only contain a definition list",
+                    severity: 2 },
+        "ISO_27": { category: "Style",
+                    error: "In vocabulary documents, Symbols and Abbreviated Terms are only permitted in annexes",
+                    severity: 2 },
+        "ISO_28": { category: "Style", error: "(section sequencing) %s",
+                    severity: 2 },
+        "ISO_29": { category: "Style", error: "Scope clause missing",
+                    severity: 2 },
+        "ISO_30": { category: "Style", error: "Normative references missing",
+                    severity: 2 },
+        "ISO_31": { category: "Style", error: "Terms & definitions missing",
+                    severity: 2 },
+        "ISO_32": { category: "Style",
+                    error: "Document must contain at least one clause",
+                    severity: 2 },
+        "ISO_33": { category: "Style",
+                    error: "Document must contain clause after Terms and Definitions",
+                    severity: 2 },
+        "ISO_34": { category: "Style",
+                    error: "Scope must not occur after Terms and Definitions",
+                    severity: 2 },
+        "ISO_35": { category: "Style",
+                    error: "term definition ends with period: %s",
+                    severity: 2 },
+        "ISO_36": { category: "Style",
+                    error: "Only annexes and references can follow clauses",
+                    severity: 2 },
+        "ISO_37": { category: "Style",
+                    error: "Only annexes and references can follow terms and clauses",
+                    severity: 2 },
+        "ISO_38": { category: "Style",
+                    error: "Document must include (references) Normative References",
+                    severity: 2 },
+        "ISO_39": { category: "Style",
+                    error: "Scope contains subclauses: should be succinct",
+                    severity: 2 },
+        "ISO_40": { category: "Style",
+                    error: "Final section must be (references) Bibliography",
+                    severity: 2 },
+        "ISO_41": { category: "Style",
+                    error: "There are sections after the final Bibliography",
+                    severity: 2 },
+        "ISO_42": { category: "Style",
+                    error: "non-ISO/IEC reference is allowed as normative only subject to the conditions in ISO/IEC DIR 2 10.2: %s",
+                    severity: 2 },
+        "ISO_43": { category: "Style", error: "subclause is only child",
+                    severity: 2 },
+        "ISO_44": { category: "Style",
+                    error: "Single terms clause in vocabulary document should have normal Terms and definitions heading",
+                    severity: 2 },
+        "ISO_45": { category: "Style",
+                    error: "Multiple terms clauses in vocabulary document should have 'Terms related to' heading",
+                    severity: 2 },
+        "ISO_46": { category: "Style",
+                    error: "'see %s' is pointing to a normative section",
+                    severity: 2 },
+        "ISO_47": { category: "Bibliography",
+                    error: "'%s is not pointing to a real reference",
+                    severity: 2 },
+        "ISO_48": { category: "Style",
+                    error: "'see %s' is pointing to a normative reference",
+                    severity: 2 },
+        "ISO_49": { category: "Style",
+                    error: "undated reference %s should not contain specific elements",
+                    severity: 2 },
+        "ISO_50": { category: "Style",
+                    error: "only terms clauses can cross-reference terms clause (%s)",
+                    severity: 2 },
+        "ISO_51": { category: "Style",
+                    error: "non-terms clauses cannot cross-reference terms clause (%s)",
+                    severity: 2 },
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(ISO_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/iso/validate.rb

@@ -20,18 +20,16 @@ module Metanorma
       def isosubgroup_validate(root)
         root.xpath("#{COMMITTEE_XPATH}[@type = 'Technical committee']/@subtype").each do |t|
           %w{TC PC JTC JPC}.include?(t.text) or
-            @log.add("Document Attributes", nil,
-                     "invalid technical committee type #{t}")
+            @log.add("ISO_2", nil, params: [t.text])
         end
         root.xpath("#{COMMITTEE_XPATH}[@type = 'Subcommittee']/@subtype").each do |t|
           %w{SC JSC}.include?(t.text) or
-            @log.add("Document Attributes", nil,
-                     "invalid subcommittee type #{t}")
+            @log.add("ISO_3", nil, params: [t.text])
         end
       end
 
       def termdef_warn(text, regex, elem, term, msg)
-        regex.match(text) && @log.add("Style", elem, "#{term}: #{msg}")
+        regex.match(text) && @log.add(msg, elem, params: [term])
       end
 
       # ISO/IEC DIR 2, 16.5.6
@@ -39,11 +37,10 @@ module Metanorma
         xmldoc.xpath("//term").each do |t|
           para = t.at("./definition/verbal-definition") || return
           term = t.at("./preferred//name").text
-          @lang == "en" and termdef_warn(para.text, /\A(the|a)\b/i, t, term,
-                                         "term definition starts with article")
+          @lang == "en" and
+            termdef_warn(para.text, /\A(the|a)\b/i, t, term, "ISO_4")
           %(Cyrl Latn).include?(@script) and
-            termdef_warn(para.text, /\.\Z/i, t, term,
-                         "term definition ends with period")
+            termdef_warn(para.text, /\.\Z/i, t, term, "ISO_35")
         end
       end
 
@@ -53,15 +50,13 @@ module Metanorma
            guide amendment technical-corrigendum committee-document addendum
            recommendation)
           .include? @doctype or
-          @log.add("Document Attributes", nil,
-                   "#{@doctype} is not a recognised document type")
+          @log.add("ISO_5", nil, params: [@doctype])
       end
 
       def iteration_validate(xmldoc)
         iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
         /^\d+/.match(iteration) or
-          @log.add("Document Attributes", nil,
-                   "#{iteration} is not a recognised iteration")
+          @log.add("ISO_6", nil, params: [iteration])
       end
 
       def bibdata_validate(doc)
@@ -75,7 +70,7 @@ module Metanorma
         xmldoc.xpath("//figure//figure").each do |f|
           elems.each do |k, v|
             f.xpath(".//#{v}").each do |n|
-              @log.add("Style", n, "#{k} is not permitted in a subfigure")
+              @log.add("ISO_7", n, params: [k])
             end
           end
         end
@@ -106,9 +101,7 @@ module Metanorma
       def bibitem_validate(xmldoc)
         xmldoc.xpath("//bibitem[date/on = '–']").each do |b|
           b.at("./note[@type = 'Unpublished-Status']") or
-            @log.add("Style", b,
-                     "Reference does not have an " \
-                     "associated footnote indicating unpublished status")
+            @log.add("ISO_8", b)
         end
       end
 

data/lib/metanorma/iso/validate_section.rb

@@ -22,32 +22,26 @@ module Metanorma
       def foreword_validate(root)
         f = root.at("//foreword") || return
         s = f.at("./clause")
-        @log.add("Style", f, "foreword contains subclauses") unless s.nil?
+        @log.add("ISO_23", f) unless s.nil?
       end
 
       # ISO/IEC DIR 2, 15.4
       def normref_validate(root)
         f = root.at("//references[@normative = 'true']") || return
         f.at("./references | ./clause") &&
-          @log.add("Style", f, "normative references contains subclauses")
+          @log.add("ISO_24", f)
       end
 
-      ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated " \
-                            "Terms section in the standard".freeze
-      NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can " \
-                               "only contain a definition list".freeze
-
       def symbols_validate(root)
         f = root.xpath("//definitions")
         f.empty? && return
         (f.size == 1 || @vocab) or
-          @log.add("Style", f.first, ONE_SYMBOLS_WARNING)
+          @log.add("ISO_25", f.first)
         f.first.elements.reject { |e| %w(title dl).include? e.name }.empty? or
-          @log.add("Style", f.first, NON_DL_SYMBOLS_WARNING)
+          @log.add("ISO_26", f.first)
         @vocab and f.each do |f1|
           f1.at("./ancestor::annex") or
-            @log.add("Style", f1, "In vocabulary documents, Symbols and " \
-                                  "Abbreviated Terms are only permitted in annexes")
+            @log.add("ISO_27", f1)
         end
       end
 
@@ -57,18 +51,18 @@ module Metanorma
 
         test = accepted.map { |a| n.at(a) }
         if test.all?(&:nil?)
-          @log.add("Style", nil, msg)
+          @log.add("ISO_28", nil, params: [msg])
         end
         names
       end
 
       def sections_presence_validate(root)
         root.at("//sections/clause[@type = 'scope']") or
-          @log.add("Style", nil, "Scope clause missing")
+          @log.add("ISO_29", nil)
         root.at("//references[@normative = 'true']") or
-          @log.add("Style", nil, "Normative references missing")
+          @log.add("ISO_30", nil)
         root.at("//terms") or
-          @log.add("Style", nil, "Terms & definitions missing")
+          @log.add("ISO_31", nil)
       end
 
       # spec of permissible section sequence
@@ -116,24 +110,20 @@ module Metanorma
 
       def sections_sequence_validate_body(names, elem)
         if elem.nil? || elem.name != "clause"
-          @log.add("Style", elem, "Document must contain at least one clause")
+          @log.add("ISO_32", elem)
         end
         elem&.at("./self::clause") or
-          @log.add("Style", elem, "Document must contain clause after " \
-                                  "Terms and Definitions")
+          @log.add("ISO_33", elem)
         elem&.at("./self::clause[@type = 'scope']") and
-          @log.add("Style", elem,
-                   "Scope must not occur after Terms and Definitions")
+          @log.add("ISO_34", elem)
         elem = names.shift
         while elem&.name == "clause"
           elem&.at("./self::clause[@type = 'scope']") and
-            @log.add("Style", elem,
-                     "Scope must not occur after Terms and Definitions")
+            @log.add("ISO_34", elem)
           elem = names.shift
         end
         %w(annex references).include? elem&.name or
-          @log.add("Style", elem,
-                   "Only annexes and references can follow clauses")
+          @log.add("ISO_36", elem)
         [names, elem]
       end
 
@@ -142,8 +132,7 @@ module Metanorma
           elem = names.shift
         end
         %w(annex references).include? elem&.name or
-          @log.add("Style", elem,
-                   "Only annexes and references can follow terms and clauses")
+          @log.add("ISO_37", elem)
         [names, elem]
       end
 
@@ -151,36 +140,27 @@ module Metanorma
         while elem&.name == "annex"
           elem = names.shift
           if elem.nil?
-            @log.add("Style", nil, "Document must include (references) " \
-                                   "Normative References")
+            @log.add("ISO_38", nil)
           end
         end
         elem.nil? and return
         elem&.at("./self::references[@normative = 'true']") ||
-          @log.add("Style", nil, "Document must include (references) " \
-                                 "Normative References")
+          @log.add("ISO_38", nil)
         elem = names&.shift
         elem.nil? and return
         elem&.at("./self::references[@normative = 'false']") ||
-          @log.add("Style", elem,
-                   "Final section must be (references) Bibliography")
+          @log.add("ISO_40", elem)
         names.empty? ||
-          @log.add("Style", elem,
-                   "There are sections after the final Bibliography")
+          @log.add("ISO_41", elem)
       end
 
-      NORM_ISO_WARN = <<~WARN.freeze
-        non-ISO/IEC reference is allowed as normative only subject to the conditions in ISO/IEC DIR 2 10.2
-      WARN
-      SCOPE_WARN = "Scope contains subclauses: should be succinct".freeze
-
       def section_style(root)
         foreword_style(root.at("//foreword"))
         introduction_style(root.at("//introduction"))
         scope_style(root.at("//clause[@type = 'scope']"))
         scope = root.at("//clause[@type = 'scope']/clause")
         # ISO/IEC DIR 2, 14.4
-        scope.nil? || style_warning(scope, SCOPE_WARN, nil)
+        scope.nil? || @log.add("ISO_39", scope)
         tech_report_style(root)
       end
 
@@ -205,7 +185,7 @@ module Metanorma
       def norm_bibitem_style(root)
         root.xpath(NORM_BIBITEMS).each do |b|
           if b.at(ISO_PUBLISHER_XPATH).nil?
-            @log.add("Style", b, "#{NORM_ISO_WARN}: #{b.text}")
+            @log.add("ISO_42", b, params: [b.text])
           end
         end
       end
@@ -221,7 +201,7 @@ module Metanorma
       def onlychild_clause_validate(root)
         root.xpath(Standoc::Utils::SUBCLAUSE_XPATH).each do |c|
           c.xpath("../clause").size == 1 or next
-          @log.add("Style", c, "subclause is only child")
+          @log.add("ISO_43", c)
         end
       end
 
@@ -230,15 +210,11 @@ module Metanorma
         terms = root.xpath("//sections/terms | //sections/clause[.//terms]")
         if terms.size == 1
           ((t = terms.first.at("./title")) && (t&.text == @i18n.termsdef)) or
-            @log.add("Style", terms.first,
-                     "Single terms clause in vocabulary document " \
-                     "should have normal Terms and definitions heading")
+            @log.add("ISO_44", terms.first)
         elsif terms.size > 1
           terms.each do |x|
             ((t = x.at("./title")) && /^#{@i18n.termsrelated}/.match?(t&.text)) or
-              @log.add("Style", x,
-                       "Multiple terms clauses in vocabulary document " \
-                       "should have 'Terms related to' heading")
+              @log.add("ISO_45", x)
           end
         end
       end

data/lib/metanorma/iso/validate_style.rb

@@ -142,7 +142,7 @@ module Metanorma
         @novalid and return
         w = msg
         w += ": #{text}" if text
-        @log.add("Style", node, w, display:)
+        @log.add("STANDOC_48", node, params: [w], display:)
       end
 
       ASSETS_TO_STYLE =

data/lib/metanorma/iso/validate_title.rb

@@ -11,10 +11,10 @@ module Metanorma
         title_intro_en = title_lang_part(root, "intro", "en")
         title_intro_fr = title_lang_part(root, "intro", "fr")
         if title_intro_en.nil? && !title_intro_fr.nil?
-          @log.add("Style", title_intro_fr, "No English Title Intro!")
+          @log.add("ISO_10", title_intro_fr)
         end
         if !title_intro_en.nil? && title_intro_fr.nil?
-          @log.add("Style", title_intro_en, "No French Title Intro!")
+          @log.add("ISO_11", title_intro_en)
         end
       end
 
@@ -22,20 +22,20 @@ module Metanorma
         title_main_en = title_lang_part(root, "main", "en")
         title_main_fr = title_lang_part(root, "main", "fr")
         if title_main_en.nil? && !title_main_fr.nil?
-          @log.add("Style", title_main_fr, "No English Title!")
+          @log.add("ISO_12", title_main_fr)
         end
         if !title_main_en.nil? && title_main_fr.nil?
-          @log.add("Style", title_main_en, "No French Title!")
+          @log.add("ISO_13", title_main_en)
         end
       end
 
       def title_part_validate(root)
         title_part_en = title_lang_part(root, "part", "en")
         title_part_fr = title_lang_part(root, "part", "fr")
-        (title_part_en.nil? && !title_part_fr.nil?) &&
-          @log.add("Style", title_part_fr, "No English Title Part!")
-        (!title_part_en.nil? && title_part_fr.nil?) &&
-          @log.add("Style", title_part_en, "No French Title Part!")
+        title_part_en.nil? && !title_part_fr.nil? &&
+          @log.add("ISO_14", title_part_fr)
+        !title_part_en.nil? && title_part_fr.nil? &&
+          @log.add("ISO_15", title_part_en)
       end
 
       # ISO/IEC DIR 2, 11.4
@@ -46,7 +46,7 @@ module Metanorma
                       "organization[abbreviation = 'IEC' or " \
                       "name = 'International Electrotechnical Commission']")
         subpart && !iec and
-          @log.add("Style", docid, "Subpart defined on non-IEC document!")
+          @log.add("ISO_16", docid)
       end
 
       # ISO/IEC DIR 2, 11.5.2
@@ -56,11 +56,10 @@ module Metanorma
         Publicly\sAvailable\sSpecification | Technical\sReport | Guide /xi
         title_main_en = title_lang_part(root, "main", "en")
         !title_main_en.nil? && doctypes.match(title_main_en.text) and
-          @log.add("Style", title_main_en, "Main Title may name document type")
+          @log.add("ISO_17", title_main_en)
         title_intro_en = title_lang_part(root, "intro", "en")
         !title_intro_en.nil? && doctypes.match(title_intro_en.text) and
-          @log.add("Style", title_intro_en,
-                   "Title Intro may name document type")
+          @log.add("ISO_18", title_intro_en)
       end
 
       # ISO/IEC DIR 2, 22.2
@@ -70,8 +69,7 @@ module Metanorma
           s.xpath("./clause | ./terms | ./references").each do |ss|
             subtitle = ss.at("./title")
             (!subtitle.nil? && !subtitle&.text&.empty?) or
-              @log.add("Style", ss,
-                       "#{title}: each first-level subclause must have a title")
+              @log.add("ISO_19", ss, params: [title])
           end
         end
       end
@@ -88,8 +86,7 @@ module Metanorma
           withtitle = withtitle || (subtitle && !subtitle.text.empty?)
         end
         notitle && withtitle &&
-          @log.add("Style", nil,
-                   "#{label}: all subclauses must have a title, or none")
+          @log.add("ISO_20", nil, params: [label])
       end
 
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-full

data/lib/metanorma/iso/validate_xref.rb

@@ -11,8 +11,7 @@ module Metanorma
           !preceding.nil? &&
             /\b(see| refer to)\p{Zs}*\Z/mi.match(preceding) or next
           anchors[t["target"]] and
-            @log.add("Style", t,
-                     "'see #{t['target']}' is pointing to a normative section")
+            @log.add("ISO_46", t, params: [t["target"]])
         end
       end
 
@@ -37,13 +36,11 @@ module Metanorma
           !prec.nil? && /\b(see|refer to)\p{Zs}*\Z/mi.match(prec) or next
           unless target = bibitemids[t["bibitemid"]]
             # unless target = root.at("//bibitem[@anchor = '#{t['bibitemid']}']")
-            @log.add("Bibliography", t,
-                     "'#{t} is not pointing to a real reference")
+            @log.add("ISO_47", t, params: [t])
             next
           end
           target[:norm] and
-            @log.add("Style", t,
-                     "'see #{t}' is pointing to a normative reference")
+            @log.add("ISO_48", t, params: [t])
         end
       end
 
@@ -64,9 +61,7 @@ module Metanorma
         root.xpath("//eref[descendant::locality]").each do |t|
           if /^(ISO|IEC)/.match?(t["citeas"]) &&
               !/: ?(\d+{4}|–)$/.match?(t["citeas"])
-            @log.add("Style", t,
-                     "undated reference #{t['citeas']} should not contain " \
-                     "specific elements")
+            @log.add("ISO_49", t, params: [t["citeas"]])
           end
         end
       end
@@ -88,13 +83,9 @@ module Metanorma
       def term_xrefs_validate1(xref, termids)
         closest_id = xref.xpath("./ancestor::*[@id]")&.last or return
         termids[xref["target"]] && !termids[closest_id["id"]] and
-          @log.add("Style", xref,
-                   "only terms clauses can cross-reference terms clause " \
-                   "(#{xref['target']})")
+          @log.add("ISO_50", xref, params: [xref["target"]])
         !termids[xref["target"]] && termids[closest_id["id"]] and
-          @log.add("Style", xref,
-                   "non-terms clauses cannot cross-reference terms clause " \
-                   "(#{xref['target']})")
+          @log.add("ISO_51", xref, params: [xref["target"]])
       end
 
       # require that all assets of a particular type be cross-referenced
@@ -112,9 +103,8 @@ module Metanorma
         (xmldoc.xpath(xpath) - xmldoc.xpath(exc)).each do |x|
           x["unnumbered"] == "true" and next
           @doc_xrefs[x["anchor"]] or
-            @log.add("Style", x, "#{name} #{x['anchor']} has not been " \
-                                 "cross-referenced within document",
-                     severity: xpath == "//formula" ? 2 : 1)
+            @log.add(xpath == "//formula" ? "ISO_22" : "ISO_21",
+                     x, params: [name, x["anchor"]])
         end
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.1.7".freeze
+    VERSION = "3.2.0".freeze
   end
 end