metanorma-standoc 2.0.5.2 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c1f0434e53ee6bfe52bd329b1ddc84f08386c39da60ff1a00f6a34914b7709
-  data.tar.gz: c7ff940d7544e1d81b4a9ac7e3d0f42bc0398a34b8a5e7036ffe4806a2776615
+  metadata.gz: 9e678173d52fd8197d0127f397b7f65349b72d26242d62c3cee8005e3057068b
+  data.tar.gz: 4a5548452c906db7df68ead74453f49d484fe601791a35aeb22360e9abb0b2ea
 SHA512:
-  metadata.gz: 965db9580243b582af5051840e1a258e74963383bdcb377691cbb5aac2fbec083096cd201aca8c677f0a637ab793b3aa762fb02f5aa7767e710469bc39f0a8a0
-  data.tar.gz: 894d7350c1438462826073b48a7db77889466aa7d122b991c2c4bb212a12177bab53095a76d9a2e4444a355f6b5343b0f1d7be008c347fdc84f9df52f60924f8
+  metadata.gz: 3b28ce6e459d29a0b457179ad2f97282ccf26109358ed8ab933d42e080d8ad1e4511d68c1470d16437c8dd71338ed8951f2a021335f135cf0d3d467d432e715a
+  data.tar.gz: d54fc63c669aa31fc728d35f3761c4a853d1ef345d9010988157550073ff2e38feb6ad123be562ee323219d812fa3f414da17102d0c462801bd31aa0be50405d

data/lib/asciidoctor/standoc/base.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/base"
-

data/lib/asciidoctor/standoc/blocks.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/blocks"
-

data/lib/asciidoctor/standoc/blocks_notes.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/blocks_notes"
-

data/lib/asciidoctor/standoc/cleanup.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup"
-

data/lib/asciidoctor/standoc/cleanup_amend.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_amend"
-

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_block"
-

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_boilerplate"
-

data/lib/asciidoctor/standoc/cleanup_footnotes.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_footnotes"
-

data/lib/asciidoctor/standoc/cleanup_image.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_image"
-

data/lib/asciidoctor/standoc/cleanup_inline.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_inline"
-

data/lib/asciidoctor/standoc/cleanup_maths.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_maths"
-

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_ref"
-

data/lib/asciidoctor/standoc/cleanup_ref_dl.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_ref_dl"
-

data/lib/asciidoctor/standoc/cleanup_reqt.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_reqt"
-

data/lib/asciidoctor/standoc/cleanup_section.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_section"
-

data/lib/asciidoctor/standoc/cleanup_section_names.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_section_names"
-

data/lib/asciidoctor/standoc/cleanup_symbols.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_symbols"
-

data/lib/asciidoctor/standoc/cleanup_table.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_table"
-

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_terms"
-

data/lib/asciidoctor/standoc/cleanup_terms_designations.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_terms_designations"
-

data/lib/asciidoctor/standoc/cleanup_text.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_text"
-

data/lib/asciidoctor/standoc/cleanup_toc.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_toc"
-

data/lib/asciidoctor/standoc/cleanup_xref.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/cleanup_xref"
-

data/lib/asciidoctor/standoc/converter.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/converter"
-

data/lib/asciidoctor/standoc/deprecated.rb

@@ -1,5 +1,7 @@
-warn "Please replace your references to Asciidoctor::Standoc with Metanorma::Standoc and your instances of require 'asciidoctor/standoc' with require 'metanorma/standoc'"
+warn "Please replace your references to Asciidoctor::Standoc with "\
+     "Metanorma::Standoc and your instances of require 'asciidoctor/standoc' "\
+     "with require 'metanorma/standoc'"
 
-exit 127 if ENV['METANORMA_DEPRECATION_FAIL']
+exit 127 if ENV["METANORMA_DEPRECATION_FAIL"]
 
 Asciidoctor::Standoc = Metanorma::Standoc unless defined? Asciidoctor::Standoc

data/lib/asciidoctor/standoc/front.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/front"
-

