metanorma-standoc 2.2.8 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243e174494c4a7ce6b3b8ca5d861feb72d045439ce32948b44af9c14f9180981
-  data.tar.gz: 40c2d970ccb90fdf19c77cd38d5e9e7c7626fa10c96050a0486a4697c3146624
+  metadata.gz: 95723e2c2f2095e87fcc969fafc1372b8297cd68b4376ce49b50e8bbd3b993b5
+  data.tar.gz: ad570f41788f288d281b419d72eb1026b046e7d4f35260281ccd09138c181ebd
 SHA512:
-  metadata.gz: d957db18f3b90d596f69c048fa93c703e45736c23bbaa5787fd5111aaded043fd532a219187a4ff174067a3e456c0bfb48fea4e38d1c4705d6e97754a92ed26b
-  data.tar.gz: 7c37929c7115382a789348ee12041496f4fe10847c2aac893cd7f60ac3e0b413d63c5573dfd6dfadf6e58af5c5455bca09ca150fe0262f9e6324b6e064cfdabe
+  metadata.gz: 135b01bb780350e849b3dd5dc7edac3600a1a75fcfdc336b904ca67dfac219923e5c697e5d05b4871ac827194cb582aadb0abcdcfb84280f024a3b7c75c0881f
+  data.tar.gz: e8a1dbe9aeaced49888d73b237c13a8531471c567c7d5ff4278e8cd38d0cdb171bc6c5f3ff824e2df57e7e8bb9e8dd0ff493df6ca16e5c1efda7364e4f692364

data/lib/metanorma/standoc/base.rb

@@ -9,6 +9,7 @@ require "fileutils"
 require "metanorma-utils"
 require "isodoc/xslfo_convert"
 require_relative "render"
+require_relative "localbib"
 require "mn-requirements"
 
 module Metanorma
@@ -18,6 +19,8 @@ module Metanorma
       XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
       FONTS_MANIFEST = "fonts-manifest".freeze
 
+      attr_accessor :log, :fatalerror
+
       def xml_root_tag
         self.class::XML_ROOT_TAG
       end
@@ -32,7 +35,7 @@ module Metanorma
         init_processing(node)
         init_reqt(node)
         init_toc(node)
-        init_output(node)
+        init_output(node) # feeds init_biblio
         init_i18n(node)
         init_biblio(node)
         @metadata_attrs = metadata_attrs(node)
@@ -96,6 +99,7 @@ module Metanorma
                     end
         @localdir = Metanorma::Utils::localdir(node)
         @output_dir = outputdir node
+        @fatalerror = []
       end
 
       def init_i18n(node)
@@ -113,6 +117,8 @@ module Metanorma
         @bibdb = nil
         init_bib_caches(node)
         init_iev_caches(node)
+        @local_bibdb =
+          ::Metanorma::Standoc::LocalBiblio.new(node, @localdir, self)
       end
 
       def requirements_processor
@@ -226,8 +232,7 @@ module Metanorma
       def outputdir(node)
         if node.attr("output_dir").nil_or_empty?
           Metanorma::Utils::localdir(node)
-        else
-          File.join(node.attr("output_dir"), "")
+        else File.join(node.attr("output_dir"), "")
         end
       end
     end

data/lib/metanorma/standoc/basicdoc.rng

@@ -683,6 +683,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/standoc/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/standoc/blocks.rb

@@ -37,6 +37,7 @@ module Metanorma
         reqt_subpart?(role) and return requirement_subpart(node)
         role == "form" and return form(node)
         role == "definition" and return termdefinition(node)
+        role == "boilerplate" and return boilerplate_note(node)
         result = []
         node.blocks.each { |b| result << send(b.context, b) }
         result

data/lib/metanorma/standoc/blocks_notes.rb

@@ -71,6 +71,11 @@ module Metanorma
         end.join("\n")
       end
 
