isodoc 3.1.6 → 3.1.7

data/lib/isodoc/init.rb

@@ -143,9 +143,9 @@ module IsoDoc
       self.class::AGENCIES.include?(text)
     end
 
-    def docid_l10n(text)
+    def docid_l10n(text, citation: true)
       text.nil? and return text
-      @i18n.all_parts and text.gsub!(/All Parts/i, @i18n.all_parts.downcase)
+      docid_all_parts(text, citation)
       x = Nokogiri::XML::DocumentFragment.parse(text)
       (x.xpath(".//text()") - x.xpath(".//fn//text()")).each do |n|
         n.replace(n.text.gsub(/ /, " "))
@@ -153,10 +153,19 @@ module IsoDoc
       to_xml(x)
     end
 
+    def docid_all_parts(text, citation)
+      if citation
+        text.sub!(%r{\p{Zs}\(all\p{Zs}parts\)}, "")
+      else
+        @i18n.all_parts && !citation and
+          text.gsub!(/all\p{Zs}parts/, @i18n.all_parts.downcase)
+      end
+    end
+
     def docid_prefix(prefix, docid)
       docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix) &&
         !/^#{prefix}\b/.match(docid)
-      docid_l10n(docid)
+      docid_l10n(docid, citation: false)
     end
 
     def omit_docid_prefix(prefix)

data/lib/isodoc/presentation_function/autonum.rb

@@ -11,7 +11,7 @@ module IsoDoc
       prefix_name_postprocess(node, elem)
     end
 
-    def prefix_name_defaults(node, delims, label)
+    def prefix_name_defaults(_node, delims, label)
       label&.empty? and label = nil
       delims.nil? and delims = {}
       [label, delims]
@@ -80,7 +80,7 @@ module IsoDoc
     end
 
     def autonum(id, num)
-      /<semx/.match?(num) and return num # already contains markup
+      num.include?("<semx") and return num # already contains markup
       "<semx element='autonum' source='#{id}'>#{num}</semx>"
     end
 
@@ -135,7 +135,8 @@ module IsoDoc
     end
 
     def fmt_caption_label_wrap(label)
-      empty_xml?(label) || %r{<span class=['"]fmt-caption-label['"]}.match?(label) or
+      empty_xml?(label) ||
+        %r{<span class=['"]fmt-caption-label['"]}.match?(label) or
         label = "<span class='fmt-caption-label'>#{label}</span>"
       label
     end

data/lib/isodoc/presentation_function/block.rb

@@ -102,6 +102,7 @@ module IsoDoc
 
     def table1(elem)
       table_fn(elem)
+      table_css(elem)
       labelled_ancestor(elem) and return
       elem["unnumbered"] && !elem.at(ns("./name")) and return
       n = @xrefs.anchor(elem["id"], :label, false)
@@ -109,6 +110,16 @@ module IsoDoc
       prefix_name(elem, { caption: table_delim }, l10n(lbl), "name")
     end
 
+    def table_css(elem)
+      parser = IsoDoc::CssBorderParser::BorderParser.new
+      elem.xpath(ns(".//tr | .//th | .//td")).each do |n|
+        n["style"] or next
+        parsed_properties = parser.parse_declaration(n["style"])
+        new_style = parser.to_css_string(parsed_properties)
+        n["style"] = new_style
+      end
+    end
+
     def table_delim
       block_delim
     end
@@ -139,7 +150,7 @@ module IsoDoc
     end
 
     def source(docxml)
-      docxml.xpath(ns("//source/modification")).each do |f|
+     docxml.xpath(ns("//source/modification")).each do |f|
         source_modification(f)
       end
       docxml.xpath(ns("//table/source")).each { |f| tablesource(f) }
@@ -161,6 +172,8 @@ module IsoDoc
       elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
     end
 
+    # TODO just as termsource is duplicated in fmt-termsource to allow for changes,
+    # should double up source with fmt-source 
     def source_modification(mod)
       termsource_modification(mod.parent)
     end

data/lib/isodoc/presentation_function/concepts.rb

@@ -30,8 +30,7 @@ module IsoDoc
     end
 
     def concept_dup(node, ret)
-      node.xpath(".//xmlns:semx[xmlns:fmt-xref | xmlns:fmt-eref | " \
-        "xmlns:fmt-origin | xmlns:fmt-link]").each(&:remove)
+      concept_dup_cleanup_orig(node)
       ret.xpath(ns(".//xref | .//eref | .//origin | .//link")).each(&:remove)
       ret.xpath(ns(".//semx")).each do |s|
         s.children.empty? and s.remove
@@ -41,6 +40,16 @@ module IsoDoc
       node.next = f
     end
 
+    def concept_dup_cleanup_orig(node)
+      node.xpath(".//xmlns:semx[xmlns:fmt-xref | xmlns:fmt-eref | " \
+         "xmlns:fmt-origin | xmlns:fmt-link]").each(&:remove)
+      node.xpath(ns(".//xref | .//eref | .//origin | .//link")).each do |x|
+        x["original-id"] or next
+        x["id"] = x["original-id"]
+        x.delete("original-id")
+      end
+    end
+
     def concept1_style(node, opts)
       r = node.at(ns(".//renderterm")) or return
       opts[:ital] == "true" and r.children = "<em>#{to_xml(r.children)}</em>"
@@ -103,13 +112,9 @@ module IsoDoc
     def related1(node)
       p, ref, orig = related1_prep(node)
       label = @i18n.relatedterms[orig["type"]].upcase
-      if p && ref
-        node.children = (l10n("<p><strong>#{label}:</strong> " \
-                          "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})</p>"))
-      else
-        node.children = (l10n("<p><strong>#{label}:</strong> " \
-                          "<strong>**RELATED TERM NOT FOUND**</strong></p>"))
-      end
+      ret = "<strong>**RELATED TERM NOT FOUND**</strong>"
+      p && ref and ret = "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})"
+      node.children = (l10n("<p><strong>#{label}:</strong> #{ret}</p>"))
     end
 
     def related1_prep(node)
@@ -152,8 +157,7 @@ module IsoDoc
         .with_object([]) do |(p, i), m|
         if (i.zero? && (pref = p)) || merge_preferred_eligible?(pref, p)
           m << p
-        else
-          p.wrap("<p></p>")
+        else p.wrap("<p></p>")
         end
       end
       pref&.replace(merge_second_preferred1(out, term))
@@ -189,6 +193,8 @@ module IsoDoc
       out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
       d1 = semx_fmt_dup(desgn)
       s = d1.at(ns("./termsource"))
+      s0 = desgn.at(ns("./termsource"))
+      modification_dup_align(s0, s)
       name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
                          "./graphical-symbol")) or return
       designation_annotate(d1, name, desgn)

data/lib/isodoc/presentation_function/docid.rb

@@ -13,7 +13,8 @@ module IsoDoc
       ret = pref_ref_code_parse(bib) or return nil
       ins = bib.at(ns("./docidentifier[last()]"))
       ret.reverse_each do |r|
-        ins.next = "<docidentifier scope='biblio-tag'>#{docid_l10n(r)}</docidentifier>"
+        id = docid_l10n(r, citation: false)
+        ins.next = "<docidentifier scope='biblio-tag'>#{id}</docidentifier>"
       end
       ret
     end

data/lib/isodoc/presentation_function/erefs.rb

@@ -15,7 +15,7 @@ module IsoDoc
     end
 
     def citeas_cleanup(ref)
-      if /</.match?(ref)
+      if ref.include?("<")
         xml = Nokogiri::XML("<root>#{ref}</root>")
         xml.xpath("//semx").each { |x| x.replace(x.children) }
         ref = to_xml(xml.at("//root").children)

data/lib/isodoc/presentation_function/image.rb

@@ -24,11 +24,10 @@ module IsoDoc
     end
 
     def svgmap_extract(elem)
-      if elem.at(ns("./figure"))# then elem.replace(f)
+      if elem.at(ns("./figure"))
         n = semx_fmt_dup(elem)
         n.xpath(ns("./target")).each(&:remove)
         elem.next = n
-      #else elem.remove
       end
     end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -71,13 +71,19 @@ module IsoDoc
     # do not change to Presentation XML rendering
     def sem_xml_descendant?(node)
       ancestor_names = node.ancestors.map(&:name)
-
-      return true if %w[preferred admitted deprecated related definition termsource].any? { |name| ancestor_names.include?(name) }
-      return true if %w[xref eref origin link name title].any? { |name| ancestor_names.include?(name) }
-      return true if ancestor_names.include?("bibitem") &&
-        !%w[formattedref biblio-tag].any? { |name| ancestor_names.include?(name) }
-      return true if (ancestor_names & %w[requirement recommendation permission]).any? &&
-        !ancestor_names.include?("fmt-provision")
+      %w[preferred admitted deprecated related definition termsource]
+        .any? do |name|
+        ancestor_names.include?(name)
+      end and return true
+      %w[xref eref origin link name title].any? do |name|
+        ancestor_names.include?(name)
+      end and return true
+      ancestor_names.include?("bibitem") &&
+        %w[formattedref biblio-tag].none? do |name|
+          ancestor_names.include?(name)
+        end and return true
+      (ancestor_names & %w[requirement recommendation permission]).any? &&
+        !ancestor_names.include?("fmt-provision") and return true
 
       false
     end

data/lib/isodoc/presentation_function/math.rb

@@ -50,41 +50,37 @@ module IsoDoc
                                   precision: num_precision(num.text))
     end
 
-    def numberformat_extract(options)
-      options.gsub!(/([a-z_]+)='/, %('\\1=))
-      
-      # Temporarily replace commas inside quotes with a placeholder
+    COMMA_PLACEHOLDER = "##COMMA##".freeze
+
+    # Temporarily replace commas inside quotes with a placeholder
+    def comma_placeholder(options)
       processed = ""
       in_quotes = false
