metanorma-standoc 3.1.10 → 3.2.1

data/lib/metanorma/standoc/log.rb

@@ -0,0 +1,207 @@
+module Metanorma
+  module Standoc
+    class Converter
+      # rubocop:disable Naming/VariableNumber
+      STANDOC_LOG_MESSAGES = {
+        "STANDOC_1": { category: "Include",
+                       error: "Specified boilerplate file does not exist: %s",
+                       severity: 0 },
+        "STANDOC_2": { category: "Table", error: "Empty table",
+                       severity: 0 },
+        "STANDOC_3": { category: "Crossreferences",
+                       error: "invalid index \"%s\" cross-reference: " \
+                       "wrong number of attributes in `index:%s[%s]`",
+                       severity: 0 },
+        "STANDOC_4": { category: "Table",
+                       error: "Table rows in table %s: check rowspan",
+                       severity: 0 },
+        "STANDOC_5": { category: "Table",
+                       error: "Table exceeds maximum number of columns defined (%s)",
+                       severity: 0 },
+        "STANDOC_6": { category: "Maths",
+                       error: "Malformed MathML: %s\n%s",
+                       severity: 0 },
+        "STANDOC_7": { category: "Metanorma XML Syntax", error: "%s",
+                       severity: 2 },
+        "STANDOC_8": { category: "Anchors", error: "Malformed URI: %s",
+                       severity: 0 },
+        "STANDOC_9": { category: "Bibliography",
+                       error: "Attachment %s does not exist",
+                       severity: 0 },
+        "STANDOC_10": { category: "Anchors",
+                        error: "The following reference is missing an anchor:\n%s",
+                        severity: 1 },
+        "STANDOC_11": { category: "Bibliography",
+                        error: "Reference %s is missing a title",
+                        severity: 1 },
+        "STANDOC_12": { category: "Bibliography",
+                        error: "Reference %s is missing a document identifier (docid)",
+                        severity: 1 },
+        "STANDOC_13": { category: "AsciiDoc Input",
+                        error: "term reference not in expected format:%s",
+                        severity: 1 },
+        "STANDOC_14": { category: "Style",
+                        error: "Style override set for ordered list",
+                        severity: 2 },
+        "STANDOC_15": { category: "Crossreferences",
+                        error: "Could not resolve footnoteblock:[%s]",
+                        severity: 1 },
+        "STANDOC_16": { category: "AsciiDoc Input",
+                        error: "Section not marked up as [bibliography]!",
+                        severity: 2 },
+        "STANDOC_17": { category: "Bibliography",
+                        error: "ERROR: No document identifier retrieved for %s",
+                        severity: 2 },
+        "STANDOC_18": { category: "Bibliography",
+                        error: "ERROR: No title retrieved for %s", severity: 2 },
+        "STANDOC_19": { category: "Bibliography",
+                        error: "Cannot find reference %s for local Relaton " \
+                                "data source %s", severity: 0 },
+        "STANDOC_20": { category: "AsciiDoc Input",
+                        error: "Metadata definition list does not follow a term designation",
+                        severity: 2 },
+        "STANDOC_21": { category: "Terms",
+                        error: "Removed duplicate designation %s",
+                        severity: 2 },
+        "STANDOC_22": { category: "Bibliography",
+                        error: "Term \"%s\" does not match IEV %s \"%s\"",
+                        severity: 1 },
+        "STANDOC_23": { category: "Anchors",
+                        error: "Concept cross-reference error: %s",
+                        severity: 0 },
+        "STANDOC_24": { category: "Terms",
+                        error: "Term %s occurs twice as preferred designation: %s",
+                        severity: 1 },
+        "STANDOC_25": { category: "Terms", severity: 0,
+                        error: <<~ERROR.freeze },
+                          Clause not recognised as a term clause, but contains designation markup
+                           (<code>preferred:[], admitted:[], alt:[], deprecated:[]</code>):<br/>
+                          %s</br>
+                          Ensure the parent clause is recognised as a terms clause by inserting <code>[heading=terms and definitions]</code> above the title,
+                          in case the heading is not automatically recognised. See also <a href="https://www.metanorma.org/author/topics/sections/concepts/#clause-title">Metanorma documentation</a>.
+                        ERROR
+        "STANDOC_26": { category: "AsciiDoc Input",
+                        error: "Error: Symbol reference in `symbol[%s]` missing: \"%s\" is not defined in document",
+                        severity: 1 },
+        "STANDOC_27": { category: "AsciiDoc Input",
+                        error: "Error: Term reference to `%s` missing: \"%s\" is not defined in document%s",
+                        severity: 1 },
+        "STANDOC_28": { category: "Crossreferences",
+                        error: "term source %s not referenced",
+                        severity: 1 },
+        "STANDOC_29": { category: "AsciiDoc Input",
+                        error: "converter missing for %s node in Metanorma backend",
+                        severity: 1 },
+        "STANDOC_30": { category: "Crossreferences",
+                        error: "%s does not have a corresponding anchor ID in the bibliography!",
+                        severity: 2 },
+        "STANDOC_31": { category: "Crossreferences",
+                        error: "Illegal cross-reference connective: %s",
+                        severity: 0 },
+        "STANDOC_32": { category: "Crossreferences",
+                        error: "%s does not have a corresponding anchor ID in the bibliography!",
+                        severity: 2 },
+        "STANDOC_33": { category: "Maths",
+                        error: "Invalid MathML: %s\n %s%s",
+                        severity: 0 },
+        "STANDOC_34": { category: "Style",
+                        error: "There is an instance of %s nested within %s",
+                        severity: 2 },
+        "STANDOC_35": { category: "Style",
+                        error: "There is a crossreference to an instance of %s nested within %s: %s",
+                        severity: 2 },
+        "STANDOC_36": { category: "Anchors",
+                        error: "ID %s has already been used at line %s",
+                        severity: 0 },
+        "STANDOC_37": { category: "Bibliography",
+                        error: "Cannot process format %s for local Relaton data source %s",
+                        severity: 0 },
+        "STANDOC_38": { category: "Anchors",
+                        error: "Crossreference target %s is undefined",
+                        severity: 1 },
+        "STANDOC_39": { category: "Blocks",
+                        error: "%s is empty",
+                        severity: 1 },
+        "STANDOC_40": { category: "Bibliography",
+                        error: "Could not retrieve %s: no access to online site",
+                        severity: 1 },
+        "STANDOC_41": { category: "Include",
+                        error: "Unresolved directive %s",
+                        severity: 0 },
+        "STANDOC_42": { category: "Metanorma XML Syntax",
+                        error: "Invalid passthrough content: %s\n" \
+                      "This is not valid Metanorma XML. If you intended a different format, such as HTML, you need to specify `format=` on the pass markup;\n" \
+                      "refer to https://www.metanorma.org/author/topics/blocks/passthroughs/",
+                        severity: 0 },
+        "STANDOC_43": { category: "AsciiDoc Input",
+                        error: <<~REF.freeze, severity: 1 },
+                          no anchor on reference, markup may be malformed: see
+                          https://www.metanorma.org/author/topics/sections/bibliography/ ,
+                          https://www.metanorma.org/author/iso/topics/markup/#bibliographies : %s
+                        REF
+        "STANDOC_44": { category: "Images", error: "Image not found: %s",
+                        severity: 0 },
+        "STANDOC_45": { category: "Images",
+                        error: "Corrupt PNG image detected: %s",
+                        severity: 2 },
+        "STANDOC_46": { category: "Images",
+                        error: "Image too large for Data URI encoding: disable Data URI encoding (`:data-uri-image: false`), or set `:data-uri-maxsize: 0`",
+                        severity: 0 },
+        "STANDOC_47": { category: "Crossreferences",
+                        error: "mismatch of callouts (%s) and annotations (%s)",
+                        severity: 0 },
+        "STANDOC_48": { category: "Style", error: "(generic warning) %s",
+                        severity: 2 },
+        "STANDOC_49": { category: "Bibliography",
+                        error: "Numeric reference in normative references",
+                        severity: 1 },
+        "STANDOC_50": { category: "Fatal Error", error: "%s", severity: 0 },
+        "STANDOC_51": { category: "Maths",
+                        error: "latexmlmath failed to process equation:\n%s",
+                        severity: 1 },
+        "STANDOC_52": { category: "Bibliography",
+                        error: "Bibliographic spans: %s",
+                        severity: 0 },
+        "STANDOC_53": { category: "Bibliography",
+                        error: "Bibliographic spans: %s",
+                        severity: 1 },
+        "STANDOC_54": { category: "Bibliography",
+                        error: "Cannot process file %s for local Relaton data source %s",
+                        severity: 0 },
+        "STANDOC_55": { category: "Images",
+                        error: "Corrupt SVG image detected, error found: %s %s%s%s",
+                        severity: 2 },
+        "STANDOC_56": { category: "Images",
+                        error: "Corrupt SVG image detected, could not be fixed: %s %s%s%s",
+                        severity: 1 },
+        "STANDOC_57": { category: "Images",
+                        error: "SVG image warning: %s %s%s%s",
+                        severity: 3 },
+        "STANDOC_58": { category: "Images",
+                        error: "Corrupt SVG image detected, fix attempted: %s %s: %s %s, Node: %s",
+                        severity: 2 },
+        "RELATON_1": { category: "Relaton",
+                       error: "(Error from Relaton) %s",
+                       severity: 0 },
+        "RELATON_2": { category: "Relaton",
+                       error: "(Error from Relaton) %s",
+                       severity: 1 },
+        "RELATON_3": { category: "Relaton",
+                       error: "(Error from Relaton) %s",
+                       severity: 2 },
+        "RELATON_4": { category: "Relaton",
+                       error: "(Error from Relaton) %s",
+                       severity: 3 },
+        "RELATON_5": { category: "Relaton",
+                       error: "(Error from Relaton IEV) %s",
+                       severity: 0 },
+
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        STANDOC_LOG_MESSAGES
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/macros_embed.rb

@@ -15,8 +15,9 @@ module Asciidoctor
         n = peek_line(true)
         /^Unresolved directive in/.match?(n) and
           @document.converter.log
-            &.add("Include", nil,
-                  HTMLEntities.new.encode(n, :basic), severity: 0)
+            &.add("STANDOC_41", nil, params: [HTMLEntities.new.encode(
+              n.sub(/^Unresolved directive /, ""), :basic
+            )])
       end
       [inc_path, target_type, relpath]
     end
@@ -86,7 +87,8 @@ module Metanorma
           if l.is_a?(Hash)
             acc, m = update_embeds(acc, m, emb)
             flatten_embeds(l).each { |x| m << x }
-          else acc << l end
+          else acc << l
+          end
         end
         acc, ret = update_embeds(acc, ret, emb)
         ret

data/lib/metanorma/standoc/macros_link.rb

@@ -13,9 +13,8 @@ module Metanorma
 
       def validate(parent, target, attrs)
         attrs.size > 1 && attrs.size < 5 and return true
-        e = "invalid index \"#{target}\" cross-reference: wrong number of " \
-            "attributes in `index:#{target}[#{attrs.values.join(',')}]`"
-        parent.converter.log.add("Crossreferences", parent, e, severity: 0)
+        parent.converter.log.add("STANDOC_3", parent,
+                                 params: [target, target, attrs.values.join(",")])
         false
       end
 

data/lib/metanorma/standoc/macros_terms.rb

@@ -71,6 +71,7 @@ module Metanorma
       named :term
       name_positional_attributes "name", "termxref"
       using_format :short
+      match /\\?(?<!\w)term:(){0}\[(|[^\]\\]*(?:\\.[^\]\\]*)*)\]/
 
       def process(_parent, _target, attrs)
         termref = attrs["termxref"] || attrs["name"]
