metanorma-standoc 2.7.1 → 2.7.2

data/lib/metanorma/standoc/front_contributor.rb

@@ -1,42 +1,8 @@
-require "date"
+require_relative "./front_organisation"
 
 module Metanorma
   module Standoc
     module Front
-      def committee_component(compname, node, out)
-        i = 1
-        suffix = ""
-        while node.attr(compname + suffix)
-          out.send compname.gsub(/-/, "_"), node.attr(compname + suffix),
-                   **attr_code(number: node.attr("#{compname}-number#{suffix}"),
-                               type: node.attr("#{compname}-type#{suffix}"))
-          i += 1
-          suffix = "_#{i}"
-        end
-      end
-
-      def organization(org, orgname, node = nil, default_org = nil)
-        abbrevs = org_abbrev
-        n = abbrevs.invert[orgname] and orgname = n
-        org.name orgname
-        default_org and a = node&.attr("subdivision") and org.subdivision a
-        abbr = org_abbrev[orgname]
-        default_org && b = node&.attr("subdivision-abbr") and abbr = b
-        abbr and org.abbreviation abbr
-      end
-
-      def org_address(org, xml)
-        p = org[:address] and xml.address do |ad|
-          ad.formattedAddress do |f|
-            f << p.gsub(/ \+\n/, "<br/>")
-          end
-        end
-        p = org[:phone] and xml.phone p
-        p = org[:fax] and xml.phone p, type: "fax"
-        p = org[:email] and xml.email p
-        p = org[:uri] and xml.uri p
-      end
-
       def metadata_author(node, xml)
         org_contributor(node, xml,
                         { source: ["publisher", "pub"], role: "author",
@@ -108,55 +74,6 @@ module Metanorma
         end
       end
 
-      def person_organization(node, suffix, xml)
-        xml.name node.attr("affiliation#{suffix}")
-        abbr = node.attr("affiliation_abbrev#{suffix}") and
-          xml.abbreviation abbr
-        csv_split(node.attr("affiliation_subdiv#{suffix}"))&.each do |s|
-          xml.subdivision s
-        end
-        person_address(node, suffix, xml)
-        person_org_logo(node, suffix, xml)
-      end
-
-      def person_address(node, suffix, xml)
-        if node.attr("address#{suffix}")
-          xml.address do |ad|
-            ad.formattedAddress do |f|
-              f << node.attr("address#{suffix}").gsub(/ \+\n/, "<br/>")
-            end
-          end
-        elsif node.attr("country#{suffix}") || node.attr("city#{suffix}")
-          person_address_components(node, suffix, xml)
-        end
-      end
-
-      def person_address_components(node, suffix, xml)
-        xml.address do |ad|
-          %w(street city state country postcode).each do |k|
-            s = node.attr("#{k}#{suffix}") and ad.send k, s
-          end
-        end
-      end
-
-      def person_org_logo(node, suffix, xml)
-        p = node.attr("affiliation_logo#{suffix}") and org_logo(xml, p)
-      end
-
-      def org_logo(xml, logo)
-        logo and xml.logo do |l|
-          l.image src: logo
-        end
-      end
-
-      def default_publisher
-        nil
-      end
-
-      def org_abbrev
-        {}
-      end
-
       def metadata_publisher(node, xml)
         o = { source: ["publisher", "pub"], role: "publisher",
               default: default_publisher }
@@ -168,81 +85,6 @@ module Metanorma
         org_contributor(node, xml, o)
       end
 
-      def org_contributor(node, xml, opts)
-        org_attrs_parse(node, opts).each do |o|
-          xml.contributor do |c|
-            org_contributor_role(c, o)
-            c.organization do |a|
-              org_organization(node, a, o)
-            end
-          end
-        end
-      end
-
-      def org_contributor_role(xml, org)
-        xml.role type: org[:role] do |r|
-          org[:desc] and r.description do |d|
-            d << org[:desc]
-          end
-        end
-      end
-
-      def org_organization(node, xml, org)
-        organization(xml, org[:name], node, !node.attr("publisher"))
-        org_address(org, xml)
-        org_logo(xml, org[:logo])
-      end
-
-      def org_attrs_parse(node, opts)
-        source = opts[:source]&.detect { |s| node.attr(s) }
-        org_attrs_simple_parse(node, opts, source) ||
-          org_attrs_complex_parse(node, opts, source)
-      end
-
-      def org_attrs_simple_parse(node, opts, source)
-        !source and return org_attrs_simple_parse_no_source(node, opts)
-        orgs = csv_split(node.attr(source))
-        orgs.size > 1 and return orgs.map do |o|
-          { name: o, role: opts[:role], desc: opts[:desc] }
-        end
-        nil
-      end
-
-      def org_attrs_simple_parse_no_source(node, opts)
-        !opts[:default] && !opts[:name] and return []
-        [{ name: opts[:name] || opts[:default],
-           role: opts[:role], desc: opts[:desc] }
-          .compact.merge(extract_org_attrs_address(node, opts, ""))]
-      end
-
-      def org_attrs_complex_parse(node, opts, source)
-        i = 1
-        suffix = ""
-        ret = []
-        while node.attr(source + suffix)
-          ret << extract_org_attrs_complex(node, opts, source, suffix)
-          i += 1
-          suffix = "_#{i}"
-        end
-        ret
-      end
-
-      def extract_org_attrs_complex(node, opts, source, suffix)
-        { name: node.attr(source + suffix),
-          role: opts[:role], desc: opts[:desc],
-          logo: node.attr("#{source}_logo#{suffix}") }.compact
-          .merge(extract_org_attrs_address(node, opts, suffix))
-      end
-
-      def extract_org_attrs_address(node, opts, suffix)
-        %w(address phone fax email uri).each_with_object({}) do |a, m|
-          opts[:source]&.each do |s|
-            p = node.attr("#{s}-#{a}#{suffix}") and
-              m[a.to_sym] = p
-          end
-        end
-      end
-
       def copyright_parse(node)
         opt = { source: ["copyright-holder", "publisher", "pub"],
                 role: "publisher", default: default_publisher }

data/lib/metanorma/standoc/front_organisation.rb

@@ -0,0 +1,163 @@
+module Metanorma
+  module Standoc
+    module Front
+      def committee_component(compname, node, out)
+        i = 1
+        suffix = ""
+        while node.attr(compname + suffix)
+          out.send compname.gsub(/-/, "_"), node.attr(compname + suffix),
+                   **attr_code(number: node.attr("#{compname}-number#{suffix}"),
+                               type: node.attr("#{compname}-type#{suffix}"))
+          i += 1
+          suffix = "_#{i}"
+        end
+      end
+
+      def organization(org, orgname, node = nil, default_org = nil)
+        abbrevs = org_abbrev
+        n = abbrevs.invert[orgname] and orgname = n
+        org.name orgname
+        default_org and a = node&.attr("subdivision") and org.subdivision a
+        abbr = org_abbrev[orgname]
+        default_org && b = node&.attr("subdivision-abbr") and abbr = b
+        abbr and org.abbreviation abbr
+      end
+
+      def org_address(org, xml)
+        p = org[:address] and xml.address do |ad|
+          ad.formattedAddress do |f|
+            f << p.gsub(/ \+\n/, "<br/>")
+          end
+        end
+        p = org[:phone] and xml.phone p
+        p = org[:fax] and xml.phone p, type: "fax"
+        p = org[:email] and xml.email p
+        p = org[:uri] and xml.uri p
+      end
+
+      def person_organization(node, suffix, xml)
+        xml.name node.attr("affiliation#{suffix}")
+        abbr = node.attr("affiliation_abbrev#{suffix}") and
+          xml.abbreviation abbr
+        csv_split(node.attr("affiliation_subdiv#{suffix}"))&.each do |s|
+          xml.subdivision s
+        end
+        person_address(node, suffix, xml)
+        person_org_logo(node, suffix, xml)
+      end
+
+      def person_address(node, suffix, xml)
+        if node.attr("address#{suffix}")
+          xml.address do |ad|
+            ad.formattedAddress do |f|
+              f << node.attr("address#{suffix}").gsub(/ \+\n/, "<br/>")
+            end
+          end
+        elsif node.attr("country#{suffix}") || node.attr("city#{suffix}")
+          person_address_components(node, suffix, xml)
+        end
+      end
+
+      def person_address_components(node, suffix, xml)
+        xml.address do |ad|
+          %w(street city state country postcode).each do |k|
+            s = node.attr("#{k}#{suffix}") and ad.send k, s
+          end
+        end
+      end
+
+      def person_org_logo(node, suffix, xml)
+        p = node.attr("affiliation_logo#{suffix}") and org_logo(xml, p)
+      end
+
+      def org_logo(xml, logo)
+        logo and xml.logo do |l|
+          l.image src: logo
+        end
+      end
+
+      def default_publisher
+        nil
+      end
+
+      def org_abbrev
+        {}
+      end
+
+      def org_contributor(node, xml, opts)
+        org_attrs_parse(node, opts).each do |o|
+          xml.contributor do |c|
+            org_contributor_role(c, o)
+            c.organization do |a|
+              org_organization(node, a, o)
+            end
+          end
+        end
+      end
+
+      def org_contributor_role(xml, org)
+        xml.role type: org[:role] do |r|
+          org[:desc] and r.description do |d|
+            d << org[:desc]
+          end
+        end
+      end
+
+      def org_organization(node, xml, org)
+        organization(xml, org[:name], node, !node.attr("publisher"))
+        org_address(org, xml)
+        org_logo(xml, org[:logo])
+      end
+
+      def org_attrs_parse(node, opts)
+        source = opts[:source]&.detect { |s| node.attr(s) }
+        org_attrs_simple_parse(node, opts, source) ||
+          org_attrs_complex_parse(node, opts, source)
+      end
+
+      def org_attrs_simple_parse(node, opts, source)
+        !source and return org_attrs_simple_parse_no_source(node, opts)
+        orgs = csv_split(node.attr(source))
+        orgs.size > 1 and return orgs.map do |o|
+          { name: o, role: opts[:role], desc: opts[:desc] }
+        end
+        nil
+      end
+
+      def org_attrs_simple_parse_no_source(node, opts)
+        !opts[:default] && !opts[:name] and return []
+        [{ name: opts[:name] || opts[:default],
+           role: opts[:role], desc: opts[:desc] }
+          .compact.merge(extract_org_attrs_address(node, opts, ""))]
+      end
+
+      def org_attrs_complex_parse(node, opts, source)
+        i = 1
+        suffix = ""
+        ret = []
+        while node.attr(source + suffix)
+          ret << extract_org_attrs_complex(node, opts, source, suffix)
+          i += 1
+          suffix = "_#{i}"
+        end
+        ret
+      end
+
+      def extract_org_attrs_complex(node, opts, source, suffix)
+        { name: node.attr(source + suffix),
+          role: opts[:role], desc: opts[:desc],
+          logo: node.attr("#{source}_logo#{suffix}") }.compact
+          .merge(extract_org_attrs_address(node, opts, suffix))
+      end
+
+      def extract_org_attrs_address(node, opts, suffix)
+        %w(address phone fax email uri).each_with_object({}) do |a, m|
+          opts[:source]&.each do |s|
+            p = node.attr("#{s}-#{a}#{suffix}") and
+              m[a.to_sym] = p
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/inline.rb

@@ -27,11 +27,12 @@ module Metanorma
 
       def latex_parse1(text, block)
         lxm_input = Unicode2LaTeX.unicode2latex(@c.decode(text))
-        results = Plurimath::Math.parse(lxm_input, "latex").
-          to_mathml(display_style: block)
+        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}")
+                   "latexmlmath failed to process equation:\n#{lxm_input}",
+                   severity: 1)
           return
         end
         results.sub(%r{<math ([^>]+ )?display="block"}, "<math \\1")