-      placeholder = "##COMMA##"
-      
       options.each_char do |c|
-        if c == "'"
-          in_quotes = !in_quotes
-        end
-        
-        if c == ',' && in_quotes
-          processed << placeholder
-        else
-          processed << c
-        end
+        c == "'" and in_quotes = !in_quotes
+        processed << if c == "," && in_quotes
+                       COMMA_PLACEHOLDER
+                     else c end
       end
-      
-      result = CSV.parse_line(processed, quote_char: "'").each_with_object({}) do |x, acc|
-        # Restore commas from placeholders
-        x.gsub!(placeholder, ',')
+      processed
+    end
+
+    def numberformat_extract(options)
+      options.gsub!(/([a-z_]+)='/, %('\\1=))
+      processed = comma_placeholder(options)
+      CSV.parse_line(processed,
+                     quote_char: "'").each_with_object({}) do |x, acc|
+        x.gsub!(COMMA_PLACEHOLDER, ",")
         m = /^(.+?)=(.+)?$/.match(x) or next
         acc[m[1].to_sym] = m[2].sub(/^(["'])(.+)\1$/, "\\2")
       end
-      
-      result
     end
 
     def numberformat_type(ret)
       %i(precision significant digit_count group_digits fraction_group_digits)
         .each do |i|
-        ret[i] &&= ret[i].to_i
-      end
+          ret[i] &&= ret[i].to_i
+        end
       %i(notation exponent_sign number_sign locale).each do |i|
         ret[i] &&= ret[i].to_sym
       end

data/lib/isodoc/presentation_function/section.rb

@@ -6,8 +6,8 @@ module IsoDoc
     def clause(docxml)
       docxml.xpath(ns("//clause | //terms | //definitions | //references | " \
                       "//introduction | //foreword | //preface/abstract | " \
-                      "//acknowledgements | //colophon | //indexsect "))
-        .each do |f|
+                      "//acknowledgements | //colophon | //indexsect | " \
+                      "//executivesummary | //appendix")).each do |f|
         f.parent.name == "annex" &&
           @xrefs.klass.single_term_clause?(f.parent) and next
         clause1(f)
@@ -133,14 +133,15 @@ module IsoDoc
     end
 
     def preface_rearrange(doc)
-      preface_move(doc.xpath(ns("//preface/abstract")),
-                   %w(foreword introduction clause acknowledgements), doc)
-      preface_move(doc.xpath(ns("//preface/foreword")),
-                   %w(introduction clause acknowledgements), doc)
-      preface_move(doc.xpath(ns("//preface/introduction")),
-                   %w(clause acknowledgements), doc)
-      preface_move(doc.xpath(ns("//preface/acknowledgements")),
-                   %w(), doc)
+      [["//preface/abstract",
+        %w(foreword introduction clause acknowledgements executivesummary)],
+       ["//preface/foreword",
+        %w(introduction clause acknowledgements executivesummary)],
+       ["//preface/introduction", %w(clause acknowledgements executivesummary)],
+       ["//preface/acknowledgements", %w(executivesummary)],
+       ["//preface/executivesummary", %w()]].each do |x|
+        preface_move(doc.xpath(ns(x[0])), x[1], doc)
+      end
     end
 
     def preface_move(clauses, after, _doc)

data/lib/isodoc/presentation_function/terms.rb

@@ -1,9 +1,11 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
+    DESIGNATION_ELEMS =
+      %w(preferred admitted deprecates related definition termsource).freeze
+
     def termcontainers(docxml)
       docxml.xpath(ns("//term")).each do |t|
-        %w(preferred admitted deprecates related definition termsource)
-          .each do |w|
+        DESIGNATION_ELEMS.each do |w|
           d = t.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
         end
       end
@@ -14,8 +16,7 @@ module IsoDoc
 
     def termcleanup(docxml)
       docxml.xpath(ns("//term")).each do |t|
-        %w(preferred admitted deprecates related definition termsource)
-          .each do |w|
+        DESIGNATION_ELEMS.each do |w|
           t.xpath(ns("./#{w}//fmt-name | ./#{w}//fmt-xref-label")).each(&:remove)
           f = t.at(ns(".//fmt-#{w}"))
           f&.children&.empty? and f.remove
@@ -55,7 +56,12 @@ module IsoDoc
       else singledef(elem, d, d1)
       end
       unwrap_definition(elem, d1)
-      termdomain(elem, d1)
+s1 = d.xpath(ns(".//termsource"))
+s2 = d1.xpath(ns(".//termsource"))
+s1.each_with_index do |s, i|
+      modification_dup_align(s, s2[i])
+end
+termdomain(elem, d1)
     end
 
     def multidef(_elem, defn, fmt_defn)
@@ -104,21 +110,35 @@ module IsoDoc
 
     def termsource_designation(fmtsource)
       p = fmtsource.previous_element
-          p&.name == "p" or return
-          p << " "
-          p << fmtsource.children
+      p&.name == "p" or return
+      p << " "
+      p << fmtsource.children
     end
 
     def copy_baselevel_termsource(docxml)
+      docxml.xpath(ns("//term//modification")).each do |f|
+        f["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      end
       docxml.xpath(ns("//term[termsource]")).each do |x|
         s = x.xpath(ns("./termsource"))
         s1 = x.at(ns("./fmt-termsource"))
-        s.each { |ss| s1 << ss.clone }
+        s.each do |ss|
+          dup = ss.clone
+          modification_dup_align(ss, dup)
+          s1 << dup
+        end
         strip_duplicate_ids(nil, s, s1)
         %w(status type).each { |a| s[0][a] and s1[a] = s[0][a] }
       end
     end
 
+    def modification_dup_align(sem, pres)
+      m = sem&.at(ns("./modification")) or return
+      m1 = pres.at(ns("./modification"))
+      new_m1 = semx_fmt_dup(m)
+      m1.replace("<modification>#{to_xml(new_m1)}</modification>")
+    end
+
     def termsource1(elem)
       ret = [semx_fmt_dup(elem)]
       while elem&.next_element&.name == "termsource"
@@ -136,7 +156,8 @@ module IsoDoc
       elem.xpath(".//text()[normalize-space() = '']").each(&:remove)
       origin = elem.at(ns("./origin"))
       s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
-      termsource_add_modification_text(elem.at(ns("./modification")))
+      mod = elem.at(ns("./modification")) or return
+      termsource_add_modification_text(mod)
     end
 
     def termsource_add_modification_text(mod)
@@ -146,8 +167,9 @@ module IsoDoc
         return
       end
       mod.previous = " &#x2014; "
-      mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children)
-      mod.replace(semx_fmt_dup(mod))
+      c = mod.at(ns("./semx" )) || mod
+      c.elements.size == 1 and c.children = to_xml(c.elements[0].children)
+      mod.replace(mod.children)
     end
 
     def termsource_status(status)

data/lib/isodoc/presentation_function/title.rb

@@ -41,9 +41,8 @@ module IsoDoc
         %w(note admonition p floating-title).include?(p.name) or break m
         m << p
       end
-      #require 'debug'; out.empty? or binding.b
       out.reject { |c| c["displayorder"] }.reverse_each do |c|
-          skip_display_order?(c) and next
+        skip_display_order?(c) and next
         c["displayorder"] = idx
         idx += 1
       end

data/lib/isodoc/presentation_function/xrefs.rb

@@ -26,8 +26,8 @@ module IsoDoc
     end
 
     def anchor_value(id)
-      @xrefs.anchor(id, :bare_xref) || @xrefs.anchor(id, :label) ||
-        @xrefs.anchor(id, :value) || @xrefs.anchor(id, :xref)
+      @xrefs.anchor(id, :bare_xref) || @xrefs.anchor(id, :value) ||
+        @xrefs.anchor(id, :label) || @xrefs.anchor(id, :xref)
     end
 
     def anchor_linkend(node, linkend)

data/lib/isodoc/presentation_xml_convert.rb

@@ -73,6 +73,9 @@ module IsoDoc
 
     def idref_validate(doc)
       @log or return
+      doc.xpath("//*[@original-id]").each do |x|
+        @doc_ids[x["original-id"]] = x.line
+      end
       IDREF.each do |e|
         doc.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
           idref_validate1(x, e[1])

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.6".freeze
+  VERSION = "3.1.7".freeze
 end

data/lib/isodoc/word_function/comments.rb

@@ -29,7 +29,7 @@ module IsoDoc
             s2.a style: "mso-comment-reference:SMC_#{fnote};" \
                             "mso-comment-date:#{node['date'].gsub(/[:-]+/,
                                                                   '')}"