@@ -84,6 +85,7 @@ module Metanorma
       named :symbol
       name_positional_attributes "name", "termxref"
       using_format :short
+      match /\\?(?<!\w)symbol:(){0}\[(|[^\]\\]*(?:\\.[^\]\\]*)*)\]/
 
       def process(_parent, _target, attrs)
         termref = attrs["termxref"] || attrs["name"]

data/lib/metanorma/standoc/ref.rb

@@ -60,9 +60,8 @@ module Metanorma
 
       def ref_fn(match, xml)
         if match.names.include?("fn") && match[:fn]
-          xml.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
-            p << match[:fn].to_s
-          end
+          add_noko_elem(xml, "note", match[:fn].to_s,
+                        **plaintxt.merge(type: "Unpublished-Status"))
         end
       end
 
@@ -115,17 +114,19 @@ module Metanorma
         i = code[:id] and
           docid(bib, /^\d+$/.match?(i) ? "[#{i}]" : i, code[:type])
         code[:type] == "repo" and
-          bib.docidentifier code[:key], type: "repository"
+          add_noko_elem(bib, "docidentifier", code[:key], type: "repository")
       end
 
       def refitem_uri(code, bib)
         if code[:type] == "path"
-          bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), type: "URI"
-          bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), type: "citation"
+          add_noko_elem(bib, "uri", code[:key].sub(/\.[a-zA-Z0-9]+$/, ""),
+                        type: "URI")
+          add_noko_elem(bib, "uri", code[:key].sub(/\.[a-zA-Z0-9]+$/, ""),
+                        type: "citation")
         end
         if code[:type] == "attachment"
-          bib.uri code[:key], type: "attachment"
-          bib.uri code[:key], type: "citation"
+          add_noko_elem(bib, "uri", code[:key], type: "attachment")
+          add_noko_elem(bib, "uri", code[:key], type: "citation")
         end
       end
 
@@ -149,17 +150,15 @@ module Metanorma
 
       def refitem_render_formattedref(bibitem, title)
         (title.nil? || title.empty?) and title = @i18n.no_information_available
-        bibitem.formattedref format: "application/x-isodoc+xml" do |i|
-          i << ref_normalise_no_format(title)
-        end
+        add_noko_elem(bibitem, "formattedref", ref_normalise_no_format(title),
+                      format: "application/x-isodoc+xml")
       end
 
       # TODO: alternative where only title is available
       def refitemcode(item, node)
         m = NON_ISO_REF.match(item) and return refitem1code(item, m).compact
         m = NON_ISO_REF1.match(item) and return refitem1code(item, m).compact
-        @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}",
-                 severity: 1)
+        @log.add("STANDOC_43", node, params: [item])
         {}
       end
 

data/lib/metanorma/standoc/ref_queue.rb

@@ -42,10 +42,9 @@ module Metanorma
           ref, i, doc = results.pop
           m[i.to_i] = { ref: }
           if doc.is_a?(RelatonBib::RequestError)