@@ -54,8 +55,8 @@ module Metanorma
         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 = Nokogiri::XML.fragment(latex.sub(/<\?[^>]+>/, ""))
+            .elements[0]
           math.delete("alttext")
           s.parent.children = math
           s << "<latexmath>#{text}</latexmath>"
@@ -104,8 +105,8 @@ module Metanorma
       end
 
       def hash2styles(role)
-        CSV.parse_line(role, liberal_parsing: true).
-          each_with_object({}) do |r, m|
+        CSV.parse_line(role, liberal_parsing: true)
+          .each_with_object({}) do |r, m|
           kv = r.split(":", 2).map(&:strip)
           case kv[0]
           when "custom-charset"

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.8 -->
+<!-- VERSION v1.2.9 -->
 <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">
@@ -1958,6 +1958,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>letter</value>
+            <value>symbol</value>
+            <value>formula</value>
+            <value>equation</value>
+          </choice>
+        </attribute>
+      </optional>
       <element name="name">
         <oneOrMore>
           <choice>

data/lib/metanorma/standoc/localbib.rb

@@ -50,16 +50,14 @@ module Metanorma
       def file_error(config)
         msg = "Cannot process file #{config['file']} for local relaton " \
               "data source #{config['key']}"
-        @parent.fatalerror << msg
-        @parent.log.add("Bibliography", nil, msg)
+        @parent.log.add("Bibliography", nil, msg, severity: 0)
         ""
       end
 
       def format_error(config)
         msg = "Cannot process format #{config['format']} for local relaton " \
               "data source #{config['key']}"