-            s2.span style: "mso-special-character:comment", target: fnote # do |s|
+            s2.span style: "mso-special-character:comment", target: fnote
           end
         end
       end
@@ -126,7 +126,6 @@ module IsoDoc
       end
 
       def insert_comment_cont(from, upto, target)
-        # includes_to = from.at(".//*[@id='#{upto}']")
         while !from.nil? && from["id"] != upto
           following = from.xpath("./following::*")
           (from = following.shift) && incl_to = from.at(".//*[@id='#{upto}']")

data/lib/isodoc/word_function/inline.rb

@@ -61,7 +61,7 @@ module IsoDoc
       end
 
       def xref_parse(node, out)
-        target = if /#/.match?(node["target"])
+        target = if node["target"].include?("#")
                    node["target"].sub("#", ".doc#")
                  else
                    "##{node['target']}"

data/lib/isodoc/word_function/postprocess.rb

@@ -63,7 +63,6 @@ module IsoDoc
         word_section_breaks(docxml)
         word_tab_clean(docxml)
         authority_cleanup(docxml)
-        #word_footnote_format(docxml)
         word_remove_empty_toc(docxml)
         word_remove_empty_sections(docxml)
         docxml

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -100,22 +100,13 @@ module IsoDoc
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
             "formula", { unnumb: t["unnumbered"], container: true }
           )