-            @log.add("Bibliography", nil,
-                     "Could not retrieve #{ref[:code]}: " \
-                     "no access to online site", severity: 1)
-          else m[i.to_i][:doc] = doc end
+            @log.add("STANDOC_40", nil, params: [ref[:code]])
+          else m[i.to_i][:doc] = doc
+          end
         end
       end
 
@@ -136,8 +135,7 @@ module Metanorma
         xml.parent.add_child(smart_render_xml(hit, code, opts))
         xml
       rescue RelatonBib::RequestError
-        @log.add("Bibliography", nil, "Could not retrieve #{code}: " \
-                                      "no access to online site", severity: 1)
+        @log.add("STANDOC_40", nil, params: [code])
         nil
       end
 

data/lib/metanorma/standoc/ref_sect.rb

@@ -47,8 +47,7 @@ module Metanorma
           bibitem_parse(attrs, xml, node)
         else
           node.attr("style") == "bibliography" or
-            @log.add("AsciiDoc Input", node,
-                     "Section not marked up as [bibliography]!")
+            @log.add("STANDOC_16", node)
           nil
         end
       end
@@ -63,8 +62,7 @@ module Metanorma
       def emend_biblio_id(xml, code)
         unless xml.at("/bibitem/docidentifier[not(@type = 'DOI')][text()]") ||
             /^doi:/.match?(code)