+      def boilerplate_note(node)
+        node.set_attr("type", "boilerplate")
+        note(node)
+      end
+
       def admonition_attrs(node)
         attr_code(keep_attrs(node).merge(id_attr(node)
           .merge(admonition_core_attrs(node)

data/lib/metanorma/standoc/cleanup_biblio.rb

@@ -66,6 +66,8 @@ module Metanorma
                              name: span[:val] }
         when "surname", "initials", "givenname", "formatted-initials"
           ret[:contrib] = spans_preprocess_contrib(span, ret[:contrib])
+        when "fullname"
+          ret[:contrib] = spans_preprocess_fullname(span, ret[:contrib])
         when "organization"
           ret[:contrib] = spans_preprocess_org(span, ret[:contrib])
         when "in_surname", "in_initials", "in_givenname",
@@ -74,11 +76,18 @@ module Metanorma
           span[:key].sub!(/^in_/, "")
           ret[:in][:contrib] =
             spans_preprocess_contrib(span, ret[:in][:contrib])
+        when "in_fullname"
+          ret[:in][:contrib] ||= []
+          span[:key].sub!(/^in_/, "")
+          ret[:in][:contrib] =
+            spans_preprocess_fullname(span, ret[:in][:contrib])
         when "in_organization"
           ret[:in][:contrib] ||= []
           span[:key].sub!(/^in_/, "")
           ret[:in][:contrib] =
             spans_preprocess_org(span, ret[:in][:contrib])
+        else
+          warn "unrecognised `span:#{span["key"]}`"
         end
       end
 
@@ -100,7 +109,12 @@ module Metanorma
 
         spans_preprocess_new_contrib?(span, contrib) and
           contrib << { role: span[:type] || "author", entity: "person" }
-        contrib[-1][span[:key].to_sym] = span[:val]
+        if span[:key] == "givenname" && contrib[-1][span[:key].to_sym]
+          contrib[-1][span[:key].to_sym] =
+            Array(contrib[-1][span[:key].to_sym]) + span[:val]
+        else
+          contrib[-1][span[:key].to_sym] = span[:val]
+        end
         contrib
       end
 
@@ -112,6 +126,19 @@ module Metanorma
           contrib[-1][:role] != (span[:type] || "author")
       end
 
+      def spans_preprocess_fullname(span, contrib)
+        name = span[:val].gsub(/\.(?=\p{Alpha})/, ". ").split(/ /)
+        out = { role: span[:type] || "author", entity: "person",
+                surname: name[-1] }
+        if name.size > 1 && name[0..-2].all? { |x| /\.$/.match?(x) }
+          out[:"formatted-initials"] = name[0..-2].join(" ")
+        else
+          out[:givenname] = name[0..-2]
+        end
+        contrib << out
+        contrib
+      end
+
       def spans_preprocess_org(span, contrib)
         contrib << { role: span[:type] || "author", entity: "organization",
                      name: span[:val] }
@@ -122,7 +149,7 @@ module Metanorma
         ret = ""
         spans[:title] and ret += "<title>#{spans[:title]}</title>"
         ret += spans_to_bibitem_docid(spans)
-        spans[:contrib].each { |s| ret += span_to_contrib(s) }
+        spans[:contrib].each { |s| ret += span_to_contrib(s, spans[:title]) }
         spans[:series] and
           ret += "<series><title>#{spans[:series]}</title></series>"
         spans[:pubplace] and ret += "<place>#{spans[:pubplace]}</place>"
@@ -152,6 +179,8 @@ module Metanorma
         { volume: "volume", issue: "issue", pages: "page" }.each do |k, v|
           spans[k]&.each { |s| ret += span_to_extent(s, v) }
         end
+        return "" if ret.empty?
+
         "<extent>#{ret}</extent>"
       end
 
@@ -172,19 +201,28 @@ module Metanorma
         end
       end
 
-      def span_to_contrib(span)
+      def span_to_contrib(span, title)
         e = if span[:entity] == "organization"
               "<organization><name>#{span[:name]}</name></organization>"
-            else span_to_person(span)
+            else span_to_person(span, title)
             end
         "<contributor><role type='#{span[:role]}'/>#{e}</contributor>"
       end
 
-      def span_to_person(span)
+      def validate_span_to_person(span, title)
+        span[:surname] and return
+        msg = "Missing surname: issue with bibliographic markup " \
+              "in \"#{title}\": #{span}"
+        @log.add("Bibliography", nil, msg)
+        @fatalerror << msg
+      end
+
+      def span_to_person(span, title)
+        validate_span_to_person(span, title)
         pre = (span[:"formatted-initials"] and
                      "<formatted-initials>" \
                      "#{span[:"formatted-initials"]}</formatted-initials>") ||
-          "<forename>#{span[:givenname]}</forename>"
+          Array(span[:givenname]).map { |x| "<forename>#{x}</forename>" }.join
         "<person><name>#{pre}<surname>#{span[:surname]}</surname></name>" \
           "</person>"
       end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -89,7 +89,8 @@ module Metanorma
 
       def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
         xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
-          next if f.at("./clause[@type = 'boilerplate']")
+          next if f.at("./clause[@type = 'boilerplate'] | " \
+                       "./note[@type = 'boilerplate']")
 
           term_defs_boilerplate(f.at("./title"),
                                 xmldoc.xpath(".//termdocsource"),

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -44,11 +44,11 @@ module Metanorma
       end
 
       NO_SYMABBR = "[.//definitions[not(@type)]]".freeze
-      SYMABBR = "[.//definitions[@type = 'symbols']]"\
+      SYMABBR = "[.//definitions[@type = 'symbols']]" \
                 "[.//definitions[@type = 'abbreviated_terms']]".freeze
-      SYMnoABBR = "[.//definitions[@type = 'symbols']]"\
+      SYMnoABBR = "[.//definitions[@type = 'symbols']]" \
                   "[not(.//definitions[@type = 'abbreviated_terms'])]".freeze
-      ABBRnoSYM = "[.//definitions[@type = 'abbreviated_terms']]"\
+      ABBRnoSYM = "[.//definitions[@type = 'abbreviated_terms']]" \
                   "[not(.//definitions[@type = 'symbols'])]".freeze
 
       def section_names_terms_cleanup(xml)

data/lib/metanorma/standoc/isodoc.rng

@@ -2653,6 +2653,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <value>modspec</value>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/standoc/localbib.rb

@@ -0,0 +1,77 @@
+require "relaton_bib"
+
+module Metanorma
+  module Standoc
+    class LocalBiblio
+      def initialize(node, localdir, parent)
+        @file_bibdb = {}
+        @localdir = localdir
+        @parent = parent
+        read_files(node)
+      end
+
+      def read_files(node)
+        if node.attr("relaton-data-source")
+          init_file_bibdb1(node.attr("relaton-data-source"), "default")
+        else
+          node.attributes.each do |k, v|
+            /^relaton-data-source-.+/.match?(k) or next
+            init_file_bibdb1(v, k.sub(/^relaton-data-source-/, ""))
+          end
+        end
+      end
+
+      def init_file_bibdb_config(defn, key)
+        /=/.match?(defn) or defn = "file=#{defn}"
+        values = defn.split(",").map { |item| item.split /\s*=\s*/ }.to_h
+        values["key"] = key
+        values["format"] ||= "bibtex" # all we currently suppoort
+        values
+      end
+
+      def init_file_bibdb1(defn, key)
+        v = init_file_bibdb_config(defn, key)
+        r = read_file(v)
+        @file_bibdb[v["key"]] =
+          case v["format"]
+          when "bibtex"
+            RelatonBib::BibtexParser.from_bibtex(r)
+          else
+            format_error(v)
+          end
+      end
+
+      def read_file(config)
+        f = File.join(@localdir, config["file"])
+        File.exist?(f) or return file_error(config)
+        File.read(f)
+      end
+
+      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)
+        ""
+      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)
+        {}
+      end
+
+      def get(id, file = default)
+        ret = @file_bibdb.dig(file, id) and return ret
+
+        msg = "Cannot find reference #{id} for local relaton " \
+              "data source #{file}"
+        @parent.fatalerror << msg
+        @parent.log.add("Bibliography", nil, msg)
+        Nokogiri::XML("<bibitem/>")
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/macros_terms.rb

@@ -74,7 +74,7 @@ module Metanorma
 
       def process(_parent, _target, attrs)
         termref = attrs["termxref"] || attrs["name"]
-        "<concept type='term'><termxref>#{attrs['name']}</termxref>"\
+        "<concept type='term'><termxref>#{attrs['name']}</termxref>" \
           "<renderterm>#{termref}</renderterm><xrefrender/></concept>"
       end
     end
@@ -87,7 +87,7 @@ module Metanorma
 
       def process(_parent, _target, attrs)
         termref = attrs["termxref"] || attrs["name"]
-        "<concept type='symbol'><termxref>#{attrs['name']}</termxref>"\
+        "<concept type='symbol'><termxref>#{attrs['name']}</termxref>" \
           "<renderterm>#{termref}</renderterm><xrefrender/></concept>"
       end
     end
@@ -113,50 +113,40 @@ module Metanorma
             .match(m[:rest].sub(/^,/, ""))
           ret[:opt] = CSV.parse_line(m2[:opt].sub(/^,opt(ion)?s=/, "")
             .sub(/^"(.+)"$/m, "\\1").sub(/^'(.+)'$/m, "\\1"))
-          begin
-            attrs = CSV.parse_line(m2[:rest]) || []
-          rescue StandardError
-            raise "error processing #{m2[:rest]} as CSV"
-          end
-        else
-          begin
-            attrs = CSV.parse_line(m[:rest].sub(/^,/, "")) || []
-          rescue StandardError
-            raise "error processing #{m[:rest]} as CSV"
-          end
+          attrs = preprocess_attrs_csv(m2[:rest])
+        else attrs = preprocess_attrs_csv(m[:rest])
         end
         attrs.map! { |x| x.gsub(/\s+/, " ") }
         ret.merge(term: attrs[0], word: attrs[1] || attrs[0],
                   render: attrs[2])
       end
 
+      def preprocess_attrs_csv(line)
+        CSV.parse_line(line.sub(/^,/, "")) || []
+      rescue StandardError
+        raise "error processing #{line} as CSV"
+      end
+
       def generate_attrs(opts)
         ret = ""
-        opts.include?("noital") and ret += " ital='false'"
-        opts.include?("noref") and ret += " ref='false'"
-        opts.include?("ital") and ret += " ital='true'"
-        opts.include?("ref") and ret += " ref='true'"
-        opts.include?("nolinkmention") and ret += " linkmention='false'"
-        opts.include?("linkmention") and ret += " linkmention='true'"
-        opts.include?("nolinkref") and ret += " linkref='false'"
-        opts.include?("linkref") and ret += " linkref='true'"
+        %w(ital ref linkmention linkref).each do |x|
+          opts.include?("no#{x}") and ret += " #{x}='false'"
+          opts.include?(x) and ret += " #{x}='true'"
+        end
         ret
       end
 
       def process(parent, target, _attrs)
         attrs = preprocess_attrs(target)
-        term = Asciidoctor::Inline.new(parent, :quoted,
-                                       attrs[:term]).convert
-        word = Asciidoctor::Inline.new(parent, :quoted,
-                                       attrs[:word]).convert
-        xref = Asciidoctor::Inline.new(parent, :quoted,
-                                       attrs[:render]).convert
+        term, word, render = %i(term word render).each_with_object([]) do |x, m|
+          m << Asciidoctor::Inline.new(parent, :quoted, attrs[x]).convert
+        end
         opt = generate_attrs(attrs[:opt] || [])
-        if attrs[:id] then "<concept#{opt} key='#{attrs[:id]}'><refterm>"\
-          "#{term}</refterm><renderterm>#{word}</renderterm>"\
-          "<xrefrender>#{xref}</xrefrender></concept>"
-        else "<concept#{opt}><termxref>#{term}</termxref><renderterm>"\
-          "#{word}</renderterm><xrefrender>#{xref}</xrefrender></concept>"
+        if attrs[:id] then "<concept#{opt} key='#{attrs[:id]}'><refterm>" \
+          "#{term}</refterm><renderterm>#{word}</renderterm>" \
+          "<xrefrender>#{render}</xrefrender></concept>"
+        else "<concept#{opt}><termxref>#{term}</termxref><renderterm>" \
+          "#{word}</renderterm><xrefrender>#{render}</xrefrender></concept>"
         end
       rescue StandardError => e
         raise("processing {{#{target}}}: #{e.message}")
@@ -182,9 +172,9 @@ module Metanorma
         out = preprocess_attrs(attrs["text"])
         term = Asciidoctor::Inline.new(parent, :quoted,
                                        out[:term]).convert
-        if out[:id] then "<related type='#{target}' key='#{out[:id]}'>"\
+        if out[:id] then "<related type='#{target}' key='#{out[:id]}'>" \
           "<refterm>#{term}</refterm></related>"
-        else "<related type='#{target}'><termxref>#{term}</termxref>"\
+        else "<related type='#{target}'><termxref>#{term}</termxref>" \
           "<xrefrender>#{term}</xrefrender></related>"
         end
       rescue StandardError => e

data/lib/metanorma/standoc/ref.rb

@@ -42,10 +42,9 @@ module Metanorma
       end
 
       def isorefmatches2code(match)
-        { code: match[:code], no_year: true,
+        { code: match[:code], no_year: true, lang: (@lang || :all),
           note: match[:fn], year: nil, match: match,
-          title: match[:text], usrlbl: match[:usrlbl],
-          lang: (@lang || :all) }
+          title: match[:text], usrlbl: match[:usrlbl] }
       end
 
       def isorefmatches2out(item, xml)
@@ -145,7 +144,7 @@ module Metanorma
           return { code: nil, match: match, analyse_code: code,
                    hidden: code[:hidden] }
         year = refitem1yr(code[:id])
-        { code: code[:id], analyse_code: code,
+        { code: code[:id], analyse_code: code, localfile: code[:localfile],
           year: year,
           title: match[:text], match: match, hidden: code[:hidden],
           usrlbl: match[:usrlbl], lang: (@lang || :all) }
@@ -221,7 +220,13 @@ module Metanorma
         refs = node.items.each_with_object([]) do |b, m|
           m << reference1code(b.text, node)
         end
-        reference_populate(refs)
+        reference_populate(reference_normalise(refs))
+      end
+
+      def reference_normalise(refs)
+        refs.each do |r|
+          r[:code] = @c.decode(r[:code]).gsub(/\u2009\u2014\u2009/, " -- ")
+        end
       end
 
       def reference_populate(refs)
@@ -239,7 +244,7 @@ module Metanorma
           ref, i, doc = results.pop
           m[i.to_i] = { ref: ref }
           if doc.is_a?(RelatonBib::RequestError)
-            @log.add("Bibliography", nil, "Could not retrieve #{ref[:code]}: "\
+            @log.add("Bibliography", nil, "Could not retrieve #{ref[:code]}: " \
                                           "no access to online site")
           else m[i.to_i][:doc] = doc
           end

data/lib/metanorma/standoc/ref_sect.rb

@@ -69,41 +69,63 @@ module Metanorma
         return nil if opts[:no_year]
 
         code = code.sub(/^\([^)]+\)/, "")
-        hit = @bibdb&.fetch(code, year, opts)
-        return nil if hit.nil?
-
+        hit = fetch_ref1(code, year, opts) or return nil
         xml.parent.add_child(smart_render_xml(hit, code, opts))
         xml
       rescue RelatonBib::RequestError
-        @log.add("Bibliography", nil, "Could not retrieve #{code}: "\
+        @log.add("Bibliography", nil, "Could not retrieve #{code}: " \
                                       "no access to online site")
         nil
       end
 
+      def fetch_ref1(code, year, opts)
+        if opts[:localfile]
+          @local_bibdb.get(code, opts[:localfile])
+        else @bibdb&.fetch(code, year, opts)
+        end
+      end
+
       def fetch_ref_async(ref, idx, res)
-        if ref[:code].nil? || ref[:no_year] || @bibdb.nil?
+        if ref[:code].nil? || ref[:no_year] || (@bibdb.nil? && !ref[:localfile])
           res << [ref, idx, nil]
-        else
-          @bibdb.fetch_async(@c.decode(ref[:code]),
-                             ref[:year], ref) do |doc|
-            res << [ref, idx, doc]
-          end
+        elsif ref[:localfile]
+          res << [ref, idx, @local_bibdb.get(ref[:code], ref[:localfile])]
+        else fetch_ref_async1(ref, idx, res)
+        end
+      end
+
+      def fetch_ref_async1(ref, idx, res)
+        @bibdb.fetch_async(ref[:code], ref[:year], ref) do |doc|
+          res << [ref, idx, doc]
         end
       end
 
       def emend_biblio(xml, code, title, usrlbl)
+        emend_biblio_id(xml, code)
+        emend_biblio_title(xml, code, title)
+        emend_biblio_usrlbl(xml, usrlbl)
+      end
+
+      def emend_biblio_id(xml, code)
         unless xml.at("/bibitem/docidentifier[not(@type = 'DOI')][text()]")
           @log.add("Bibliography", nil,
                    "ERROR: No document identifier retrieved for #{code}")
           xml.root << "<docidentifier>#{code}</docidentifier>"
         end
+      end
+
+      def emend_biblio_title(xml, code, title)
         unless xml.at("/bibitem/title[text()]")
           @log.add("Bibliography", nil,
                    "ERROR: No title retrieved for #{code}")
           xml.root << "<title>#{title || '(MISSING TITLE)'}</title>"
         end
-        usrlbl and xml.at("/bibitem/docidentifier").next =
-                     "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
+      end
+
+      def emend_biblio_usrlbl(xml, usrlbl)
+        usrlbl or return
+        xml.at("/bibitem/docidentifier").next =
+          "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
       end
 
       def smart_render_xml(xml, code, opts)

data/lib/metanorma/standoc/ref_utility.rb

@@ -62,6 +62,14 @@ module Metanorma
           .sub(/^dropid\((.+)\)$/, "\\1")
           .sub(/^hidden\((.+)\)$/, "\\1")
           .sub(/^nofetch\((.+)\)$/, "\\1")
+          .sub(/^local-file\((.+)\)$/, "\\1")
+      end
+
+      def analyse_ref_localfile(ret)
+        m = /^local-file\((?:(?<source>[^,]+),\s*)?(?<id>.+)\)$/.match(ret[:id])
+        m or return ret
+
+        ret.merge(id: m[:id], localfile: (m[:source] || "default"))
       end
 
       def analyse_ref_nofetch(ret)
@@ -98,15 +106,19 @@ module Metanorma
       end
 
       # ref id = (usrlbl)code[:-]year
-      # code = nofetch(code) | hidden(code) | dropid(code) | (repo|path):(key,code) |
-      # \[? number \]? | ident
+      # code = \[? number \]? | ident | nofetch(code) | hidden(code) |
+      # dropid(code) | # (repo|path):(key,code) | local-file(source,? key)
       def analyse_ref_code(code)
         ret = { id: code }
         return ret if code.blank?
 
         analyse_ref_numeric(
           analyse_ref_repo_path(
-            analyse_ref_dropid(analyse_ref_hidden(analyse_ref_nofetch(ret))),
+            analyse_ref_dropid(
+              analyse_ref_hidden(
+                analyse_ref_nofetch(analyse_ref_localfile(ret)),
+              ),
+            ),
           ),
         )
       end

data/lib/metanorma/standoc/reqt.rb

@@ -34,8 +34,9 @@ module Metanorma
 
       def requirement_validate(docxml)
         docxml.xpath("//requirement | //recommendation | //permission")
-          .each do |r|
-          @reqt_models.model(r["model"]).validate(r, @log)
+          .each_with_object([]) do |r, m|
+          ret = @reqt_models.model(r["model"]).validate(r, @log)
+          ret.each { |x| m << x }
         end
       end
     end

data/lib/metanorma/standoc/section.rb

@@ -60,8 +60,9 @@ module Metanorma
          "symbols and abbreviated terms", "clause", "bibliography"].freeze
 
       def start_main_section(ret, node)
-        @preface = false if self.class::MAIN_CLAUSE_NAMES.include?(ret) &&
-          node.role != "preface" && node.attr("style") != "preface"
+        return if node.role == "preface" || node.attr("style") == "preface"
+
+        @preface = false if self.class::MAIN_CLAUSE_NAMES.include?(ret)
         @preface = false if self.class::PREFACE_CLAUSE_NAMES
           .intersection(@seen_headers_canonical + [ret]).empty?
       end

data/lib/metanorma/standoc/validate.rb

@@ -43,7 +43,6 @@ module Metanorma
       end
 
       def content_validate(doc)
-        @fatalerror = []
         xref_validate(doc)
         section_validate(doc)
         norm_ref_validate(doc)
@@ -52,7 +51,7 @@ module Metanorma
         concept_validate(doc, "concept", "refterm")
         concept_validate(doc, "related", "preferred//name")
         table_validate(doc)
-        requirement_validate(doc)
+        @fatalerror += requirement_validate(doc)
         image_validate(doc)
         @fatalerror.empty? or
           clean_abort(@fatalerror.join("\n"), doc)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.2.8".freeze
+    VERSION = "2.3.0".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.3.1"
+  spec.add_dependency "isodoc", "~> 2.4.0"
   spec.add_dependency "metanorma"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-lutaml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -503,6 +503,7 @@ files:
 - lib/metanorma/standoc/isodoc-compile.rng
 - lib/metanorma/standoc/isodoc.rng
 - lib/metanorma/standoc/lists.rb
+- lib/metanorma/standoc/localbib.rb
 - lib/metanorma/standoc/macros.rb
 - lib/metanorma/standoc/macros_embed.rb
 - lib/metanorma/standoc/macros_form.rb
@@ -548,7 +549,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: metanorma-standoc realises standards following the Metanorma standoc model