-        @parent.fatalerror << msg
-        @parent.log.add("Bibliography", nil, msg)
+        @parent.log.add("Bibliography", nil, msg, severity: 0)
         {}
       end
 
@@ -68,8 +66,7 @@ module Metanorma
 
         msg = "Cannot find reference #{id} for local relaton " \
               "data source #{file}"
-        @parent.fatalerror << msg
-        @parent.log.add("Bibliography", nil, msg)
+        @parent.log.add("Bibliography", nil, msg, severity: 0)
         Nokogiri::XML("<bibitem/>")
       end
     end

data/lib/metanorma/standoc/macros.rb

@@ -97,6 +97,8 @@ module Metanorma
 
       def pass_status(status, text)
         text == "++++" && !status[:delimln] and status[:pass] = !status[:pass]
+        status[:midline_docattr] && !/^:[^ :]+: /.match?(text) and
+          status[:midline_docattr] = false
         if (status[:is_delim] && /^(-+|\*+|=+|_+)$/.match?(text)) ||
             (!status[:is_delim] && !status[:delimln] && text == "----")
           status[:delimln] = text
@@ -106,9 +108,14 @@ module Metanorma
         elsif status[:delimln] && text == status[:delimln]
           status[:pass] = false
           status[:delimln] = nil
+        elsif /^:[^ :]+: /.match?(text) &&
+            (status[:prev_line].empty? || status[:midline_docattr])
+          status[:pass] = true
+          status[:midline_docattr] = true
         end
         status[:is_delim] = /^\[(source|listing|literal|pass)\b/.match?(text)
         status[:pass_delim] = /^\[(pass)\b/.match?(text)
+        status[:prev_line] = text.strip
         status
       end
 

data/lib/metanorma/standoc/ref.rb

@@ -142,7 +142,7 @@ module Metanorma
       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}")
+        @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}", severity: 1)
         {}
       end
 

data/lib/metanorma/standoc/ref_queue.rb

@@ -43,7 +43,7 @@ module Metanorma
           m[i.to_i] = { ref: ref }
           if doc.is_a?(RelatonBib::RequestError)
             @log.add("Bibliography", nil, "Could not retrieve #{ref[:code]}: " \
-                                          "no access to online site")
+                                          "no access to online site", severity: 1)
           else m[i.to_i][:doc] = doc end
         end
       end
@@ -138,7 +138,7 @@ module Metanorma
         xml
       rescue RelatonBib::RequestError
         @log.add("Bibliography", nil, "Could not retrieve #{code}: " \
-                                      "no access to online site")
+                                      "no access to online site", severity: 1)
         nil
       end
 

data/lib/metanorma/standoc/render.rb

@@ -104,7 +104,8 @@ module Metanorma
       def presentation_xml_converter(node)
         IsoDoc::PresentationXMLConvert
           .new(html_extract_attributes(node)
-          .merge(output_formats: ::Metanorma::Standoc::Processor.new.output_formats)                                )
+          .merge(output_formats: ::Metanorma::Standoc::Processor.new
+          .output_formats))
       end
 
       def default_fonts(node)

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -112,11 +112,11 @@ 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))
+                  remove_missing_ref_msg(node, target, :symbol), severity: 1)
           remove_missing_ref_term(node, target, "symbol")
         else
           log.add("AsciiDoc Input", node,
-                  remove_missing_ref_msg(node, target, :term))
+                  remove_missing_ref_msg(node, target, :term), severity: 1)
           remove_missing_ref_term(node, target, "term")
         end
       end
@@ -253,9 +253,8 @@ module Metanorma
         @idhash["#{prefix}-#{text}"] or
           return "#{prefix}-#{text}"
         (1..Float::INFINITY).lazy.each do |index|
-          unless @idhash["#{prefix}-#{text}-#{index}"]
+          @idhash["#{prefix}-#{text}-#{index}"] or
             break("#{prefix}-#{text}-#{index}")
-          end
         end
       end
 

data/lib/metanorma/standoc/terms.rb

@@ -153,7 +153,7 @@ module Metanorma
         matched = TERM_REFERENCE_RE.match text
         matched.nil? and @log.add("AsciiDoc Input", node,
                                   "term reference not in expected format:" \
-                                  "#{text}")
+                                  "#{text}", severity: 1)
         matched
       end
 

data/lib/metanorma/standoc/validate.rb

@@ -22,11 +22,14 @@ module Metanorma
         concept_validate(doc, "related", "preferred//name")
         preferred_validate(doc)
         table_validate(doc)
-        @fatalerror += requirement_validate(doc)
+        requirement_validate(doc).each do |e|
+          @log.add("Requirements", nil, e, severity: 0)
+        end
         image_validate(doc)
         math_validate(doc)
-        @fatalerror.empty? or
-          clean_abort(@fatalerror.join("\n"), doc)
+        fatalerrors = @log.abort_messages
+        fatalerrors.empty? or
+          clean_abort(fatalerrors.join("\n"), doc)
       end
 
       MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
@@ -53,8 +56,7 @@ module Metanorma
         a and orig += "\n\tAsciimath original: #{@c.decode(a.children.to_xml)}"
         l and orig += "\n\tLatexmath original: #{@c.decode(l.children.to_xml)}"
         @log.add("Mathematics", elem,
-                 "Invalid MathML: #{math}\n #{error}#{orig}")
-        @fatalerror << "Invalid MathML: #{math}"
+                 "Invalid MathML: #{math}\n #{error}#{orig}", severity: 0)
       end
 
       def nested_asset_validate(doc)
@@ -92,7 +94,6 @@ module Metanorma
         err2 = "There is a crossreference to an instance of #{inner.name} " \
                "nested within #{outer.name}: #{i.to_xml}"
         @log.add("Style", i, err2)
-        # @fatalerror << err2
       end
 
       def schema_validate(doc, schema)
@@ -149,8 +150,7 @@ module Metanorma
           Metanorma::Utils::datauri?(i["src"]) and next
           expand_path(i["src"]) and next
           @log.add("Images", i.parent,
-                   "Image not found: #{i['src']}")
-          @fatalerror << "Image not found: #{i['src']}"
+                   "Image not found: #{i['src']}", severity: 0)
         end
       end
 
@@ -189,9 +189,9 @@ module Metanorma
 
       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']}"
+          @log.add("Anchors", elem,
+                   "Anchor #{elem['id']} has already been " \
+                   "used at line #{@doc_ids[elem['id']]}", severity: 0)
         end
         @doc_ids[elem["id"]] = elem.line
       end
@@ -210,7 +210,7 @@ module Metanorma
           m[x.text] = x
           @doc_ids[x.text] and next
           @log.add("Anchors", x.parent,
-                   "Crossreference target #{x} is undefined")
+                   "Crossreference target #{x} is undefined", severity: 1)
         end
       end
     end

data/lib/metanorma/standoc/validate_section.rb

@@ -21,8 +21,7 @@ module Metanorma
         if callouts.size != annotations.size && !annotations.empty?
           err = "mismatch of callouts (#{callouts.size}) and annotations " \
                 "(#{annotations.size})"
-          @log.add("AsciiDoc Input", elem, err)
-          @fatalerror << err
+          @log.add("AsciiDoc Input", elem, err, severity: 0)
         end
       end
 
@@ -58,15 +57,12 @@ module Metanorma
       end
 
       def norm_ref_validate(doc)
-        found = false
         doc.xpath("//references[@normative = 'true']/bibitem").each do |b|
           docid = b.at("./docidentifier[@type = 'metanorma']") or next
           /^\[\d+\]$/.match?(docid.text) or next
           @log.add("Bibliography", b,
-                   "Numeric reference in normative references")
-          found = true
+                   "Numeric reference in normative references", severity: 0)
         end
-        found and @fatalerror << "Numeric reference in normative references"
       end
     end
   end

data/lib/metanorma/standoc/validate_table.rb

@@ -72,8 +72,7 @@ module Metanorma
         mode == "thead_row" and err = "cannot go outside #{tablechild}"
         err = "Table rows in table #{err}: check rowspan"
         if cells2d.any? { |x| x.size != cells2d.first.size }
-          @log.add("Table", table, err)
-          @fatalerror << err
+          @log.add("Table", table, err, severity: 0)
         end
       end
 
@@ -81,9 +80,7 @@ module Metanorma
       def maxcols_check(col, maxcols, tcell)
         if maxcols.positive? && col > maxcols
           @log.add("Table", tcell, "Table exceeds maximum number of columns "\
-                                   "defined (#{maxcols})")
-          @fatalerror << "Table exceeds maximum number of columns defined "\
-                         "(#{maxcols})"
+                                   "defined (#{maxcols})", severity: 0)
         end
       end
     end