+          @anchors[t["id"]][:bare_xref] = @anchors[t["id"]][:label]
         end
       end
 
-      FIRST_LVL_REQ_RULE = <<~XPATH.freeze
-        [not(ancestor::permission or ancestor::requirement or ancestor::recommendation)]
-      XPATH
-      FIRST_LVL_REQ = <<~XPATH.freeze
-        .//permission#{FIRST_LVL_REQ_RULE} | .//requirement#{FIRST_LVL_REQ_RULE} | .//recommendation#{FIRST_LVL_REQ_RULE}
-      XPATH
-      REQ_CHILDREN = <<~XPATH.freeze
-        ./permission | ./requirement | ./recommendation
-      XPATH
-
       def sequential_permission_names(clause, container: true)
         c = ReqCounter.new
-        clause.xpath(ns(FIRST_LVL_REQ)).noblank.each do |t|
+        clause.xpath(ns(first_lvl_req)).noblank.each do |t|
           m = @reqt_models.model(t["model"])
           klass, label = reqt2class_label(t, m)
           id = c.increment(label, t).print
@@ -127,7 +118,7 @@ module IsoDoc
 
       def sequential_permission_children(elem, lbl, klass, container: false)
         c = ReqCounter.new
-        elem.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
+        elem.xpath(ns(req_children)).noblank.each do |t|
           m = @reqt_models.model(t["model"])
           klass, label = reqt2class_nested_label(t, m)
           ctr = c.increment(label, t).print
@@ -177,14 +168,6 @@ container: false)
         [nil, nil]
       end
 
-      # container makes numbering be prefixed with the parent clause reference
-      def sequential_asset_names(clause, container: false)
-        sequential_table_names(clause, container:)
-        sequential_figure_names(clause, container:)
-        sequential_formula_names(clause, container:)
-        sequential_permission_names(clause, container:)
-      end
-
       # these can take a NodeSet as argument; semx will point to members of the NodeSet,
       # but numbering will be consecutive
       def hierarchical_figure_names(clauses, num)
@@ -229,23 +212,16 @@ container: false)
         end
       end
 
-      def hierarchical_asset_names(clause, num)
-        hierarchical_table_names(clause, num)
-        hierarchical_figure_names(clause, num)
-        hierarchical_formula_names(clause, num)
-        hierarchical_permission_names(clause, num)
-      end
-
       def hierarchical_formula_names(clauses, num)
         c = Counter.new
         nodeSet(clauses).each do |clause|
           clause.xpath(ns(".//formula")).noblank.each do |t|
             @anchors[t["id"]] = anchor_struct(
-              # "#{num}#{hier_separator}#{c.increment(t).print}", t,
               hiersemx(clause, num, c.increment(t), t), t,
               t["inequality"] ? @labels["inequality"] : @labels["formula"],
               "formula", { unnumb: t["unnumbered"], container: false }
             )
+            @anchors[t["id"]][:bare_xref] = @anchors[t["id"]][:label]
           end
         end
       end
@@ -253,10 +229,9 @@ container: false)
       def hierarchical_permission_names(clauses, num)
         c = ReqCounter.new
         nodeSet(clauses).each do |clause|
-          clause.xpath(ns(FIRST_LVL_REQ)).noblank.each do |t|
+          clause.xpath(ns(first_lvl_req)).noblank.each do |t|
             m = @reqt_models.model(t["model"])
             klass, label = reqt2class_label(t, m)
-            # id = "#{num}#{hier_separator}#{c.increment(label, t).print}"
             id = hiersemx(clause, num, c.increment(label, t), t)
             sequential_permission_body(id, nil, t, label, klass, m,
                                        container: false)

data/lib/isodoc/xref/xref_sect_asset.rb

@@ -0,0 +1,44 @@
+module IsoDoc
+  module XrefGen
+    module Sections
+      # preempt clause notes with all other types of note (ISO default)
+      def asset_anchor_names(doc)
+        (@parse_settings.empty? || @parse_settings[:assets]) or return
+        middle_section_asset_names(doc)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
+        note_anchor_names(doc.xpath(ns("//table | //figure")))
+        sections = doc.xpath(ns(sections_xpath))
+        note_anchor_names(sections)
+        admonition_anchor_names(sections)
+        example_anchor_names(sections)
+        list_anchor_names(sections)
+        deflist_anchor_names(sections)
+        bookmark_anchor_names(doc)
+      end
+
+      def middle_section_asset_names(doc)
+        middle_sections =
+          "//clause[@type = 'scope'] | #{@klass.norm_ref_xpath} | " \
+          "//sections/terms | //preface/* | " \
+          "//sections/definitions | //clause[parent::sections]"
+        sequential_asset_names(doc.xpath(ns(middle_sections)))
+      end
+
+      # container makes numbering be prefixed with the parent clause reference
+      def sequential_asset_names(clause, container: false)
+        sequential_table_names(clause, container:)
+        sequential_figure_names(clause, container:)
+        sequential_formula_names(clause, container:)
+        sequential_permission_names(clause, container:)
+      end
+
+      def hierarchical_asset_names(clause, num)
+        hierarchical_table_names(clause, num)
+        hierarchical_figure_names(clause, num)
+        hierarchical_formula_names(clause, num)
+        hierarchical_permission_names(clause, num)
+      end
+    end
+  end
+end