metanorma-standoc 3.0.7 → 3.0.9

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -33,7 +33,7 @@ module Metanorma
         xmldoc.xpath("//bookmark").each do |b|
           p = b
           while !p.xml? && p = p.parent
-            p["id"] == b["id"] or next
+            p["anchor"] == b["anchor"] or next
             b.remove
             break
           end
@@ -43,6 +43,7 @@ module Metanorma
       def bookmark_to_id(elem, bookmark)
         parent = bookmark.parent
         elem["id"] = bookmark.remove["id"]
+        elem["anchor"] = bookmark.remove["anchor"]
         strip_initial_space(parent)
       end
 
@@ -123,69 +124,31 @@ module Metanorma
       end
 
       def to_xreftarget(str)
-        return Metanorma::Utils::to_ncname(str) unless /^[^#]+#.+$/.match?(str)
-
+        /^[^#]+#.+$/.match?(str) or return Metanorma::Utils::to_ncname(str)
         /^(?<pref>[^#]+)#(?<suff>.+)$/ =~ str
         pref = pref.gsub(%r([#{Metanorma::Utils::NAMECHAR}])o, "_")
         suff = suff.gsub(%r([#{Metanorma::Utils::NAMECHAR}])o, "_")
         "#{pref}##{suff}"
       end
 
-      IDREF = "//*/@id | //review/@from | //review/@to | " \
-              "//callout/@target | //citation/@bibitemid | " \
-              "//eref/@bibitemid".freeze
-
       def anchor_cleanup(elem)
-        anchor_cleanup1(elem)
-        xreftarget_cleanup(elem)
         contenthash_id_cleanup(elem)
       end
 
-      def anchor_cleanup1(elem)
-        elem.xpath(IDREF).each do |s|
-          if (ret = Metanorma::Utils::to_ncname(s.value)) != (orig = s.value)
-            s.value = ret
-            @log.add("Anchors", s.parent,
-                     "normalised identifier to #{ret} from #{orig}",
-                     display: false)
-          end
-        end
-      end
-
-      def xreftarget_cleanup(elem)
-        elem.xpath("//xref/@target").each do |s|
-          if (ret = to_xreftarget(s.value)) != (orig = s.value)
-            s.value = ret
-            @log.add("Anchors", s.parent,
-                     "normalised identifier to #{ret} from #{orig}",
-                     display: false)
-          end
-        end
-      end
-
       def contenthash_id_cleanup(doc)
-        ids = contenthash_id_make(doc)
-        contenthash_id_update_refs(doc, ids)
+        @contenthash_ids = contenthash_id_make(doc)
       end
 
       def contenthash_id_make(doc)
         doc.xpath("//*[@id]").each_with_object({}) do |x, m|
-          next unless Metanorma::Utils::guid_anchor?(x["id"])
-
+          # should always be true
+          Metanorma::Utils::guid_anchor?(x["id"]) or next
           m[x["id"]] = contenthash(x)
+          x["anchor"] and m[x["anchor"]] = m[x["id"]]
           x["id"] = m[x["id"]]
         end
       end
 
-      def contenthash_id_update_refs(doc, ids)
-        [%w(review from), %w(review to), %w(callout target), %w(eref bibitemid),
-         %w(citation bibitemid), %w(xref target), %w(xref to)].each do |a|
-          doc.xpath("//#{a[0]}").each do |x|
-            ids[x[a[1]]] and x[a[1]] = ids[x[a[1]]]
-          end
-        end
-      end
-
       def contenthash(elem)
         Digest::MD5.hexdigest("#{elem.path}////#{elem.text}")
           .sub(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "_\\1-\\2-\\3-\\4-\\5")
@@ -196,14 +159,17 @@ module Metanorma
           p.name = "passthrough"
           p.children = select_odd_chars(p.children.to_xml)
         end
-        doc.xpath("//passthrough[@format = 'metanorma']").each do |p|
-          p.replace(p.children)
-        end
         doc.xpath("//identifier").each do |p|
           p.children = select_odd_chars(p.children.to_xml)
         end
       end
 
+      def passthrough_metanorma_cleanup(doc)
+        doc.xpath("//passthrough[@formats = 'metanorma']").each do |p|
+          p.replace(p.children)
+        end
+      end
+
       def link_cleanup(xmldoc)
         uri_cleanup(xmldoc)
       end
@@ -221,12 +187,21 @@ module Metanorma
         CGI.escape(comp).gsub("+", "%20")
       end
 
+      def source_id_cleanup(xmldoc)
+        xmldoc.xpath("//span[normalize-space(.)=''][@source]").each do |s|
+          s.parent["source"] = s["source"]
+          s.remove
+        end
+      end
+
       private
 
       # skip ZWNJ inserted to prevent regexes operating in asciidoctor
       def select_odd_chars(text)
         text.gsub(/(?!&)([[:punct:]])\u200c/, "\\1")
       end
+
+      include ::Metanorma::Standoc::Utils
     end
   end
 end

data/lib/metanorma/standoc/cleanup_review.rb

@@ -11,14 +11,15 @@ module Metanorma
         end
       end
 
-      def review_insert_bookmark(review, id)
+      def review_insert_bookmark(review)
         parent = review.parent
         children = parent.children
         index = children.index(review)
         x = find_review_sibling(children, index, :previous) ||
           find_review_sibling(children, index, :following)
         ins = x || review.before("<p> </p>").previous.at(".//text()")
-        ins.previous = "<bookmark id='#{id}'/>"
+        ins.previous = "<bookmark/>"
+        ins.previous
       end
 
       # we know node is a block: dig for a place bookmark can go
@@ -65,9 +66,10 @@ module Metanorma
 
       def review_set_location(review)
         unless review["from"]
-          id = "_#{UUIDTools::UUID.random_create}"
-          review_insert_bookmark(review, id)
-          review["from"] = id
+          bookmark = review_insert_bookmark(review)
+          add_id(bookmark)
+          bookmark["anchor"] = bookmark["id"]
+          review["from"] = bookmark["id"]
         end
         review["to"] ||= review["from"]
       end

data/lib/metanorma/standoc/cleanup_section.rb

@@ -46,7 +46,10 @@ module Metanorma
       end
 
       def clean_abstract(dupabstract)
-        dupabstract.traverse { |n| n.remove_attribute("id") }
+        dupabstract.traverse do |n|
+          n.remove_attribute("id")
+          n.remove_attribute("anchor")
+        end
         %w(language script unnumbered).each do |w|
           dupabstract.remove_attribute(w)
         end
@@ -96,7 +99,7 @@ module Metanorma
           y.delete("annex")
           y.name == "annex" || !y.ancestors("annex").empty? and next
           y.wrap("<annex/>")
-          y.parent["id"] = "_#{UUIDTools::UUID.random_create}"
+          add_id(y.parent)
           %w(obligation language script).each { |w| y.parent[w] = y[w] }
         end
       end
@@ -121,7 +124,6 @@ module Metanorma
       end
 
       def sections_cleanup(xml)
-        misccontainer_cleanup(xml)
         sections_order_cleanup(xml)
         sections_level_cleanup(xml)
         sections_names_cleanup(xml)
@@ -130,9 +132,32 @@ module Metanorma
       end
 
       def misccontainer_cleanup(xml)
-        m = xml.at("//misc-container-clause") or return
+        m = xml.xpath("//metanorma-extension-clause")
+        m.empty? and return
         ins = add_misc_container(xml)
-        ins << m.remove.children
+        m.each do |m1|
+          ins << m1.remove.children
+        end
+      end
+
+      def source_include_cleanup(xml)
+        xml.xpath("//source-include").each do |s|
+          f = File.join(@localdir, s["path"])
+          s.remove
+          r = source_sanitise(File.read(f))
+          xml.root << <<~XML
+            <metanorma-extension-clause>
+            <clause>
+            <title>#{s['path']}</title>
+            <source>#{r} </source>
+            </clause>
+            </metanorma-extension-clause>
+          XML
+        end
+      end
+
+      def source_sanitise(code)
+        code
       end
 
       def single_clause_annex(xml)

data/lib/metanorma/standoc/cleanup_table.rb

@@ -56,10 +56,9 @@ module Metanorma
         until nomatches
           nomatches = true
           xmldoc.xpath("//table/following-sibling::*[1]" \
-                       "[self::termsource]").each do |n|
+                       "[self::source]").each do |n|
             n.previous_element << n.remove
             nomatches = false
-            # will be renamed source from termsource later
           end
         end
       end

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -82,7 +82,7 @@ module Metanorma
 
       def term_children_cleanup(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          %w(termnote termexample termsource term).each do |w|
+          %w(termnote termexample source term).each do |w|
             t.xpath("./#{w}").each { |n| t << n.remove }
           end
         end

data/lib/metanorma/standoc/cleanup_terms_designations.rb

@@ -151,7 +151,7 @@ module Metanorma
       DESIGNATOR = %w(preferred admitted deprecates related).freeze
 
       def term_termsource_to_designation(xmldoc)
-        xmldoc.xpath("//term/termsource").each do |t|
+        xmldoc.xpath("//term/source").each do |t|
           p = t.previous_element
           while %w(domain subject).include? p&.name
             p = p.previous_element

data/lib/metanorma/standoc/cleanup_text.rb

@@ -32,19 +32,21 @@ module Metanorma
           e[:skip] and next
           lines = lines_strip_textspan(e, block[i + 1])
           out = Metanorma::Utils.line_sanitise(lines)
-          # e[:last] or out.pop
+          e[:last] or out.pop
+          /\s$/.match?(e[:text][-1]) or out[-1].rstrip!
           e[:elem].replace(out.join)
         end
       end
 
-      def lines_strip_textspan(span, _nextspan)
+      def lines_strip_textspan(span, nextspan)
         lines = span[:text].lines[0..-2].map(&:rstrip) <<
           span[:text].lines[-1]&.sub(/\n$/, "")
         # no final line rstrip: can be space linking to next line
-        # span[:last] or lines << nextspan[:text].lines.first # next token context
+        span[:last] or lines << nextspan[:text].lines.first # next token context
         lines
       end
 
+      # TODO: we are not counting empty xref, eref here
       def gather_text_for_linebreak_cleanup(block)
         x = block.xpath(".//text()").map do |e|
           { elem: e, text: e.text, stem: ancestor_include?(e, %w(stem)),

data/lib/metanorma/standoc/cleanup_toc.rb

@@ -71,7 +71,7 @@ module Metanorma
 
       def toc_cleanup_clause_entry(xmldoc, list)
         list.xpath(".//xref[not(text())][not(display-text)]").each do |x|
-          c1 = xmldoc.at("//*[@id = '#{x['target']}']")
+          c1 = xmldoc.at("//*[@anchor = '#{x['target']}']")
           t = c1.at("./variant-title[@type = 'toc']") || c1.at("./title")
           x << "<display-text>#{to_xml(t.dup.children)}</display-text>"
         end

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -118,7 +118,7 @@ module Metanorma
       end
 
       def anchor_alias(xmldoc)
-        t = xmldoc.at("//metanorma-extension/table[@id = " \
+        t = xmldoc.at("//metanorma-extension/table[@anchor = " \
                       "'_misccontainer_anchor_aliases']") or return
         key = ""
         t.xpath("./tbody/tr").each do |tr|

data/lib/metanorma/standoc/converter.rb

@@ -37,9 +37,9 @@ module Metanorma
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
-        preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
-        preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
-        preprocessor Metanorma::Plugin::Datastruct::Data2TextPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::Json2TextPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::Yaml2TextPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::Data2TextPreprocessor
         preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
         preprocessor Metanorma::Standoc::NamedEscapePreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
@@ -74,6 +74,9 @@ module Metanorma
         inline_macro Metanorma::Standoc::NumberInlineMacro
         inline_macro Metanorma::Standoc::TrStyleInlineMacro
         inline_macro Metanorma::Standoc::TdStyleInlineMacro
+        inline_macro Metanorma::Standoc::AnchorInlineMacro
+        inline_macro Metanorma::Standoc::SourceIdInlineMacro
+        inline_macro Metanorma::Standoc::SourceIncludeInlineMacro
         block Metanorma::Standoc::ToDoAdmonitionBlock
         block Metanorma::Standoc::EditorAdmonitionBlock
         treeprocessor Metanorma::Standoc::EditorInlineAdmonitionBlock
@@ -103,15 +106,20 @@ module Metanorma
       $xreftext = {}
 
       def initialize(backend, opts)
+        doc = opts&.dig(:document)
+        doc&.delete_attribute("sectids") # no autoassign sect ids from title
         super
         basebackend "html"
         outfilesuffix ".xml"
         @libdir = File.dirname(self.class::_file || __FILE__)
         @c = HTMLEntities.new
-        unless opts && @log = opts[:document]&.options&.dig(:log)
-          @log = Metanorma::Utils::Log.new
-          @local_log = true
-        end
+        local_log(doc)
+      end
+
+      def local_log(doc)
+        @log = doc&.options&.dig(:log) and return
+        @log = Metanorma::Utils::Log.new
+        @local_log = true
       end
 
       class << self

data/lib/metanorma/standoc/init.rb

@@ -139,18 +139,26 @@ module Metanorma
       def init_math(node)
         @keepasciimath = node.attr("mn-keep-asciimath") &&
           node.attr("mn-keep-asciimath") != "false"
-        @numberfmt_default = kv_parse(@c.decode(node.attr("number-presentation")))
-        @numberfmt_formula = @c.decode(node.attr("number-presentation-formula"))
-        @numberfmt_formula == "number-presentation" and
-          @numberfmt_formula = @c.decode(node.attr("number-presentation"))
-        @numberfmt_formula == "default" and
-          @numberfmt_formula = "notation='basic'"
-        @numberfmt_prof =  node.attributes.each_with_object({}) do |(k, v), m|
+        @numberfmt_default =
+          kv_parse(@c.decode(node.attr("number-presentation")))
+        numberfmt_formula(node)
+        @numberfmt_prof = node.attributes.each_with_object({}) do |(k, v), m|
           p = /^number-presentation-profile-(.*)$/.match(k) or next
           m[p[1]] = kv_parse(@c.decode(v))
         end
       end
 
+      def numberfmt_formula(node)
+        @numberfmt_formula = node.attr("number-presentation-formula")
+        @numberfmt_formula.nil? ||
+          @numberfmt_formula == "number-presentation" and
+          @numberfmt_formula = @c.decode(node.attr("number-presentation"))
+        @numberfmt_formula == "nil" and @numberfmt_formula = nil
+        @numberfmt_formula == "default" and
+          @numberfmt_formula = "notation='basic'"
+        @numberfmt_formula = @c.decode(@numberfmt_formula)
+      end
+
       def requirements_processor
         Metanorma::Requirements
       end

data/lib/metanorma/standoc/inline.rb

@@ -13,6 +13,11 @@ module Metanorma
         end
       end
 
+      def pass(node)
+        require "debug"; binding.b
+        "<passthrough-inline formats='metanorma'>#{node.content}</passthrough-inline>"
+      end
+
       def page_break(node)
         attrs = {}
         node.option?("landscape") and attrs[:orientation] = "landscape"
@@ -148,13 +153,13 @@ module Metanorma
       end
 
       def image_attributes1(node, uri, type)
-        attr_code(src: uri, mimetype: type,
-                  id: Metanorma::Utils::anchor_or_uuid,
-                  height: node.attr("height") || "auto",
-                  width: node.attr("width") || "auto",
-                  filename: node.attr("filename"),
-                  title: node.attr("titleattr"),
-                  alt: node.alt == node.attr("default-alt") ? nil : node.alt)
+        attr_code(id_attr(node)
+          .merge(src: uri, mimetype: type,
+                 height: node.attr("height") || "auto",
+                 width: node.attr("width") || "auto",
+                 filename: node.attr("filename"),
+                 title: node.attr("titleattr"),
+                 alt: node.alt == node.attr("default-alt") ? nil : node.alt))
       end
 
       def inline_image(node)

data/lib/metanorma/standoc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.4 -->
+<!-- VERSION v2.0.6 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -36,6 +36,12 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="IdRefType">
+      <a:documentation>Cross-references are not normalised to xsd:IDREF in Semantic XML: that is deferred to Presentation XML.
+All IdRefType instances point not to `@id` in Semantic XML, which is the Content GUID for an element,
+but to `@anchor`, the user-supplied cross-reference</a:documentation>
+      <text/>
+    </define>
     <define name="index-primary">
       <element name="primary">
         <oneOrMore>
@@ -238,7 +244,7 @@
           <a:documentation>Notes specific to this block</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="BlockSource">
         <a:documentation>A source for the table</a:documentation>
       </ref>
     </define>
@@ -262,10 +268,112 @@ and is intended to be referenced by a callout within the source code</a:document
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="BlockSource">
+        <a:documentation>A source for the block</a:documentation>
+      </ref>
+    </define>
+    <define name="FigureBody">
+      <optional>
+        <ref name="tname">
+          <a:documentation>The caption of the block</a:documentation>
+        </ref>
+      </optional>
+      <choice>
+        <a:documentation>Content of the figure</a:documentation>
+        <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
+        <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="figure"/>
+        </zeroOrMore>
+      </choice>
+      <zeroOrMore>
+        <ref name="fn">
+          <a:documentation>Footnotes specific to the figure</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl">
+          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>A source for the block</a:documentation>
+      </ref>
+    </define>
+    <define name="FigureNoIdBody">
+      <optional>
+        <ref name="source">
+          <a:documentation>A URI or other reference intended to link to an externally hosted image (or equivalent)</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="tname">
+          <a:documentation>The caption of the block</a:documentation>
+        </ref>
+      </optional>
+      <choice>
+        <a:documentation>Content of the figure</a:documentation>
+        <ref name="image-no-id"/>
+        <ref name="video-no-id"/>
+        <ref name="audio-no-id"/>
+        <ref name="pre-no-id"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote-no-id"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="figure-no-id"/>
+        </zeroOrMore>
+      </choice>
+      <zeroOrMore>
+        <ref name="fn">
+          <a:documentation>Footnotes specific to the figure</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl-no-id">
+          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note-no-id">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <ref name="BlockSource">
         <a:documentation>A source for the block</a:documentation>
       </ref>
     </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <attribute name="type">
+          <a:documentation>The type of the managed term in the present context</a:documentation>
+          <ref name="SourceTypeType"/>
+        </attribute>
+        <ref name="origin">
+          <a:documentation>The original document and location where the term definition has been obtained from</a:documentation>
+        </ref>
+        <optional>
+          <ref name="modification">
+            <a:documentation>Any changes that the definition of the term has undergone relative to the original document,
+in order to be applicable in this standardisation document</a:documentation>
+          </ref>
+        </optional>
+      </element>
+    </define>
     <define name="sourcecodebody">
       <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
 (The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
@@ -687,6 +795,32 @@ titlecase, or lowercase</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="RequiredId" combine="interleave">
+    <optional>
+      <attribute name="anchor">
+        <a:documentation>User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
+  </define>
+  <define name="OptionalId" combine="interleave">
+    <optional>
+      <attribute name="anchor">
+        <a:documentation> User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="ObligationType">
     <a:documentation>The force of a clause in a standard document: whether it has normative or informative effect</a:documentation>
     <choice>
@@ -832,6 +966,7 @@ titlecase, or lowercase</a:documentation>
 is used in particular to capture mutually agreed definitions of codepoints in Unicode Private Use Area</a:documentation>
         </attribute>
       </optional>
+      <ref name="OptionalId"/>
       <oneOrMore>
         <ref name="TextElement">
           <a:documentation>Textual content of span</a:documentation>
@@ -1081,7 +1216,7 @@ That concept may be defined as a term within the current document, or it may be
     <element name="label">
       <!-- Identifier of form input element that this element is a label of -->
       <attribute name="for">
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <zeroOrMore>
         <ref name="PureTextElement"/>
@@ -2121,7 +2256,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="termsource">
     <a:documentation>The bibliographic source where a term is defined in the sense applicable in this standardisation document</a:documentation>
-    <element name="termsource">
+    <element name="source">
       <attribute name="status">
         <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
         <ref name="SourceStatusType"/>
@@ -2503,6 +2638,11 @@ Normative References contents contain normative references, but as a clause in t
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="BlockSource">
+    <zeroOrMore>
+      <ref name="source"/>
+    </zeroOrMore>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/standoc/localbib.rb

@@ -22,7 +22,7 @@ module Metanorma
       end
 
       def init_file_bibdb_config(defn, key)
-        /=/.match?(defn) or defn = "file=#{defn}"
+        defn.include?("=") or defn = "file=#{defn}"
         values = defn.split(",").map { |item| item.split /(?<!\s)\s*=\s*/ }.to_h
         values["key"] = key
         values["format"] ||= "bibtex" # all we currently suppoort
@@ -63,7 +63,6 @@ module Metanorma
 
       def get(id, file = default)
         ret = @file_bibdb.dig(file, id) and return ret
-
         msg = "Cannot find reference #{id} for local relaton " \
               "data source #{file}"
         @parent.log.add("Bibliography", nil, msg, severity: 0)

data/lib/metanorma/standoc/macros.rb

@@ -10,7 +10,6 @@ require_relative "macros_embed"
 require_relative "macros_link"
 require_relative "datamodel/attributes_table_preprocessor"
 require_relative "datamodel/diagram_preprocessor"
-require "metanorma-plugin-datastruct"
 require "metanorma-plugin-glossarist"
 require "metanorma-plugin-lutaml"