metanorma-bipm 2.6.5 → 2.6.7

data/lib/isodoc/bipm/presentation_blocks.rb

@@ -56,7 +56,7 @@ module IsoDoc
       end
 
       def termsource_insert_empty_modification(docxml)
-        docxml.xpath("//xmlns:termsource[@status = 'modified']" \
+        docxml.xpath("//xmlns:term//xmlns:source[@status = 'modified']" \
                      "[not(xmlns:modification)]").each do |f|
           f << "<modification/>"
         end
@@ -71,11 +71,11 @@ module IsoDoc
       end
 
       def ol_label_template(_elem)
-        super
-          .merge({
-                   roman: %{<span class="fmt-label-delim">(</span>%<span class="fmt-label-delim">)</span>},
-                   arabic: %{%<span class="fmt-label-delim">.</span>},
-                 })
+        super.merge({
+                      roman: %{<span class="fmt-label-delim">(</span>% \
+                      <span class="fmt-label-delim">)</span>},
+                      arabic: %{%<span class="fmt-label-delim">.</span>},
+                    })
       end
     end
   end

data/lib/isodoc/bipm/xref.rb

@@ -49,15 +49,13 @@ module IsoDoc
         end
       end
 
-      NUMBERED_SUBCLAUSES =
-        "./clause[not(#{UNNUM})] | ./references[not(#{UNNUM})] | " \
-        "./term[not(#{UNNUM})] | ./terms[not(#{UNNUM})] | " \
-        "./definitions[not(#{UNNUM})]".freeze
+      NUMBERED_SUBCLAUSES = <<~XPATH.freeze
+        ./clause[not(#{UNNUM})] | ./references[not(#{UNNUM})] | ./term[not(#{UNNUM})] | ./terms[not(#{UNNUM})] | ./definitions[not(#{UNNUM})]
+      XPATH
 
-      UNNUMBERED_SUBCLAUSES =
-        "./clause[#{UNNUM}] | ./references[#{UNNUM}] | " \
-        "./term[#{UNNUM}] | ./terms[#{UNNUM}] | " \
-        "./definitions[#{UNNUM}]".freeze
+      UNNUMBERED_SUBCLAUSES = <<~XPATH.freeze
+        ./clause[#{UNNUM}] | ./references[#{UNNUM}] | ./term[#{UNNUM}] | ./terms[#{UNNUM}] | ./definitions[#{UNNUM}]
+      XPATH
 
       def section_name_anchors(clause, num, level)
         lbl = @jcgm ? "clause_jcgm" : "clause"
@@ -76,12 +74,12 @@ module IsoDoc
         section_name_anchors(clause, lbl, lvl)
         clause.xpath(ns(NUMBERED_SUBCLAUSES))
           .each_with_object(clause_counter(0)) do |c, i|
-          section_names1(c, lbl, i.increment(c).print, lvl + 1)
-        end
+            section_names1(c, lbl, i.increment(c).print, lvl + 1)
+          end
         clause.xpath(ns(UNNUMBERED_SUBCLAUSES))
           .each_with_object(clause_counter(0)) do |c, i|
-          unnumbered_section_names1(c, lvl + 1)
-        end
+            unnumbered_section_names1(c, lvl + 1)
+          end
         num
       end
 
@@ -100,7 +98,7 @@ module IsoDoc
         xref = labelled_autonum(@labels[lbl], num)
         label = num
         @anchors[clause["id"]] =
-          { label: num, level: level, xref: labelled_autonum(lbl, num), # l10n("#{lbl}#{num}"),
+          { label: num, level: level, xref: labelled_autonum(lbl, num),
             type: "clause", elem: lbl }
       end
 
@@ -146,8 +144,7 @@ module IsoDoc
 
       def annex_name_anchors(clause, num)
         { label: annex_name_lbl(clause, num), type: "clause", value: num.to_s,
-          xref: labelled_autonum(@annexlbl, num), # #l10n("#{@annexlbl} #{num}"),
-          level: 1, elem: @annexlbl }
+          xref: labelled_autonum(@annexlbl, num), level: 1, elem: @annexlbl }
       end
 
       def annex_names(clause, num)
@@ -180,7 +177,7 @@ module IsoDoc
         @anchors[clause["id"]] = unnumbered_annex_anchors(lbl)
         if @klass.single_term_clause?(clause)
           unnumbered_annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
-                       1)
+                                  1)
         else
           clause.xpath(ns(SUBCLAUSES))
             .each { |c| unnumbered_annex_names1(c, 2) }
@@ -191,8 +188,8 @@ module IsoDoc
       def annex_name_anchors1(clause, num, level)
         lbl = @jcgm ? "" : @annexlbl
         @anchors[clause["id"]] = 
-        { label: num, xref: labelled_autonum(lbl, num), #l10n("#{lbl}#{num}"),
-          level: level, type: "clause", elem: lbl }
+          { label: num, xref: labelled_autonum(lbl, num), #l10n("#{lbl}#{num}"),
+            level: level, type: "clause", elem: lbl }
       end
 
       def annex_names1(clause, parentnum, num, level)

data/lib/metanorma/bipm/basicdoc.rng

@@ -267,6 +267,10 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <value>justified</value>
     </choice>
   </define>
+  <define name="IdRefType">
+    <a:documentation>Type of cross-references to elements. In BasicDoc, these always point to id { xsd:ID } </a:documentation>
+    <data type="IDREF"/>
+  </define>
   <define name="RequiredId">
     <a:documentation>Mandatory anchor of element, to be used for cross-references within the document</a:documentation>
     <attribute name="id">
@@ -409,13 +413,13 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <attribute name="from">
         <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
 If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="to">
         <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
   </define>
@@ -1504,7 +1508,7 @@ Restricted recursively to contain only other such inline elements with no identi
         <attribute name="to">
           <a:documentation>A reference to an anchor element (typically a bookmark), 
 to indicate that the index range covers a range of locations between the current index element and the `to` anchor</a:documentation>
-          <data type="IDREF"/>
+          <ref name="IdRefType"/>
         </attribute>
       </optional>
       <ref name="index-primary">
@@ -1662,7 +1666,7 @@ which can be bookmarks as well as block or section references</a:documentation>
   <define name="XrefAttributes">
     <attribute name="target">
       <a:documentation>The identifier of a section, block or inlined element being referenced</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <optional>
       <attribute name="type">
@@ -1723,7 +1727,7 @@ The target of a footnote is the location it is embedded in within the text</a:do
       <attribute name="target">
         <a:documentation>The target of the callout is understood to be the location of the callout within the source code; 
 the extent of the target is not expressed overtly</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <text>
         <a:documentation>The label of the callout, used to identify its target within the source code</a:documentation>

data/lib/metanorma/bipm/cleanup.rb

@@ -17,8 +17,7 @@ module Metanorma
       def jcgm_untitled_sections_cleanup(xml)
         xml.xpath("//clause//clause | //annex//clause | //introduction/clause")
           .each do |c|
-          next if !c&.at("./title")&.text&.empty?
-
+          !c&.at("./title")&.text&.empty? and next
           c["inline-header"] = true
         end
       end
@@ -33,7 +32,7 @@ module Metanorma
       end
 
       def xref_to_eref(elem, name)
-        if elem.at("//bibitem[@id = '#{elem['target']}']/" \
+        if elem.at("//bibitem[@anchor = '#{elem['target']}']/" \
                    "docidentifier[@type = 'BIPM-long']")
           elem["style"] = "BIPM-long"
         end

data/lib/metanorma/bipm/converter.rb

@@ -34,8 +34,7 @@ module Metanorma
 
       def sectiontype(node, level = true)
         ret = sectiontype1(node)
-        return ret if ret == "terms and definitions"
-
+        ret == "terms and definitions" and return ret
         super
       end
 
@@ -68,12 +67,12 @@ module Metanorma
         super
       end
 
-      def clause_parse(attrs, xml, node)
+      def clause_attrs_preprocess(attrs, node)
         node.option?("unnumbered") and attrs[:unnumbered] = true
         super
       end
 
-      def annex_parse(attrs, xml, node)
+      def annex_attrs_preprocess(attrs, node)
         node.option?("unnumbered") and attrs[:unnumbered] = true
         super
       end

data/lib/metanorma/bipm/front.rb

@@ -2,8 +2,7 @@ module Metanorma
   module Bipm
     class Converter < Metanorma::Generic::Converter
       def metadata_committee(node, xml)
-        return unless node.attr("committee-en") || node.attr("committee-fr")
-
+        node.attr("committee-en") || node.attr("committee-fr") or return
         xml.editorialgroup do |a|
           metadata_committee1(node, a)
           i = 2
@@ -100,8 +99,7 @@ module Metanorma
 
       def typed_title(node, xml, lang, type)
         at = { language: lang, format: "text/plain" }
-        return unless title = node.attr("title-#{type}-#{lang}")
-
+        title = node.attr("title-#{type}-#{lang}") or return
         xml.title **attr_code(at.merge(type: "title-#{type}")) do |t1|
           t1 << Metanorma::Utils::asciidoc_sub(title)
         end

data/lib/metanorma/bipm/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.3 -->
+<!-- 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"/>
@@ -1328,6 +1450,7 @@ numbers</a:documentation>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
+          <ref name="executivesummary"/>
         </choice>
       </oneOrMore>
     </element>
@@ -1351,6 +1474,11 @@ numbers</a:documentation>
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="executivesummary">
+    <element name="executivesummary">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="indexsect">
     <element name="indexsect">
       <ref name="Content-Section"/>
@@ -1576,6 +1704,15 @@ used in document amendments</a:documentation>
   <define name="annex">
     <element name="annex">
       <ref name="Annex-Section"/>
+      <zeroOrMore>
+        <ref name="annex-appendix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="annex-appendix">
+    <a:documentation>Appendix, distinct subclause type for annexes (annex to annex, rather than subclause to annex)</a:documentation>
+    <element name="appendix">
+      <ref name="Clause-Section"/>
     </element>
   </define>
   <define name="terms">
@@ -2106,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"/>
@@ -2488,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/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.6.5".freeze
+    VERSION = "2.6.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic