metanorma-bipm 2.6.1 → 2.6.2

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -120,7 +120,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
@@ -155,8 +156,8 @@ module IsoDoc
       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
@@ -204,6 +205,35 @@ 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
+
       include Init
     end
   end

data/lib/metanorma/bipm/isodoc.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>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.6.1".freeze
+    VERSION = "2.6.2".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.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic