metanorma-bipm 2.6.1 → 2.6.3

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -107,12 +107,6 @@ module IsoDoc
         jcgm_eref(docxml, "//fmt-origin[not(.//termref)]")
       end
 
-      # KILL
-      def quotesourcex(docxml)
-        super
-        jcgm_eref(docxml, "//quote//source")
-      end
-
       def jcgm_eref(docxml, xpath)
         @jcgm or return
         docxml.xpath(ns(xpath)).each { |x| extract_brackets(x) }
@@ -120,7 +114,8 @@ module IsoDoc
         docxml.root.replace(Nokogiri::XML(docxml.root.to_xml).root)
         docxml.xpath(ns(xpath)).each do |x| # rubocop: disable Style/CombinableLoops
           if x.parent.next&.text? && /^\],\s+\[$/.match?(x.parent.next.text) &&
-              %w(eref origin fmt-eref fmt-origin).include?(x.parent.next.next&.name)
+              %w(eref origin fmt-eref
+                 fmt-origin).include?(x.parent.next.next&.name)
             x.parent.next.replace(", ")
           end
         end
@@ -144,19 +139,9 @@ module IsoDoc
         end
       end
 
-      # KILL
-      def termsource1_xx(elem)
-        # elem["status"] == "modified" and return super
-        while elem&.next_element&.name == "termsource"
-          elem << "; #{to_xml(elem.next_element.remove.children)}"
-        end
-        elem.children = l10n("[#{termsource_adapt(elem['status'])}" \
-                             "#{to_xml(elem.children).strip}]")
-      end
-
       def termsource_label(elem, sources)
-      elem.replace(l10n("[#{termsource_adapt(elem['status'])} #{sources}]"))
-    end
+        elem.replace(l10n("[#{termsource_adapt(elem['status'])} #{sources}]"))
+      end
 
       def termsource_adapt(status)
         case status
@@ -179,10 +164,6 @@ module IsoDoc
       end
 
       def termsource_modification(elem)
-        # if elem["status"] == "modified"
-        # origin = elem.at(ns("./origin"))
-        # s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
-        # end
         termsource_add_modification_text(elem.at(ns("./modification")))
       end
 
@@ -204,6 +185,101 @@ module IsoDoc
         @xrefs.bookmark_anchor_names(docxml)
       end
 
+      def fn_label_brackets(fnote)
+        "<sup><span class='fmt-label-delim'>(</span>" \
+        "#{fn_label(fnote)}" \
+          "<span class='fmt-label-delim'>)</span></sup>"
+      end
+
+      def fn_ref_label(fnote)
+        if @jcgm then iso_fn_ref_label(fnote)
+        else fn_label_brackets(fnote)
+        end
+      end
+
+      # copied from ISO
+      def iso_fn_ref_label(fnote)
+        if fnote.ancestors("table, figure").empty? ||
+            !fnote.ancestors("name, fmt-name").empty?
+          "<sup>#{fn_label(fnote)}" \
+            "<span class='fmt-label-delim'>)</span></sup>"
+        else
+          "<sup>#{fn_label(fnote)}</sup>"
+        end
+      end
+
+      def fn_body_label(fnote)
+        if @jcgm then super
+        else fn_label_brackets(fnote)
+        end
+      end
+
+      # explode out all the subclauses into separate entries
+      # assume no hanging clauses
+      def sort_footnote_sections(docxml)
+        ret = super
+        ret.flat_map do |x|
+          clauses = x.xpath(ns(".//clause[not(./clause)]"))
+          clauses.empty? ? [x] : clauses.to_a
+        end
+      end
+
+      # quote/table/fn references are not unique within quote
+      # if there are multiple tables
+      def renumber_document_footnote_key(fnote)
+        key = fnote["reference"]
+        !@jcgm && (t = fnote.at("./ancestor::xmlns:table")) and
+          key = "#{t['id']} #{key}"
+        key
+      end
+
+      def renumber_document_footnote(fnote, idx, seen)
+        fnote["original-reference"] = fnote["reference"]
+        key = renumber_document_footnote_key(fnote)
+        if seen[key]
+          fnote["reference"] = seen[fnote["reference"]]
+        else
+          seen[key] = idx
+          fnote["reference"] = idx
+          idx += 1
+        end
+        idx
+      end
+
+      def document_footnotes(docxml)
+        @jcgm and return super
+        sects = sort_footnote_sections(docxml)
+        excl = non_document_footnotes(docxml)
+        fns = filter_document_footnotes(sects, excl)
+        #sects.select { |s| s.at(ns(".//fn")) }.each_with_index do |s, i|
+        sects.each_with_index do |s, i|
+          ret = footnote_collect(renumber_document_footnotes(fns[i], 1))
+          f = footnote_container(fns[i], ret) and s << f
+        end
+      end
+
+      def renumber_document_footnotes(fns, idx)
+        @jcgm and return super
+        fns.each_with_object({}) do |f, seen|
+          idx = renumber_document_footnote(f, idx, seen)
+        end
+        fns
+      end
+
+      def table_fn(elem)
+        !@jcgm && !elem.ancestors("quote").empty? and return
+        super
+      end
+
+      def non_document_footnotes(docxml)
+        table_fns = docxml.xpath(ns("//table//fn")) -
+          docxml.xpath(ns("//table/name//fn"))
+        @jcgm or table_fns -= docxml.xpath(ns("//quote//table//fn"))
+        fig_fns = docxml.xpath(ns("//figure//fn")) -
+          docxml.xpath(ns("//figure/name//fn"))
+        table_fns + fig_fns
+      end
+
       include Init
     end
   end

data/lib/metanorma/bipm/basicdoc.rng

@@ -382,33 +382,7 @@ in a document (e.g. sourcecode annotations)</a:documentation>
     <a:documentation>Block intended to capture reviewer comments about some text in the document</a:documentation>
     <element name="review">
       <ref name="RequiredId"/>
-      <attribute name="reviewer">
-        <a:documentation>The party who has offered the comment</a:documentation>
-      </attribute>
-      <optional>
-        <attribute name="type">
-          <a:documentation>The type of reviewer comment</a:documentation>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="date">
-          <a:documentation>The date when the comment was made</a:documentation>
-          <data type="dateTime"/>
-        </attribute>
-      </optional>
-      <optional>
-        <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"/>
-        </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"/>
-        </attribute>
-      </optional>
+      <ref name="ReviewAttributes"/>
       <oneOrMore>
         <ref name="paragraph">
           <a:documentation>Reviewer comments content</a:documentation>
@@ -416,6 +390,35 @@ If not provided, the comment applies in the vicinity of the place it has been in
       </oneOrMore>
     </element>
   </define>
+  <define name="ReviewAttributes">
+    <attribute name="reviewer">
+      <a:documentation>The party who has offered the comment</a:documentation>
+    </attribute>
+    <optional>
+      <attribute name="type">
+        <a:documentation>The type of reviewer comment</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="date">
+        <a:documentation>The date when the comment was made</a:documentation>
+        <data type="dateTime"/>
+      </attribute>
+    </optional>
+    <optional>
+      <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"/>
+      </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"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="NumberingAttributes">
     <optional>
       <attribute name="unnumbered">
@@ -857,6 +860,7 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
   <define name="tr">
     <a:documentation>Sequence of cells to be displayed as a row in a table</a:documentation>
     <element name="tr">
+      <ref name="TrAttributes"/>
       <oneOrMore>
         <choice>
           <ref name="td">
@@ -869,6 +873,9 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="TrAttributes">
+    <empty/>
+  </define>
   <define name="tr-no-id">
     <a:documentation>Sequence of cells to be displayed as a row in a table: optional ID attributes recursively (for use in Relaton, metadata)</a:documentation>
     <element name="tr">

data/lib/metanorma/bipm/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v2.0.0 -->
+<!-- VERSION v2.0.2 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -33,6 +33,15 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="fn" combine="interleave">
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+    </define>
     <define name="index-primary">
       <element name="primary">
         <oneOrMore>
@@ -414,6 +423,21 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </choice>
     </define>
+    <define name="TdAttributes" combine="interleave">
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color supported</a:documentation>
+      </attribute>
+    </define>
+    <define name="ThAttributes" combine="interleave">
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color supported</a:documentation>
+      </attribute>
+    </define>
+    <define name="TrAttributes">
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color supported</a:documentation>
+      </attribute>
+    </define>
     <define name="table-note">
       <element name="note">
         <ref name="OptionalId"/>
@@ -1263,6 +1287,11 @@ numbers</a:documentation>
           <a:documentation>Colophon or postface material</a:documentation>
         </ref>
       </optional>
+      <optional>
+        <ref name="review-container">
+          <a:documentation>Annotations to the document</a:documentation>
+        </ref>
+      </optional>
     </element>
   </define>
   <define name="misccontainer">
@@ -1273,6 +1302,13 @@ numbers</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="review-container">
+    <element name="review-container">
+      <oneOrMore>
+        <ref name="review"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.6.1".freeze
+    VERSION = "2.6.3".freeze
   end
 end

metadata

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