data/lib/asciidoctor/standoc/front_contributor.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/front_contributor"
-

data/lib/asciidoctor/standoc/inline.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/inline"
-

data/lib/asciidoctor/standoc/lists.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/lists"
-

data/lib/asciidoctor/standoc/macros.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/macros"
-

data/lib/asciidoctor/standoc/macros_form.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/macros_form"
-

data/lib/asciidoctor/standoc/macros_note.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/macros_note"
-

data/lib/asciidoctor/standoc/macros_plantuml.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/macros_plantuml"
-

data/lib/asciidoctor/standoc/macros_terms.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/macros_terms"
-

data/lib/asciidoctor/standoc/render.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/render"
-

data/lib/asciidoctor/standoc/reqt.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/reqt"
-

data/lib/asciidoctor/standoc/section.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/section"
-

data/lib/asciidoctor/standoc/table.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/table"
-

data/lib/asciidoctor/standoc/term_lookup_cleanup.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/term_lookup_cleanup"
-

data/lib/asciidoctor/standoc/terms.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/terms"
-

data/lib/asciidoctor/standoc/utils.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/utils"
-

data/lib/asciidoctor/standoc/validate.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/validate"
-

data/lib/asciidoctor/standoc/validate_section.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/standoc/deprecated"
 require "metanorma/standoc/validate_section"
-

data/lib/isodoc/pdf_convert.rb

@@ -2,7 +2,6 @@ require "isodoc"
 
 module IsoDoc
   module Standoc
-
     # A {Converter} implementation that generates HTML output, and a document
     # schema encapsulation of the document for validation
     #
@@ -12,8 +11,8 @@ module IsoDoc
         super
       end
 
-      def pdf_stylesheet(docxml)
-          "base.standard.xsl"
+      def pdf_stylesheet(_docxml)
+        "base.standard.xsl"
       end
     end
   end

data/lib/metanorma/standoc/biblio.rng

@@ -527,7 +527,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/lib/metanorma/standoc/blocks.rb

@@ -96,6 +96,7 @@ module Metanorma
         return svgmap_example(node) if role == "svgmap"
         return form(node) if role == "form"
         return termdefinition(node) if role == "definition"
+        return figure_example(node) if role == "figure"
 
         reqt_subpart(role) and return requirement_subpart(node)
         example_proper(node)
@@ -145,6 +146,15 @@ module Metanorma
         end.join("\n")
       end
 
+      def figure_example(node)
+        noko do |xml|
+          xml.figure **figure_attrs(node) do |ex|
+            node.title.nil? or ex.name { |name| name << node.title }
+            wrap_in_para(node, ex)
+          end
+        end.join("\n")
+      end
+
       def figure_title(node, out)
         return if node.title.nil?
 

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -111,7 +111,7 @@ module Metanorma
         return if xml.at("//boilerplate")
 
         preface = xml.at("//preface") || xml.at("//sections") ||
-          xml.at("//annex") || xml.at("//references") || return
+          xml.at("//annex") || xml.at("//references") or return
         b = boilerplate(xml, isodoc) or return
         preface.previous = b
       end
@@ -126,7 +126,7 @@ module Metanorma
           file = File.join(@localdir,
                            @boilerplateauthority)
         end
-        (!file.nil? and File.exists?(file)) or return
+        (!file.nil? and File.exist?(file)) or return
         conv.populate_template(File.read(file, encoding: "UTF-8"), nil)
       end
 
@@ -162,11 +162,11 @@ module Metanorma
       end
 
       def insert_indirect_biblio(xmldoc, refs, prefix)
-        ins = xmldoc.at("bibliography") or
-          xmldoc.root << "<bibliography/>" and ins = xmldoc.at("bibliography")
-        ins = ins.add_child("<references hidden='true' normative='false'/>").first
+        i = xmldoc.at("bibliography") or
+          xmldoc.root << "<bibliography/>" and i = xmldoc.at("bibliography")
+        i = i.add_child("<references hidden='true' normative='false'/>").first
         refs.each do |x|
-          ins << <<~BIB
+          i << <<~BIB
             <bibitem id="#{x}" type="internal">
             <docidentifier type="repository">#{x.sub(/^#{prefix}_/, "#{prefix}/")}</docidentifier>
             </bibitem>
@@ -213,12 +213,13 @@ module Metanorma
       def bibdata_embed_hdr_cleanup(xmldoc)
         return if @embed_hdr.nil? || @embed_hdr.empty?
 
-        embed_recurse(xmldoc.at("//bibdata"), @embed_hdr.first)
+        xmldoc.at("//bibdata") << "<relation type='derivedFrom'>"\
+                                  "#{hdr2bibitem(@embed_hdr.first)}</relation>"
       end
 
       def hdr2bibitem(hdr)
         xml = Asciidoctor
-          .convert(hdr[:text], backend: Processor.new.asciidoctor_backend,
+          .convert(hdr[:text], backend: hdr2bibitem_type(hdr),
                                header_footer: true)
         b = Nokogiri::XML(xml).at("//xmlns:bibdata")
         b.name = "bibitem"
@@ -227,6 +228,13 @@ module Metanorma
         b.to_xml
       end
 
+      def hdr2bibitem_type(hdr)
+        m = /:mn-document-class: (\S+)/.match(hdr[:text])
+        if m then m[1].to_sym
+        else Processor.new.asciidoctor_backend
+        end
+      end
+
       def embed_recurse(bibitem, node)
         node[:child].map { |x| hdr2bibitem(x) }.each do |x|
           bibitem << "<relation type='derivedFrom'>#{x}</relation>"

data/lib/metanorma/standoc/cleanup_ref.rb

@@ -50,10 +50,8 @@ module Metanorma
       # only numeric references are renumbered
       def biblio_renumber(xmldoc)
         i = 0
-        xmldoc.xpath("//bibliography//references | //clause//references | "\
-                     "//annex//references").each do |r|
-          next if r["normative"] == "true"
-
+        xmldoc.xpath("//references[not(@normative = 'true')]"\
+                     "[not(@hidden = 'true')]").each do |r|
           r.xpath("./bibitem[not(@hidden = 'true')]").each do |b|
             i += 1
             next unless docid = b.at("./docidentifier[@type = 'metanorma']")

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -4,12 +4,12 @@ module Metanorma
       # extending localities to cover ISO referencing
       LOCALITY_REGEX_STR = <<~REGEXP.freeze
         ^(((?<conn>and|or|from|to)!)?
-            (?<locality>section|clause|part|paragraph|chapter|page|
+            (?<locality>section|clause|part|paragraph|chapter|page|line|
                       table|annex|figure|example|note|formula|list|time|anchor|
                       locality:[^ \\t\\n\\r:,;=]+)(\\s+|=)
                (?<ref>[^"][^ \\t\\n,:;-]*|"[^"]+")
                  (-(?<to>[^"][^ \\t\\n,:;-]*|"[^"]"))?|
-          (?<locality2>whole|locality:[^ \\t\\n\\r:,;=]+))(?<punct>[,:;]?)\\s*
+          (?<locality2>whole|title|locality:[^ \\t\\n\\r:,;=]+))(?<punct>[,:;]?)\\s*
          (?<text>.*)$
       REGEXP
       LOCALITY_RE = Regexp.new(LOCALITY_REGEX_STR.gsub(/\s/, ""),
@@ -160,8 +160,7 @@ module Metanorma
 
       def origin_cleanup(xmldoc)
         xmldoc.xpath("//origin/concept[termref]").each do |x|
-          t = x.at("./termref")
-          x.replace(t)
+          x.replace(x.at("./termref"))
         end
         xmldoc.xpath("//origin").each do |x|
           x["citeas"] = @anchors&.dig(x["bibitemid"], :xref) or

data/lib/metanorma/standoc/inline.rb

@@ -51,7 +51,7 @@ module Metanorma
       end
 
       def inline_anchor_xref_match(node)
-        /^(hidden%(?<hidden>[^,]+),?)?
+        /^(?:hidden%(?<hidden>[^,]+),?)?
           (?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
           (?<fn>fn:?\s*)?(?<text>.*)$/x.match node.text
       end
@@ -81,10 +81,9 @@ module Metanorma
       def inline_anchor_bibref(node)
         eref_contents = (node.text || node.target || node.id)
           &.sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
-        eref_attributes = { id: node.target || node.id }
         @refids << (node.target || node.id)
         noko do |xml|
-          xml.ref **attr_code(eref_attributes) do |r|
+          xml.ref **attr_code(id: node.target || node.id) do |r|
             r << eref_contents
           end
         end.join
@@ -229,13 +228,17 @@ module Metanorma
         noko do |xml|
           node.type == :visible and xml << node.text
           terms = (node.attr("terms") || [node.text]).map { |x| xml_encode(x) }
-          xml.index do |i|
-            i.primary { |x| x << terms[0] }
-            a = terms[1] and i.secondary { |x| x << a }
-            a = terms[2] and i.tertiary { |x| x << a }
-          end
+          inline_indexterm1(xml, terms)
         end.join
       end
+
+      def inline_indexterm1(xml, terms)
+        xml.index do |i|
+          i.primary { |x| x << terms[0] }
+          a = terms[1] and i.secondary { |x| x << a }
+          a = terms[2] and i.tertiary { |x| x << a }
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/macros_embed.rb

@@ -9,7 +9,6 @@ module Metanorma
         ret = lines.each_with_object({ lines: [], hdr: [] }) do |line, m|
           process1(line, m, doc, reader, headings)
         end
-        #doc.converter.embed_hdr = ret[:hdr]
         doc.attributes["embed_hdr"] = ret[:hdr]
         ::Asciidoctor::Reader.new ret[:lines].flatten
       end
@@ -83,8 +82,7 @@ module Metanorma
             j = i
             j -= 1 while j >= 0 && /^\S/.match?(m[j])
             lines[j..i].each { |n| m << n }
-          else
-            skip or m << l
+          else skip or m << l
           end
         end
       end

data/lib/metanorma/standoc/macros_terms.rb

@@ -109,7 +109,7 @@ module Metanorma
       def preprocess_attrs(target)
         m = /^(?<id>&lt;&lt;.+?&gt;&gt;)?(?<rest>.*)$/.match(target)
         ret = { id: m[:id]&.sub(/^&lt;&lt;/, "")&.sub(/&gt;&gt;$/, "") }
-        if m2 = /^(?<rest>.*?)(?<opt>,opt(ion)?s=.+)$/
+        if m2 = /^(?<rest>.*?)(?<opt>,opt(?:ion)?s=.+)$/
             .match(m[:rest].sub(/^,/, ""))
           ret[:opt] = CSV.parse_line(m2[:opt].sub(/^,opt(ion)?s=/, "")
             .sub(/^"(.+)"$/, "\\1").sub(/^'(.+)'$/, "\\1"))

data/lib/metanorma/standoc/processor.rb

@@ -22,7 +22,8 @@ module Metanorma
       end
 
       def version
-        "Metanorma::Standoc #{Metanorma::Standoc::VERSION}/IsoDoc #{IsoDoc::VERSION}"
+        "Metanorma::Standoc #{Metanorma::Standoc::VERSION}/"\
+          "IsoDoc #{IsoDoc::VERSION}"
       end
 
       def html_path(file)

data/lib/metanorma/standoc/ref.rb

@@ -87,10 +87,10 @@ module Metanorma
         end
       end
 
-      def isorefmatches3_1(xml, match, yr, _hasyr, _ref)
+      def isorefmatches3_1(xml, match, year, _hasyr, _ref)
         xml.bibitem(**attr_code(ref_attributes(match))) do |t|
-          isorefrender1(t, match, yr, " (all parts)")
-          conditional_date(t, match, yr == "--")
+          isorefrender1(t, match, year, " (all parts)")
+          conditional_date(t, match, year == "--")
           iso_publisher(t, match[:code])
           if match.names.include?("fn") && match[:fn]
             t.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
@@ -108,7 +108,7 @@ module Metanorma
           bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), **{ type: "URI" }
           bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), **{ type: "citation" }
         end
-        code[:id].sub!(/[:-](19|20)[0-9][0-9]$/, "")
+        # code[:id].sub!(/[:-](19|20)[0-9][0-9]$/, "")
         docid(bib, match[:usrlbl]) if match[:usrlbl]
         docid(bib, /^\d+$/.match?(code[:id]) ? "[#{code[:id]}]" : code[:id])
         code[:type] == "repo" and
@@ -123,7 +123,8 @@ module Metanorma
           end
           yr_match = /[:-](?<year>(?:19|20)[0-9][0-9])\b/.match(code[:id])
           refitem_render1(match, code, t)
-          docnumber(t, code[:id]) unless /^\d+$|^\(.+\)$/.match?(code[:id])
+          /^\d+$|^\(.+\)$/.match?(code[:id]) or
+            docnumber(t, code[:id].sub(/[:-](19|20)[0-9][0-9]$/, ""))
           conditional_date(t, yr_match || match, false)
         end
       end
@@ -178,7 +179,7 @@ module Metanorma
       \[(?<usrlbl>\([^)]+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9]+)
       (?::(?<year>--|&\#821[12];|[0-9][0-9-]+))?\s
       \(all\sparts\)\]</ref>,?\s*
-        (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm.freeze
+        (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm.freeze
 
       NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<usrlbl>\([^)]+\))?(?<code>.+?)\]</ref>,?\s*(?<text>.*)$}xm

data/lib/metanorma/standoc/render.rb

@@ -28,6 +28,8 @@ module Metanorma
           tocfigures: @tocfigures,
           toctables: @toctables,
           tocrecommendations: @tocrecommendations,
+          fonts: node.attr("fonts"),
+          fontlicenseagreement: node.attr("font-license-agreement"),
         }
       end
 
@@ -67,6 +69,8 @@ module Metanorma
           tocfigures: @tocfigures,
           toctables: @toctables,
           tocrecommendations: @tocrecommendations,
+          fonts: node.attr("fonts"),
+          fontlicenseagreement: node.attr("font-license-agreement"),
         }
 
         if fonts_manifest = node.attr(FONTS_MANIFEST)
@@ -81,7 +85,8 @@ module Metanorma
            pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
            pdf-allow-assemble-document pdf-allow-edit-annotations
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
-           pdf-allow-access-content pdf-encrypt-metadata)
+           pdf-allow-access-content pdf-encrypt-metadata fonts
+           font-license-agreement)
           .each_with_object({}) do |x, m|
           m[x.gsub(/-/, "").to_i] = node.attr(x)
         end

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -165,7 +165,7 @@ module Metanorma
 
         t = term.dup
         t.xpath(".//index").map(&:remove)
-        Metanorma::Utils::to_ncname(t.text.strip.downcase
+        Metanorma::Utils::to_ncname(t.text.strip
           .gsub(/[[:space:]]+/, "-"))
       end
 

data/lib/metanorma/standoc/validate.rb

@@ -64,7 +64,7 @@ module Metanorma
 
       def max_td_count(table)
         max = 0
-        table.xpath(".//tr").each do |tr|
+        table.xpath("./tr").each do |tr|
           n = tr.xpath("./td | ./th").size
           max < n and max = n
         end
@@ -72,8 +72,8 @@ module Metanorma
       end
 
       def maxrowcols_validate(table, maxcols)
-        cells2d = table.xpath(".//tr").each_with_object([]) { |_r, m| m << {} }
-        table.xpath(".//tr").each_with_index do |tr, r|
+        cells2d = table.xpath("./*/tr").each_with_object([]) { |_r, m| m << {} }
+        table.xpath("./*/tr").each_with_index do |tr, r|
           curr = 0
           tr.xpath("./td | ./th").each do |td|
             curr = maxcols_validate1(td, r, curr, cells2d, maxcols)