metanorma-standoc 3.0.7 → 3.0.9

data/lib/metanorma/standoc/macros_form.rb

@@ -4,9 +4,15 @@ module Metanorma
       use_dsl
       named :input
 
+      def map_attr_name(attr)
+        attr == "id" ? "anchor" : attr
+      end
+
       def process(_parent, target, attr)
         m = %w(id name value disabled readonly checked maxlength minlength)
-          .map { |a| attr[a] ? " #{a}='#{attr[a]}'" : nil }.compact
+          .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
+          .compact
+        m << " id='_#{UUIDTools::UUID.random_create}'"
         %{<input type='#{target}' #{m.join}/>}
       end
     end
@@ -27,9 +33,15 @@ module Metanorma
       named :textarea
       using_format :short
 
+      def map_attr_name(attr)
+        attr == "id" ? "anchor" : attr
+      end
+
       def process(_parent, _target, attr)
         m = %w(id name rows cols value)
-          .map { |a| attr[a] ? " #{a}='#{attr[a]}'" : nil }.compact
+          .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
+          .compact
+        m << " id='_#{UUIDTools::UUID.random_create}'"
         %{<textarea #{m.join}/>}
       end
     end
@@ -39,9 +51,15 @@ module Metanorma
       named :select
       using_format :short
 
+      def map_attr_name(attr)
+        attr == "id" ? "anchor" : attr
+      end
+
       def process(parent, _target, attr)
         m = %w(id name size disabled multiple value)
-          .map { |a| attr[a] ? " #{a}='#{attr[a]}'" : nil }.compact
+          .map { |a| attr[a] ? " #{map_attr_name(a)}='#{attr[a]}'" : nil }
+          .compact
+        m << " id='_#{UUIDTools::UUID.random_create}'"
         out = Asciidoctor::Inline.new(parent, :quoted, attr["text"]).convert
         %{<select #{m.join}>#{out}</select>}
       end

data/lib/metanorma/standoc/macros_inline.rb

@@ -58,6 +58,30 @@ module Metanorma
       end
     end
 
+    class AnchorInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :anchor
+      parse_content_as :text
+
+      def process(parent, target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        id = "_#{UUIDTools::UUID.random_create}"
+        %{<span id='#{id}' anchor='#{target}'>#{out}</span>}
+      end
+    end
+
+    class SourceIdInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :"source-id"
+      parse_content_as :text
+
+      def process(parent, target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        id = "_#{UUIDTools::UUID.random_create}"
+        %{<span id='#{id}' source='#{target}'>#{out}</span>}
+      end
+    end
+
     class VariantInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :lang
@@ -117,7 +141,6 @@ module Metanorma
       parse_content_as :text
 
       def process(parent, target, attrs)
-        #require "debug"; binding.b
         format = target || "metanorma"
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
           .gsub(/((?![<>&])[[:punct:]])/, "\\1&#x200c;")

data/lib/metanorma/standoc/macros_link.rb

@@ -68,13 +68,21 @@ module Metanorma
 
       def process(parent, _target, attrs)
         t = attrs["text"]
-        t = if /,/.match?(t)
+        t = if t.include?(",")
               t.sub(/,/, "%")
-            else
-              "#{t}%"
+            else "#{t}%"
             end
-        create_anchor(parent, "hidden=#{t}",
-                      type: :xref, target: "_#{UUIDTools::UUID.random_create}")
+        target = attrs["text"].sub(/,.*$/, "").gsub(":", "_") # special char
+        create_anchor(parent, "hidden=#{t}", type: :xref, target: target)
+      end
+    end
+
+    class SourceIncludeInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :source_include
+
+      def process(_parent, target, _attrs)
+        "<source-include path='#{target}'/>"
       end
     end
   end

data/lib/metanorma/standoc/macros_plantuml.rb

@@ -15,8 +15,13 @@ module Metanorma
         end
       end
 
-      def self.run(umlfile, outfile)
-        system "#{plantuml_bin} #{umlfile.path}" or (warn $? and return false)
+      def self.run(umlfile, outfile, fmt)
+        valid_formats = %w[png svg eps]
+        unless valid_formats.include?(fmt)
+          raise ArgumentError, "Invalid format: #{fmt}. Allowed formats are: #{valid_formats.join(', ')}"
+        end
+        system(plantuml_bin, umlfile.path, "-t#{fmt}") or
+          (warn $? and return false)
         i = 0
         until !Gem.win_platform? || File.exist?(outfile) || i == 15
           sleep(1)
@@ -34,16 +39,24 @@ module Metanorma
       # Windows Ruby 2.4 will crash if a Tempfile is "mv"ed.
       # This is why we need to copy and then unlink.
       def self.generate_file(parent, reader)
-        ldir = localdir(parent)
-        imagesdir = parent.document.attr("imagesdir")
-        umlfile, outfile = save_plantuml parent, reader, ldir
-        run(umlfile, outfile) or
+        ldir, imagesdir, fmt = generate_file_prep(parent)
+        umlfile, outfile = save_plantuml parent, reader, ldir, fmt
+        run(umlfile, outfile, fmt) or
           raise "No image output from PlantUML (#{umlfile}, #{outfile})!"
         umlfile.unlink
-        path = path_prep(ldir, imagesdir)
+        absolute_path, relative_path = path_prep(ldir, imagesdir)
         filename = File.basename(outfile.to_s)
-        FileUtils.cp(outfile, path) and outfile.unlink
-        imagesdir ? filename : File.join(path, filename)
+        FileUtils.cp(outfile, absolute_path) and outfile.unlink
+        #imagesdir ? filename : File.join(path, filename)
+        File.join(relative_path, filename)
+      end
+
+      def self.generate_file_prep(parent)
+        ldir = localdir(parent)
+        imagesdir = parent.document.attr("imagesdir")
+        fmt = parent.document.attr("plantuml-image-format")&.strip&.downcase ||
+          "png"
+        [ldir, imagesdir, fmt]
       end
 
       def self.localdir(parent)
@@ -54,21 +67,22 @@ module Metanorma
       end
 
       def self.path_prep(localdir, imagesdir)
-        path = Pathname.new(localdir) + (imagesdir || "plantuml")
+        #path = Pathname.new(localdir) + (imagesdir || "plantuml")
+        path = Pathname.new(File.join(localdir, "_plantuml_images"))
+        sourcepath = imagesdir ? File.join(localdir, imagesdir) : localdir
         path.mkpath
         File.writable?(path) or
           raise "Destination path #{path} not writable for PlantUML!"
-        # File.exist?(path) or raise "Destination path #{path} already exists for PlantUML!"
-        path
+        [path, Pathname.new(path).relative_path_from(Pathname.new(sourcepath)).to_s]
       end
 
-      def self.save_plantuml(_parent, reader, _localdir)
+      def self.save_plantuml(_parent, reader, _localdir, fmt)
         src = prep_source(reader)
         /^@startuml (?<fn>[^\n]+)\n/ =~ src
         Tempfile.open(["plantuml", ".pml"], encoding: "utf-8") do |f|
           f.write(src)
           [f, File.join(File.dirname(f.path),
-                        "#{fn || File.basename(f.path, '.pml')}.png")]
+                        "#{fn || File.basename(f.path, '.pml')}.#{fmt}")]
         end
       end
 

data/lib/metanorma/standoc/ref.rb

@@ -131,8 +131,8 @@ module Metanorma
 
       def refitem_render(xml, match, code)
         xml.bibitem **attr_code(
-          id: match[:anchor], suppress_identifier: code[:dropid],
-          hidden: code[:hidden]
+          anchor: match[:anchor], suppress_identifier: code[:dropid],
+          hidden: code[:hidden], id: "_#{UUIDTools::UUID.random_create}"
         ) do |t|
           refitem_render_formattedref(t, match[:text])
           yr_match = refitem1yr(code[:id])

data/lib/metanorma/standoc/ref_sect.rb

@@ -76,7 +76,7 @@ module Metanorma
           @log.add("Bibliography", nil,
                    "ERROR: No title retrieved for #{code}")
           !fmt and
-          xml.root << "<title>#{title || '(MISSING TITLE)'}</title>"
+            xml.root << "<title>#{title || '(MISSING TITLE)'}</title>"
         end
         fmt and xml.root << "<formattedref>#{title}</formattedref>"
       end

data/lib/metanorma/standoc/ref_utility.rb

@@ -32,7 +32,8 @@ module Metanorma
       end
 
       def use_my_anchor(ref, id, opt)
-        ref.parent.elements.last["id"] = id
+        ref.parent.elements.last["anchor"] = id
+        add_id(ref.parent.elements.last)
         a = opt[:hidden] and ref.parent.elements.last["hidden"] = a
         a = opt[:dropid] and
           ref.parent.elements.last["suppress_identifier"] = a
@@ -195,8 +196,8 @@ module Metanorma
 
       def ref_attributes(match)
         code = analyse_ref_code(match[:code])
-
-        { id: match[:anchor], type: "standard",
+        { anchor: match[:anchor], id: "_#{UUIDTools::UUID.random_create}",
+          type: "standard",
           suppress_identifier: code[:dropid] || nil }
       end
 

data/lib/metanorma/standoc/section.rb

@@ -11,13 +11,12 @@ module Metanorma
       @norm_ref = false
 
       def section_attributes(node)
-        ret =
-          { id: Metanorma::Utils::anchor_or_uuid(node),
-            unnumbered: node.option?("unnumbered") ? "true" : nil,
-            annex: role_style(node, "appendix") && node.level == 1 ? true : nil,
+        ret = id_unnum_attrs(node).merge(
+          { annex: role_style(node, "appendix") && node.level == 1 ? true : nil,
             colophon: role_style(node, "colophon") ? true : nil,
-            preface: role_style(node, "preface") ? true : nil }
-        %w(language script number branch-number type tag keeptitle
+            preface: role_style(node, "preface") ? true : nil },
+        )
+        %w(language script branch-number type tag keeptitle
            multilingual-rendering).each do |k|
           a = node.attr(k) and ret[k.to_sym] = a
         end
@@ -36,8 +35,8 @@ module Metanorma
         a = section_attributes(node)
         noko do |xml|
           case sectiontype(node)
-          when "misc-container", "metanorma-extension"
-            misccontainer_parse(a, xml, node)
+          when "metanorma-extension"
+            metanorma_extension_parse(a, xml, node)
           when "introduction" then introduction_parse(a, xml, node)
           when "foreword" then foreword_parse(a, xml, node)
           when "scope" then scope_parse(a, xml, node)
@@ -97,8 +96,8 @@ module Metanorma
         end
       end
 
-      def misccontainer_parse(_attrs, xml, node)
-        xml.send :"misc-container-clause" do |xml_section|
+      def metanorma_extension_parse(_attrs, xml, node)
+        xml.send :"metanorma-extension-clause" do |xml_section|
           xml_section << node.content
         end
       end

data/lib/metanorma/standoc/sectiontype.rb

@@ -14,7 +14,9 @@ module Metanorma
       def sectiontype(node, level = true)
         ret = sectiontype1(node)
         ret1 = preface_main_filter(sectiontype_streamline(ret), node)
-        ret1 == "symbols and abbreviated terms" and return ret1
+        # permit multiple instances
+        ["symbols and abbreviated terms",
+         "metanorma-extension"].include?(ret1) and return ret1
         !level || node.level == 1 || node.attr("heading") or return nil
         !node.attr("heading") && @seen_headers.include?(ret) and return nil
         @seen_headers << ret unless ret1.nil?
@@ -22,31 +24,37 @@ module Metanorma
         ret1
       end
 
+      SECTIONTYPE_STREAMLINE =
+        { "terms and definitions":
+          ["terms, definitions, symbols and abbreviated terms",
+           "terms, definitions, symbols and abbreviations",
+           "terms, definitions and symbols",
+           "terms, definitions and abbreviations",
+           "terms, definitions and abbreviated terms",
+           "terms and definitions"],
+          "symbols and abbreviated terms":
+        ["symbols and abbreviated terms",
+         "symbols", "abbreviated terms", "abbreviations",
+         "symbols and abbreviations",
+         "symbols and abbreviated terms"],
+          "acknowledgements":
+        ["acknowledgements", "acknowledgments"],
+          "executivesummary":
+          ["executive summary", "executive-summary",
+           "executive_summary"],
+          "metanorma-extension":
+       ["misc-container", "metanorma-extension"] }.freeze
+
       def sectiontype_streamline(ret)
-        case ret
-        when "terms and definitions",
-          "terms, definitions, symbols and abbreviated terms",
-          "terms, definitions, symbols and abbreviations",
-          "terms, definitions and symbols",
-          "terms, definitions and abbreviations",
-          "terms, definitions and abbreviated terms"
-          "terms and definitions"
-        when "symbols and abbreviated terms",
-          "symbols", "abbreviated terms", "abbreviations",
-          "symbols and abbreviations"
-          "symbols and abbreviated terms"
-        when "acknowledgements", "acknowledgments"
-          "acknowledgements"
-        when "executive summary", "executive-summary", "executive_summary"
-          "executivesummary"
-        else
-          ret
+        SECTIONTYPE_STREAMLINE.each do |k, v|
+          v.include?(ret) and return k.to_s
         end
+        ret
       end
 
       PREFACE_CLAUSE_NAMES =
         %w(abstract foreword introduction metanorma-extension termdocsource
-           misc-container metanorma-extension acknowledgements executivesummary)
+           metanorma-extension acknowledgements executivesummary)
           .freeze
 
       MAIN_CLAUSE_NAMES =

data/lib/metanorma/standoc/table.rb

@@ -3,11 +3,8 @@ module Metanorma
     module Table
       def table_attrs(node)
         keep_attrs(node)
-          .merge(id: Metanorma::Utils::anchor_or_uuid(node),
-                 headerrows: node.attr("headerrows"),
-                 unnumbered: node.option?("unnumbered") ? "true" : nil,
-                 number: node.attr("number"),
-                 subsequence: node.attr("subsequence"),
+          .merge(id_unnum_attrs(node))
+          .merge(headerrows: node.attr("headerrows"),
                  alt: node.attr("alt"),
                  summary: node.attr("summary"),
                  width: node.attr("width"))
@@ -28,11 +25,9 @@ module Metanorma
       private
 
       def colgroup(node, xml_table)
-        return if node.option? "autowidth"
-
-        cols = node&.attr("cols")&.split(/,/) or return
-        return unless (cols.size > 1) && cols.all? { |c| /\d/.match(c) }
-
+        node.option? "autowidth" and return
+        cols = node.attr("cols")&.split(",") or return
+        (cols.size > 1) && cols.all? { |c| /\d/.match(c) } or return
         xml_table.colgroup do |cg|
           node.columns.each do |col|
             cg.col width: "#{col.attr 'colpcwidth'}%"
@@ -57,9 +52,10 @@ module Metanorma
       end
 
       def table_cell(node, xml_tr, tblsec)
-        cell_attributes =
-          { id: node.id, colspan: node.colspan, valign: node.attr("valign"),
-            rowspan: node.rowspan, align: node.attr("halign") }
+        cell_attributes = id_attr(node).merge(
+          { colspan: node.colspan, valign: node.attr("valign"),
+            rowspan: node.rowspan, align: node.attr("halign") },
+        )
         cell_tag = "td"
         cell_tag = "th" if tblsec == :head || node.style == :header
         xml_tr.send cell_tag, **attr_code(cell_attributes) do |thd|

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -16,7 +16,7 @@ module Metanorma
         @unique_designs = {}
         @c = HTMLEntities.new
         @terms_tags = xmldoc.xpath("//terms").each_with_object({}) do |t, m|
-          m[t["id"]] = true
+          m[t["anchor"]] = true
         end
       end
 
@@ -29,6 +29,7 @@ module Metanorma
         related_cleanup
         remove_missing_refs
         concept_cleanup2
+        anchor_to_id
       end
 
       private
@@ -36,7 +37,7 @@ module Metanorma
       def unique_designators
         ret = xmldoc
           .xpath("//preferred/expression/name | //admitted/expression/name | " \
-                 "//deprecated/expression/name").each_with_object({}) do |n, m|
+                 "//deprecates/expression/name").each_with_object({}) do |n, m|
           m[n.text] ||= 0
           m[n.text] += 1
         end
@@ -69,9 +70,9 @@ module Metanorma
       end
 
       def populate_idhash
-        xmldoc.xpath("//*[@id]").each_with_object({}) do |n, mem|
-          /^(term|symbol)-/.match?(n["id"]) or next
-          mem[n["id"]] = true
+        xmldoc.xpath("//*[@anchor]").each_with_object({}) do |n, mem|
+          /^(term|symbol)-/.match?(n["anchor"]) or next
+          mem[n["anchor"]] = true
         end
       end
 
@@ -207,18 +208,18 @@ module Metanorma
 
       def norm_id_memorize_init(node, res_table, selector, prefix, use_domain)
         term_text = norm_ref_id(node, selector, use_domain) or return
-        unless AUTO_GEN_ID_REGEXP.match(node["id"]).nil? && !node["id"].nil?
+        unless AUTO_GEN_ID_REGEXP.match(node["anchor"]).nil? && !node["anchor"].nil?
           id = unique_text_id(term_text, prefix)
-          node["id"] = id
+          node["anchor"] = id
           @idhash[id] = true
         end
-        res_table[term_text] = node["id"]
+        res_table[term_text] = node["anchor"]
       end
 
       def memorize_other_pref_terms(node, res_table, text_selector, use_domain)
         node.xpath(text_selector).each_with_index do |p, i|
           i.positive? or next
-          res_table[norm_ref_id1(p, use_domain ? node : nil)] = node["id"]
+          res_table[norm_ref_id1(p, use_domain ? node : nil)] = node["anchor"]
         end
       end
 
@@ -255,6 +256,13 @@ module Metanorma
         end
       end
 
+      def anchor_to_id
+        xmldoc.xpath("//*[@anchor]").each do |n|
+          /^(term|symbol)-/.match?(n["anchor"]) or next
+          n["id"] or add_id(n)
+        end
+      end
+
       include ::Metanorma::Standoc::Utils
     end
   end

data/lib/metanorma/standoc/terms.rb

@@ -157,7 +157,7 @@ module Metanorma
       def termsource(node)
         matched = extract_termsource_refs(node.content, node) or return
         noko do |xml|
-          xml.termsource **termsource_attrs(node, matched) do |xml_t|
+          xml.source **termsource_attrs(node, matched) do |xml_t|
             seen_xref = Nokogiri::XML.fragment(matched[:xref])
             add_term_source(node, xml_t, seen_xref, matched)
           end

data/lib/metanorma/standoc/utils.rb

@@ -35,6 +35,10 @@ module Metanorma
         Metanorma::Utils::attr_code(attributes)
       end
 
+      def add_id(node)
+        node["id"] = "_#{UUIDTools::UUID.random_create}"
+      end
+
       def csv_split(text, delim = ";")
         Metanorma::Utils::csv_split(@c.decode(text), delim)
           .map { |x| @c.encode(x, :basic, :hexadecimal) }

data/lib/metanorma/standoc/validate.rb

@@ -12,7 +12,7 @@ module Metanorma
     module Validate
       def content_validate(doc)
         @doctype = doc.at("//bibdata/ext/doctype")&.text
-        repeat_id_validate(doc.root) # feeds xref_validate
+        repeat_id_validate(doc.root) # feeds xref_validate, termsect_validate
         xref_validate(doc) # feeds nested_asset_validate
         nested_asset_validate(doc)
         section_validate(doc)
@@ -92,7 +92,7 @@ module Metanorma
       end
 
       def nested_asset_xref_report(outer, inner, _doc)
-        i = @doc_xrefs[inner["id"]] or return
+        i = @doc_xrefs[inner["anchor"]] or return
         err2 = "There is a crossreference to an instance of #{inner.name} " \
                "nested within #{outer.name}: #{i.to_xml}"
         @log.add("Style", i, err2)
@@ -158,37 +158,63 @@ module Metanorma
         schema_validate(formattedstr_strip(doc.dup), schema_location)
       end
 
+      # Check should never happen with content ids, but will check it anyway
+      # since consequences are so catastrophic
       def repeat_id_validate1(elem)
         if @doc_ids[elem["id"]]
           @log.add("Anchors", elem,
-                   "Anchor #{elem['id']} has already been " \
-                   "used at line #{@doc_ids[elem['id']]}", severity: 0)
+                   "ID #{elem['id']} has already been " \
+                   "used at line #{@doc_ids[elem['id']][:line]}", severity: 0)
         else
-          @doc_ids[elem["id"]] = elem.line
+          @doc_ids[elem["id"]] =
+            { line: elem.line, anchor: elem["anchor"] }.compact
         end
       end
 
+      def repeat_anchor_validate1(elem)
+        if @doc_anchors[elem["anchor"]]
+          @log.add("Anchors", elem,
+                   "Anchor #{elem['anchor']} has already been used at line " \
+                   "#{@doc_anchors[elem['anchor']][:line]}", severity: 0)
+        else
+          @doc_anchors[elem["anchor"]] = { line: elem.line, id: elem["id"] }
+          @doc_anchor_seq << elem["anchor"]
+        end
+      end
+
+      # Check should never happen with content ids, but will check it anyway
       def repeat_id_validate(doc)
-        @doc_ids = {} # hash of all ids in document to line number
-        @doc_id_seq = [] # ordered list of all ids in document
+        repeat_id_validate_prep
         doc.xpath("//*[@id]").each do |x|
           @doc_id_seq << x["id"]
           repeat_id_validate1(x)
+          x["anchor"] and repeat_anchor_validate1(x)
         end
-        @doc_id_seq.sort!
+        @doc_id_seq_hash = @doc_id_seq.each_with_index
+          .with_object({}) do |(x, i), m|
+          m[x] = i
+        end
+        @doc_anchor_seq_hash = @doc_anchor_seq.each_with_index
+          .with_object({}) do |(x, i), m|
+          m[x] = i
+        end
+      end
+
+      def repeat_id_validate_prep
+        @doc_ids = {} # hash of all ids in document to line number, anchor
+        @doc_anchors = {} # hash of all anchors in document to line number, id
+        @doc_id_seq = [] # ordered list of all ids in document
+        @doc_anchor_seq = [] # ordered list of all anchors in document
       end
 
-      # Retrieve IDs between two nominated values
+      # Retrieve anchors between two nominated values
       # (exclusive of start_id AND exclusive of end_id)
-      def get_ids_between(start_id, end_id)
-        start_index = @doc_id_seq.bsearch_index { |id| id > start_id }
-        end_index = @doc_id_seq.bsearch_index { |id| id >= end_id }
-        # start_id is greater than or equal to all elements
-        start_index.nil? and return []
-        # end_id is greater than all elements
-        end_index.nil? and end_index = @doc_id_seq.length
+      def get_anchors_between(start_id, end_id)
+        start_index = @doc_anchor_seq_hash[start_id]
+        end_index = @doc_anchor_seq_hash[end_id]
+        start_index.nil? || end_index.nil? and return []
         start_index >= end_index and return []
-        @doc_id_seq[start_index...end_index]
+        @doc_anchor_seq[start_index...end_index]
       end
 
       # manually check for xref/@target et sim. integrity
@@ -198,14 +224,15 @@ module Metanorma
       end
 
       def xref_validate_exists(doc)
-        @doc_xrefs =
-          doc.xpath("//xref/@target | //xref//location/@target | //index/@to")
-            .each_with_object({}) do |x, m|
-            m[x.text] = x.parent
-            @doc_ids[x.text] and next
+        @doc_xrefs = {}
+        Metanorma::Utils::anchor_attributes.each do |a|
+          doc.xpath("//#{a[0]}/@#{a[1]}").each do |x|
+            @doc_xrefs[x.text] = x.parent
+            @doc_anchors[x.text] and next
             @log.add("Anchors", x.parent,
                      "Crossreference target #{x} is undefined", severity: 1)
           end
+        end
       end
 
       # If there is an xref range, record the IDs between the two targets
@@ -220,7 +247,7 @@ module Metanorma
         from = to_location.previous_element
         from && from.name == "location" or return
         from["target"] && to_location["target"] or return
-        get_ids_between(from["target"], to_location["target"])
+        get_anchors_between(from["target"], to_location["target"])
           .each { |id| @doc_xrefs[id] = from }
       end
     end

data/lib/metanorma/standoc/validate_schema.rb

@@ -99,6 +99,8 @@ module Metanorma
         doc.xpath("//m:svg", "m" => SVG_NS).each { |n| n.replace("<svg/>") }
         doc
       end
+
+      include ::Metanorma::Standoc::Utils
     end
   end
 end