-          @log.add("Bibliography", nil,
-                   "ERROR: No document identifier retrieved for #{code}")
+          @log.add("STANDOC_17", nil, params: [code])
           xml.root << "<docidentifier>#{code}</docidentifier>"
         end
       end
@@ -74,8 +72,7 @@ module Metanorma
       def emend_biblio_title(xml, code, title)
         fmt = /<span class=|<fn/.match?(title)
         unless xml.at("/bibitem/title[text()]")
-          @log.add("Bibliography", nil,
-                   "ERROR: No title retrieved for #{code}")
+          @log.add("STANDOC_18", nil, params: [code])
           !fmt and
             xml.root << "<title>#{title || '(MISSING TITLE)'}</title>"
         end

data/lib/metanorma/standoc/ref_utility.rb

@@ -49,16 +49,12 @@ module Metanorma
                       else @bibdb&.docid_type(code) || [nil, code]
                       end
         code1.sub!(/^nofetch\((.+)\)$/, "\\1")
-        bib.docidentifier **attr_code(type:) do |d|
-          d << code1
-        end
+        add_noko_elem(bib, "docidentifier", code1, type: type)
       end
 
       def docnumber(bib, code)
         code or return
-        bib.docnumber do |d|
-          d << @c.decode(code).sub(/^[^\d]*/, "")
-        end
+        add_noko_elem(bib, "docnumber", @c.decode(code).sub(/^[^\d]*/, ""))
       end
 
       def mn_code(code)
@@ -80,7 +76,8 @@ module Metanorma
                  if type == :attachment then "(#{ret[type]})"
                  else ret[type].sub(%r{^[^/]+/}, "")
                  end
-               else ret[:id] end
+               else ret[:id]
+               end
           ret.merge!(id: id, type: type.to_s, key: ret[type], nofetch: true)
         end
         ret
@@ -201,12 +198,6 @@ module Metanorma
           suppress_identifier: code[:dropid] || nil }
       end
 
-      MALFORMED_REF = <<~REF.freeze
-        no anchor on reference, markup may be malformed: see
-        https://www.metanorma.org/author/topics/sections/bibliography/ ,
-        https://www.metanorma.org/author/iso/topics/markup/#bibliographies
-      REF
-
       def ref_normalise(ref)
         ref.gsub("&amp;amp;", "&amp;").gsub(%r{^<em>(.*)</em>}, "\\1")
       end

data/lib/metanorma/standoc/section.rb

@@ -87,9 +87,7 @@ module Metanorma
 
       def section_title(xml, title)
         title.nil? and return
-        xml.title **attr_code(id_attr(nil)) do |t|
-          t << title
-        end
+        add_noko_elem(xml, "title", title, id_attr(nil))
       end
 
       def preamble(node)
@@ -102,9 +100,7 @@ module Metanorma
       end
 
       def metanorma_extension_parse(_attrs, xml, node)
-        xml.send :"metanorma-extension-clause" do |xml_section|
-          xml_section << node.content
-        end
+        add_noko_elem(xml, "metanorma-extension-clause", node.content)
       end
 
       def indexsect_parse(attrs, xml, node)
@@ -115,9 +111,7 @@ module Metanorma
       end
 
       def abstract_parse(attrs, xml, node)
