metanorma-standoc 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4b55c7be36492191bd86bc19646a520c76e94bd2e2af9f96cf0d80d25fb05e
-  data.tar.gz: 533fc5380552ab239528a559ee41a47c246203e17cb33df64cb5cdef5df21f34
+  metadata.gz: 48ca241528c217b9b563a2d3f6f2e13b52f2fa24e679ca2de431ebde8d10fb98
+  data.tar.gz: f6b70cd60a959376474a35ef4d364f69f9e15fd6582a53571a71cec995d90a01
 SHA512:
-  metadata.gz: adc2d0b10dd30e5f59060b20574701dc6049b25a9d25eff06557ac51ca66645f62b553517690380009460f01fe135d26e83ab653b81c7746209e8f55221c3703
-  data.tar.gz: 8bc78cf1ab42e80d93c8a22f0028e44e7ba735914fa43c2dcdd5eb53cb57b3a3ee52ea1677cae5033dbc738f8b444bc0dc2e5021ff08a443d991535c84c373b2
+  metadata.gz: f175a4b49b2aa24d8c8b566a6929401f1a61fb217cf2ee03b506d93482a086afb7b09c85e7c6d88c93d1ef57d41e5a79dc6122bf41624842118dfa75759823b4
+  data.tar.gz: c395e93a7f1d3c03c63f1063f1689beb3e1725b81d26b2b38769038d491e8fade8462ab1b2f3b6324eede90c7e03b1473ce40873b903fd3859852436d69e7a9a

data/lib/metanorma/standoc/base.rb

@@ -31,48 +31,65 @@ module Metanorma
         @refids = Set.new
         @anchors = {}
         @internal_eref_namespaces = []
+        @seen_headers = []
         @draft = node.attributes.has_key?("draft")
         @novalid = node.attr("novalid")
         @smartquotes = node.attr("smartquotes") != "false"
         @keepasciimath = node.attr("mn-keep-asciimath") &&
           node.attr("mn-keep-asciimath") != "false"
-        @fontheader = default_fonts(node)
-        @files_to_delete = []
-        @filename = if node.attr("docfile")
-                      File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
-                    else ""
-                    end
-        @localdir = Metanorma::Utils::localdir(node)
-        @output_dir = outputdir node
-        @no_isobib_cache = node.attr("no-isobib-cache")
-        @no_isobib = node.attr("no-isobib")
         @index_terms = node.attr("index-terms")
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
-        @bibdb = nil
-        @seen_headers = []
         @datauriimage = node.attr("data-uri-image") != "false"
         @boilerplateauthority = node.attr("boilerplate-authority")
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
+        init_toc(node)
+        init_output(node)
+        init_i18n(node)
+        init_biblio(node)
+        @metadata_attrs = metadata_attrs(node)
+      end
+
+      def init_toc(node)
+        @htmltoclevels = node.attr("htmltoclevels")
+        @doctoclevels = node.attr("doctoclevels")
+        @toclevels = node.attr("toclevels")
+        @tocfigures = node.attr("toc-figures")
+        @toctables = node.attr("toc-tables")
+        @tocrecommendations = node.attr("toc-recommendations")
+      end
+
+      def init_output(node)
+        @fontheader = default_fonts(node)
         @log = Metanorma::Utils::Log.new
-        init_bib_caches(node)
-        init_iev_caches(node)
+        @files_to_delete = []
+        @filename = if node.attr("docfile")
+                      File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
+                    else ""
+                    end
+        @localdir = Metanorma::Utils::localdir(node)
+        @output_dir = outputdir node
+      end
+
+      def init_i18n(node)
         @lang = (node.attr("language") || "en")
         @script = (node.attr("script") ||
                    Metanorma::Utils.default_script(node.attr("language")))
         @isodoc = isodoc(@lang, @script, node.attr("i18nyaml"))
         @i18n = @isodoc.i18n
