metanorma-standoc 3.0.7 → 3.0.8

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_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/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

@@ -148,13 +148,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.5 -->
 
   <!--
     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,20 @@ 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>
+  </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>
+  </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>
@@ -1081,7 +1203,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 +2243,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 +2625,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_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_link.rb

@@ -68,13 +68,12 @@ 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
   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

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,11 +16,13 @@ module Metanorma
         @unique_designs = {}
         @c = HTMLEntities.new
         @terms_tags = xmldoc.xpath("//terms").each_with_object({}) do |t, m|
-          m[t["id"]] = true
+          #m[t["id"]] = true
+          m[t["anchor"]] = true
         end
       end
 
       def call
+        #require "debug"; binding.b
         @idhash = populate_idhash
         @unique_designs = unique_designators
         @lookup = replace_automatic_generated_ids_terms
@@ -29,6 +31,7 @@ module Metanorma
         related_cleanup
         remove_missing_refs
         concept_cleanup2
+        anchor_to_id
       end
 
       private
@@ -36,7 +39,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 +72,12 @@ 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("//*[@id]").each_with_object({}) do |n, mem|
+        xmldoc.xpath("//*[@anchor]").each_with_object({}) do |n, mem|
+          #/^(term|symbol)-/.match?(n["id"]) or next
+          /^(term|symbol)-/.match?(n["anchor"]) or next
+          #mem[n["id"]] = true
+          mem[n["anchor"]] = true
         end
       end
 
@@ -207,18 +213,22 @@ 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["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["id"] = id
+          node["anchor"] = id
           @idhash[id] = true
         end
-        res_table[term_text] = node["id"]
+        #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["id"]
+          res_table[norm_ref_id1(p, use_domain ? node : nil)] = node["anchor"]
         end
       end
 
@@ -255,6 +265,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) }