-        xml.abstract **attr_code(attrs) do |xml_section|
-          xml_section << node.content
-        end
+        add_noko_elem(xml, "abstract", node.content, **attr_code(attrs))
       end
 
       def scope_parse(attrs, xml, node)

data/lib/metanorma/standoc/spans_to_bibitem.rb

@@ -36,7 +36,9 @@ module Metanorma
         def convert
           ret = spans_to_bibitem(@spans)
           @out = Nokogiri::XML("<bibitem>#{ret}</bibitem>").root
-          @spans[:type] and @out["type"] = @spans[:type]
+          %i(type language script locale).each do |k|
+            @spans[k] and @out[k.to_s] = @spans[k]
+          end
           self
         end
 
@@ -46,6 +48,7 @@ module Metanorma
           ret += spans_to_bibitem_docid(spans)
           ret += spans_to_contribs(spans)
           ret += spans_to_bibitem_edn(spans)
+          ret += spans_to_bibitem_i18n(spans)
           spans[:abstract] and ret += "<abstract>#{spans[:abstract]}</abstract>"
           ret += spans_to_series(spans)
           spans[:pubplace] and ret += "<place>#{spans[:pubplace]}</place>"
@@ -63,6 +66,14 @@ module Metanorma
           ret
         end
 
+        def spans_to_bibitem_i18n(spans)
+          ret = ""
+          spans[:language] and ret += "<language>#{spans[:language]}</language>"
+          spans[:script] and ret += "<script>#{spans[:script]}</script>"
+          spans[:locale] and ret += "<locale>#{spans[:locale]}</locale>"
+          ret
+        end
+
         def spans_to_series(spans)
           spans[:series] or return ""
           "<series><title>#{spans[:series]}</title></series>"

data/lib/metanorma/standoc/spans_to_bibitem_preprocessing.rb

@@ -37,7 +37,7 @@ module Metanorma
         def spans_preprocess(spans)
           ret = empty_span_hash
           spans.each { |s| span_preprocess1(s, ret) }
-          host_rearrange(ret)
+          spans_defaults(host_rearrange(ret))
         end
 
         def span_preprocess1(span, ret)
@@ -52,7 +52,7 @@ module Metanorma
             ret[:extent][span[:key].to_sym] ||= []
             ret[:extent][span[:key].to_sym] << span[:val]
           when "pubplace", "title", "type", "series", "edition", "version",
-            "abstract"
+            "abstract", "language", "script", "locale"
             ret[span[:key].to_sym] = span[:val]
           when "image"
             ret[span[:key].to_sym] << { type: span[:type], val: span[:val] }
@@ -92,17 +92,21 @@ module Metanorma
           end
         end
 
+        def spans_defaults(spans)
+          spans[:language] && !spans[:script] and
+            spans[:script] = ::Metanorma::Utils.default_script(spans[:language])
+          spans
+        end
+
         def host_rearrange(ret)
           ret[:in][:title] or return ret
-          ret[:in].merge!(empty_span_hash, { type: "misc" }) do |_, old, _|
-            old
-          end
+          ret[:in].merge!(empty_span_hash, { type: "misc" }) { |_, o, _| o }
           %i(series).each do |k|
             ret[:in][k] = ret[k]
             ret.delete(k)
           end
-          /^in/.match?(ret[:type]) and ret[:in][:type] =
-                                         ret[:type].sub(/^in/, "")
+          /^in/.match?(ret[:type]) and
+            ret[:in][:type] = ret[:type].sub(/^in/, "")
           ret
         end
 

data/lib/metanorma/standoc/table.rb

@@ -57,7 +57,7 @@ module Metanorma
         cell_tag = "td"
         cell_tag = "th" if tblsec == :head || node.style == :header
         xml_tr.send cell_tag, **attr_code(cell_attributes) do |thd|