-        @htmltoclevels = node.attr("htmltoclevels")
-        @doctoclevels = node.attr("doctoclevels")
-        @toclevels = node.attr("toclevels")
-        @metadata_attrs = metadata_attrs(node)
+      end
+
+      def init_biblio(node)
+        @no_isobib_cache = node.attr("no-isobib-cache")
+        @no_isobib = node.attr("no-isobib")
+        @bibdb = nil
+        init_bib_caches(node)
+        init_iev_caches(node)
       end
 
       def document(node)
-        init(node)
-        ret = makexml(node).to_xml(encoding: "UTF-8", indent: 2)
-        outputs(node, ret) unless node.attr("nodoc") || !node.attr("docfile")
+        ret = document1(node)
         clean_exit
         ret
       rescue StandardError => e
@@ -81,6 +98,28 @@ module Metanorma
         raise e
       end
 
+      def document1(node)
+        init(node)
+        ret = makexml(node)
+          .to_xml(encoding: "UTF-8", indent: 2,
+                  save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+        outputs(node, ret) unless node.attr("nodoc") || !node.attr("docfile")
+        ret
+      end
+
+      def insert_xml_cr(doc)
+        doc
+          .gsub(%r{(</(clause|table|figure|p|bibitem|ul|ol|dl|dt|dd|li|example|
+                       sourcecode|formula|quote|references|annex|appendix|title|
+                       name|note|thead|tbody|tfoot|th|td|form|requirement|
+                       recommendation|permission|imagemap|svgmap|preferred|
+                       admitted|related|deprecates|letter-symbol|domain|
+                       graphical-symbol|expression|abbreviation-type|subject|
+                       pronunciation|grammar|term|terms|termnote|termexample|
+                       termsource|origin|termref|modification)>)}x, "\\1\n")
+          .gsub(%r{(<(title|name))}x, "\n\\1")
+      end
+
       def version
         flavour = self.class.name.sub(/::Converter$/, "").sub(/^.+::/, "")
         Metanorma.versioned(Metanorma, flavour)[-1]::VERSION
@@ -110,7 +149,7 @@ module Metanorma
 
       def makexml(node)
         result = makexml1(node)
-        ret1 = cleanup(Nokogiri::XML(result))
+        ret1 = cleanup(Nokogiri::XML(insert_xml_cr(result)))
         ret1.root.add_namespace(nil, xml_namespace)
         validate(ret1) unless @novalid
         ret1

data/lib/metanorma/standoc/blocks.rb

@@ -174,11 +174,11 @@ module Metanorma
       def paragraph(node)
         return termsource(node) if node.role == "source"
 
-        noko do |xml|
+        ret = noko do |xml|
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content
           end
-        end.join("\n")
+        end.join
       end
 
       def quote_attrs(node)
@@ -203,7 +203,7 @@ module Metanorma
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
-        end.join("\n")
+        end.join
       end
 
       def listing_attrs(node)

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -56,9 +56,9 @@ module Metanorma
       TERM_CLAUSE = "//sections/terms | "\
                     "//sections/clause[descendant::terms]".freeze
 
-      NORM_REF = "//bibliography/references[@normative = 'true'] | "\
-                 "//bibliography/clause[.//references[@normative = 'true']]"
-        .freeze
+      NORM_REF =
+        "//bibliography/references[@normative = 'true'][not(@hidden)] | "\
+        "//bibliography/clause[.//references[@normative = 'true']]".freeze
 
       def boilerplate_isodoc(xmldoc)
         x = xmldoc.dup

data/lib/metanorma/standoc/cleanup_ref.rb

@@ -16,7 +16,7 @@ module Metanorma
         insert = refs&.at("./bibitem")&.previous_element
         refs.xpath("./bibitem").each(&:remove)
         bib.reverse.each do |b|
-          insert and insert.next = b.to_xml or
+          (insert and insert.next = b.to_xml) or
             refs.children.first.add_previous_sibling b.to_xml
         end
         extract_notes_from_biblio(refs)
@@ -84,9 +84,39 @@ module Metanorma
         biblio_reorder(xmldoc)
         biblio_nested(xmldoc)
         biblio_renumber(xmldoc)
+        biblio_linkonly(xmldoc)
+        biblio_hidden_inherit(xmldoc)
         biblio_no_ext(xmldoc)
       end
 
+      def biblio_hidden_inherit(xmldoc)
+        xmldoc.xpath("//references[@hidden = 'true']").each do |r|
+          r.xpath("./bibitem").each do |b|
+            b["hidden"] = true
+          end
+        end
+      end
+
+      def biblio_linkonly(xmldoc)
+        return unless xmldoc.at("//xref[@hidden]")
+
+        ins = xmldoc.at("//bibliography")
+          .add_child("<references hidden='true' normative='true'/>").first
+        refs = xmldoc.xpath("//xref[@hidden]").each_with_object([]) do |x, m|
+          @refids << x["target"]
+          m << { id: x["target"], ref: x["hidden"] }
+          x.delete("hidden")
+        end
+        ins << insert_hidden_bibitems(refs)
+      end
+
+      def insert_hidden_bibitems(bib)
+        refs = bib.each_with_object([]) do |b, m|
+          m << reference1code(%(<ref id="#{b[:id]}">[#{b[:ref]}]</ref>), nil)
+        end
+        reference_populate(refs)
+      end
+
       def biblio_no_ext(xmldoc)
         xmldoc.xpath("//bibitem/ext").each(&:remove)
       end
@@ -114,7 +144,6 @@ module Metanorma
 
       def reference_names(xmldoc)
         xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
-          # isopub = ref.at(ISO_PUBLISHER_XPATH)
           docid = ref.at("./docidentifier[@type = 'metanorma']") ||
             ref.at("./docidentifier[not(@type = 'DOI')]") or next
           reference = format_ref(docid.children.to_xml, docid["type"])

data/lib/metanorma/standoc/cleanup_ref_dl.rb

@@ -15,19 +15,20 @@ module Metanorma
         end
       end
 
-      def validate_ref_dl(bib, c)
+      def validate_ref_dl(bib, clause)
         id = bib["id"]
-        id ||= c["id"] unless /^_/.match?(c["id"]) # do not accept implicit id
+        # do not accept implicit id
+        id ||= clause["id"] unless /^_/.match?(clause["id"])
         unless id
-          @log.add("Anchors", c,
-                   "The following reference is missing an anchor:\n" + c.to_xml)
+          @log.add("Anchors", clause,
+                   "The following reference is missing an anchor:\n#{clause.to_xml}")
           return
         end
         @refids << id
         bib["title"] or
-          @log.add("Bibliography", c, "Reference #{id} is missing a title")
+          @log.add("Bibliography", clause, "Reference #{id} is missing a title")
         bib["docid"] or
-          @log.add("Bibliography", c,
+          @log.add("Bibliography", clause,
                    "Reference #{id} is missing a document identifier (docid)")
       end
 
@@ -76,27 +77,30 @@ module Metanorma
       end
 
       # definition list, with at most one level of unordered lists
-      def dl_bib_extract(c, nested = false)
-        dl = c.at("./dl") or return
+      def dl_bib_extract(clause, nested = false)
+        dl = clause.at("./dl") or return
         bib = {}
         key = ""
         dl.xpath("./dt | ./dd").each do |dtd|
           (dtd.name == "dt" and key = dtd.text.sub(/:+$/, "")) or
             add_to_hash(bib, key, dd_bib_extract(dtd))
         end
-        c.xpath("./clause").each do |c1|
+        clause.xpath("./clause").each do |c1|
           key = c1&.at("./title")&.text&.downcase&.strip
           next unless %w(contributor relation series).include? key
 
           add_to_hash(bib, key, dl_bib_extract(c1, true))
         end
-        if !nested && c.at("./title")
-          title = c.at("./title").remove.children.to_xml
-          bib["title"] = [bib["title"]] if bib["title"].is_a? Hash
-          bib["title"] = [bib["title"]] if bib["title"].is_a? String
-          bib["title"] = [] unless bib["title"]
-          bib["title"] << title if !title.empty?
-        end
+        dl_bib_extract_title(bib, clause, nested)
+      end
+
+      def dl_bib_extract_title(bib, clause, nested)
+        (!nested && clause.at("./title")) or return bib
+        title = clause.at("./title").remove.children.to_xml
+        bib["title"] = [bib["title"]] if bib["title"].is_a?(Hash) ||
+          bib["title"].is_a?(String)
+        bib["title"] = [] unless bib["title"]
+        bib["title"] << title if !title.empty?
         bib
       end
     end

data/lib/metanorma/standoc/cleanup_section.rb

@@ -54,7 +54,7 @@ module Metanorma
       end
 
       def make_bibliography(xml, sect)
-        if xml.at("//sections/references")
+        if xml.at("//sections/references | //xref[@hidden]")
           biblio = sect.add_next_sibling("<bibliography/>").first
           xml.xpath("//sections/references").each do |r|
             biblio.add_child r.remove

data/lib/metanorma/standoc/cleanup_terms_designations.rb

@@ -182,10 +182,12 @@ module Metanorma
 
       def term_designation_reorder(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          %w(preferred admitted deprecates related)
+          des = %w(preferred admitted deprecates related)
             .each_with_object([]) do |tag, m|
             t.xpath("./#{tag}").each { |x| m << x.remove }
-          end.reverse.each do |x|
+          end.reverse
+          t << " "
+          des.each do |x|
             t.children.first.previous = x
           end
         end

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -3,11 +3,12 @@ module Metanorma
     module Cleanup
       # extending localities to cover ISO referencing
       LOCALITY_REGEX_STR = <<~REGEXP.freeze
-        ^((?<locality>section|clause|part|paragraph|chapter|page|
+        ^(((?<conn>and|or|from|to)!)?
+            (?<locality>section|clause|part|paragraph|chapter|page|
                       table|annex|figure|example|note|formula|list|time|anchor|
                       locality:[^ \\t\\n\\r:,;=]+)(\\s+|=)
-               (?<ref>[^"][^ \\t\\n,:-]*|"[^"]+")
-                 (-(?<to>[^"][^ \\t\\n,:-]*|"[^"]"))?|
+               (?<ref>[^"][^ \\t\\n,:;-]*|"[^"]+")
+                 (-(?<to>[^"][^ \\t\\n,:;-]*|"[^"]"))?|
           (?<locality2>whole|locality:[^ \\t\\n\\r:,;=]+))(?<punct>[,:;]?)\\s*
          (?<text>.*)$
       REGEXP
@@ -30,16 +31,37 @@ module Metanorma
       def extract_localities1(elem, text)
         b = elem.add_child("<localityStack/>").first if LOCALITY_RE.match text
         while (m = LOCALITY_RE.match text)
-          ref = m[:ref] ? "<referenceFrom>#{tq m[:ref]}</referenceFrom>" : ""
-          refto = m[:to] ? "<referenceTo>#{tq m[:to]}</referenceTo>" : ""
-          b.add_child("<locality type='#{locality_label(m)}'>#{ref}#{refto}"\
-                      "</locality>")
+          add_locality(b, m)
           text = m[:text]
           b = elem.add_child("<localityStack/>").first if m[:punct] == ";"
         end
+        fill_in_eref_connectives(elem)
         elem.add_child(text) if text
       end
 
+      def add_locality(stack, match)
+        stack.children.empty? && match[:conn] and
+          stack["connective"] = match[:conn]
+        ref =
+          match[:ref] ? "<referenceFrom>#{tq match[:ref]}</referenceFrom>" : ""
+        refto = match[:to] ? "<referenceTo>#{tq match[:to]}</referenceTo>" : ""
+        stack.add_child("<locality type='#{locality_label(match)}'>#{ref}"\
+                        "#{refto}</locality>")
+      end
+
+      def fill_in_eref_connectives(elem)
+        return if elem.xpath("./localityStack").size < 2
+
+        elem.xpath("./localityStack[not(@connective)]").each do |l|
+          n = l.next_element
+          l["connective"] = if n && n.name == "localityStack" &&
+              n["connective"] == "to"
+                              "from"
+                            else "and"
+                            end
+        end
+      end
+
       def locality_label(match)
         loc = match[:locality] || match[:locality2]
         /^locality:/.match?(loc) ? loc : loc&.downcase
@@ -65,8 +87,48 @@ module Metanorma
       end
 
       def xref_cleanup(xmldoc)
+        xref_compound_cleanup(xmldoc)
+        xref_cleanup1(xmldoc)
+        xref_compound_wrapup(xmldoc)
+      end
+
+      def xref_compound_cleanup(xmldoc)
+        xmldoc.xpath("//xref").each do |x|
+          /;/.match?(x["target"]) or next
+          locations = x["target"].split(";")
+          x["target"] = locations.first.sub(/^[^!]*!/, "")
+          xref_compound_cleanup1(x, locations)
+        end
+      end
+
+      def xref_compound_cleanup1(xref, locations)
+        xref.children.empty? and xref.children = "<sentinel/>"
+        xref_parse_compound_locations(locations).reverse.each do |y|
+          xref.children.first.previous =
+            "<xref target='#{y[1]}' connective='#{y[0]}'/>"
+        end
+        xref&.at("./sentinel")&.remove
+      end
+
+      def xref_parse_compound_locations(locations)
+        l = locations.map { |y| y.split("!", 2) }
+        l.map.with_index do |y, i|
+          if y.size == 1
+            y.unshift(l.dig(i + 1, 0) == "to" ? "from" : "and")
+          end
+          y
+        end
+      end
+
+      def xref_compound_wrapup(xmldoc)
+        xmldoc.xpath("//xref//xref").each do |x|
+          x.name = "location"
+        end
+      end
+
+      def xref_cleanup1(xmldoc)
         xmldoc.xpath("//xref").each do |x|
-          /:/.match(x["target"]) and xref_to_internal_eref(x)
+          /:/.match?(x["target"]) and xref_to_internal_eref(x)
           next unless x.name == "xref"
 
           if refid? x["target"]

data/lib/metanorma/standoc/converter.rb

@@ -53,6 +53,7 @@ module Metanorma
         inline_macro Metanorma::Standoc::FormOptionMacro
         inline_macro Metanorma::Standoc::ToCInlineMacro
         inline_macro Metanorma::Standoc::PassInlineMacro
+        inline_macro Metanorma::Standoc::StdLinkInlineMacro
         inline_macro Metanorma::Plugin::Lutaml::LutamlFigureInlineMacro
         inline_macro Metanorma::Plugin::Lutaml::LutamlTableInlineMacro
         block_macro Metanorma::Plugin::Lutaml::LutamlDiagramBlockMacro

data/lib/metanorma/standoc/inline.rb

@@ -40,20 +40,29 @@ module Metanorma
       end
 
       def inline_anchor_xref_attrs(node)
-        m = /^(?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
-          (?<fn>fn:?\s*)?(?<text>.*)$/x.match node.text
+        m = inline_anchor_xref_match(node)
         t = node.target.gsub(/^#/, "").gsub(%r{(\.xml|\.adoc)(#.*$)}, "\\2")
         m.nil? and return { target: t, type: "inline", text: node.text }
-        droploc = m[:drop].nil? && m[:drop2].nil? ? nil : true
-        f = m[:fn].nil? ? "inline" : "footnote"
-        c = if %i[case fn drop drop2].any? do |x|
-                 !m[x].nil?
-               end
-              m[:text]
-            else node.text
-            end
-        { target: t, type: f, case: m[:case]&.sub(/%$/, ""), droploc: droploc,
-          text: c }
+        { target: t, type: m[:fn].nil? ? "inline" : "footnote",
+          case: m[:case]&.sub(/%$/, ""),
+          droploc: m[:drop].nil? && m[:drop2].nil? ? nil : true,
+          text: inline_anchor_xref_text(m, node),
+          hidden: m[:hidden] }
+      end
+
+      def inline_anchor_xref_match(node)
+        /^(hidden%(?<hidden>[^,]+),?)?
+          (?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
+          (?<fn>fn:?\s*)?(?<text>.*)$/x.match node.text
+      end
+
+      def inline_anchor_xref_text(match, node)
+        if %i[case fn drop drop2 hidden].any? do |x|
+             !match[x].nil?
+           end
+          match[:text]
+        else node.text
+        end
       end
 
       def inline_anchor_link(node)

data/lib/metanorma/standoc/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -2641,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/standoc/macros.rb

@@ -82,7 +82,7 @@ module Metanorma
             .match(l) && (ignore = !ignore)
           next if l.empty? || l.match(/ \+$/) || /^\[.*\]$/.match?(l) || ignore
           next if i == lines.size - 1 ||
-            i < lines.size - 1 && lines[i + 1].empty?
+            (i < lines.size - 1 && lines[i + 1].empty?)
 
           lines[i] += " +"
         end
@@ -201,5 +201,17 @@ module Metanorma
         %{<passthrough formats="#{format}">#{out}</passthrough>}
       end
     end
+
+    class StdLinkInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :"std-link"
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        create_anchor(parent, "hidden%#{attrs['text']}",
+                      type: :xref, target: "_#{UUIDTools::UUID.random_create}")
+      end
+    end
   end
 end

data/lib/metanorma/standoc/macros_embed.rb

@@ -56,7 +56,7 @@ module Metanorma
         lines.each_with_index.with_object([]) do |(l, i), m|
           if headings.include?(l.strip)
             skip = true
-            m.unshift while !m.empty? && /^\S/.match?(m[-1])
+            m.pop while !m.empty? && /^\S/.match?(m[-1])
           elsif skip && /^== |^embed::|^include::/.match?(l)
             skip = false
             j = i

data/lib/metanorma/standoc/ref.rb

@@ -214,18 +214,17 @@ module Metanorma
         end
       end
 
-      def reference_preproc(node)
+      def reference(node)
         refs = node.items.each_with_object([]) do |b, m|
           m << reference1code(b.text, node)
         end
+        reference_populate(refs)
+      end
+
+      def reference_populate(refs)
         results = refs.each_with_index.with_object(Queue.new) do |(ref, i), res|
           fetch_ref_async(ref.merge(ord: i), i, res)
         end
-        [refs, results]
-      end
-
-      def reference(node)
-        refs, results = reference_preproc(node)
         ret = reference_queue(refs, results)
         noko do |xml|
           ret.each { |b| reference1out(b, xml) }

data/lib/metanorma/standoc/render.rb

@@ -25,6 +25,9 @@ module Metanorma
           sectionsplit: node.attr("sectionsplit"),
           baseassetpath: node.attr("base-asset-path"),
           aligncrosselements: node.attr("align-cross-elements"),
+          tocfigures: @tocfigures,
+          toctables: @toctables,
+          tocrecommendations: @tocrecommendations,
         }
       end
 
@@ -61,12 +64,13 @@ module Metanorma
           bare: node.attr("bare"),
           baseassetpath: node.attr("base-asset-path"),
           aligncrosselements: node.attr("align-cross-elements"),
+          tocfigures: @tocfigures,
+          toctables: @toctables,
+          tocrecommendations: @tocrecommendations,
         }
 
         if fonts_manifest = node.attr(FONTS_MANIFEST)
-          attrs[IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS] = {
-            IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => fonts_manifest,
-          }
+          attrs[IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST] = fonts_manifest
         end
 
         attrs