-          thd << table_cell1(node)
+          thd << table_cell1(node) # preserve empty cells
         end
       end
 

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -110,33 +110,22 @@ module Metanorma
 
       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), severity: 1)
+          log.add("STANDOC_26", node, params: [target, target])
           remove_missing_ref_term(node, target, "symbol")
         else
-          log.add("AsciiDoc Input", node,
-                  remove_missing_ref_msg(node, target, :term), severity: 1)
+          log.add("STANDOC_27", node,
+                  params: [target, target, remove_missing_ref_msg1(node, target)])
           remove_missing_ref_term(node, target, "term")
         end
       end
 
-      def remove_missing_ref_msg(node, target, type)
-        type == :symbol and return <<~LOG
-          Error: Symbol reference in `symbol[#{target}]` missing: "#{target}" is not defined in document
-        LOG
-        ret = <<~LOG
-          Error: Term reference to `#{target}` missing: "#{target}" is not defined in document
-        LOG
-        remove_missing_ref_msg1(node, target, ret)
-      end
-
-      def remove_missing_ref_msg1(_node, target, ret)
+      def remove_missing_ref_msg1(_node, target)
         target2 = "_#{target.downcase.tr('-', '_')}"
         if @terms_tags[target] || @terms_tags[target2]
-          ret.strip!
-          ret += ". Did you mean to point to a subterm?"
+          ". Did you mean to point to a subterm?"
+        else
+          ""
         end
-        ret
       end
 
       def remove_missing_ref_term(node, target, type)

data/lib/metanorma/standoc/terms.rb

@@ -109,7 +109,7 @@ module Metanorma
       def term_designation(xml, _node, tag, text)
         xml.send tag do |p|
           p.expression do |e|
-            e.name { |name| name << text }
+            add_noko_elem(e, "name", text)
           end
         end
       end
@@ -142,9 +142,7 @@ module Metanorma
 
       def extract_termsource_refs(text, node)
         matched = TERM_REFERENCE_RE.match text
-        matched.nil? and @log.add("AsciiDoc Input", node,
-                                  "term reference not in expected format:" \
-                                  "#{text}", severity: 1)
+        matched.nil? and @log.add("STANDOC_13", node, params: [text])
         matched
       end
 

data/lib/metanorma/standoc/utils.rb

@@ -5,6 +5,22 @@ require "json"
 require "pathname"
 require "uuidtools"
 
+module Nokogiri
+  module XML
+    class Builder
+      class NodeBuilder
+        def add_noko_elem(name, val, attrs = {})
+          val and !val.empty? or return
+          # require "debug"; binding.b
+          send name, **Metanorma::Utils::attr_code(attrs) do |n|
+            n << val
+          end
+        end
+      end
+    end
+  end
+end
+
 module Metanorma
   module Standoc
     module Utils
@@ -44,9 +60,10 @@ module Metanorma
       end
 
       def csv_split(text, delim = ";", encode: true)
+        text ||= ""
         ret = Metanorma::Utils::csv_split(@c.decode(text), delim)
         encode and
-          ret.map! { |x| @c.encode(x, :basic, :hexadecimal) }
+          ret.map! { |x| @c.encode(x.strip, :basic, :hexadecimal) }
         ret
       end
 
@@ -155,7 +172,8 @@ module Metanorma
 
           #{text}
         ADOC
-        c = isolated_asciidoctor_convert(doc, backend: flavour, header_footer: true)
+        c = isolated_asciidoctor_convert(doc, backend: flavour,
+                                              header_footer: true)
         ret = Nokogiri::XML(c).at("//xmlns:sections")
         separate_numbering_footnotes(ret)
       end
@@ -192,6 +210,13 @@ module Metanorma
         @refids.include? ref
       end
 
+      def add_noko_elem(node, name, val, attrs = {})
+        val and !val.empty? or return
+        node.send name, **attr_code(attrs) do |n|
+          n << val
+        end
+      end
+
       module_function :adoc2xml
 
       class EmptyAttr