metanorma-iso 3.0.1 → 3.0.2

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -142,16 +142,6 @@ module IsoDoc
         end
       end
 
-      #       def clause(docxml)
-      #         docxml.xpath(ns("//clause[not(ancestor::annex)] | " \
-      #                         "//terms | //definitions | //references | " \
-      #                         "//preface/introduction[clause]")).each do |f|
-      #           f.parent.name == "annex" &&
-      #             @xrefs.klass.single_term_clause?(f.parent) and next
-      #           clause1(f)
-      #         end
-      #       end
-
       def admonition1(elem)
         super
         admonition_outside_clauses(elem)
@@ -209,7 +199,7 @@ module IsoDoc
         if elem["class"] == "modspec"
           if n = elem.at(ns(".//fmt-name"))
             n.remove.name = "name"
-          elem.add_first_child(n)
+            elem.add_first_child(n)
           end
           elem.at(ns("./thead"))&.remove
           super
@@ -319,6 +309,16 @@ module IsoDoc
         true
       end
 
+      def 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
+          super
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/word_convert.rb

@@ -131,6 +131,7 @@ module IsoDoc
         TOC
       end
 
+      # KILL
       def footnote_reference_format(link)
         link.children =
           "<span class='MsoFootnoteReference'>#{to_xml(link.children)}</span>)"
@@ -249,6 +250,8 @@ module IsoDoc
         node.xpath(ns("./source")).each { |n| parse(n, out) }
         node.xpath(ns("./note[not(@type = 'units')]"))
           .each { |n| parse(n, out) }
+        node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
+          .each { |n| parse(n, out) }
       end
 
       include BaseConvert

data/lib/metanorma/iso/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/iso/relaton-iso.rng

@@ -63,14 +63,6 @@
         </choice>
       </element>
     </define>
-    <define name="organization">
-      <element name="organization">
-        <choice>
-          <ref name="OrganizationType"/>
-          <ref name="IsoOrganizationType"/>
-        </choice>
-      </element>
-    </define>
     <define name="DocumentType">
       <choice>
         <value>international-standard</value>
@@ -219,18 +211,4 @@
       <text/>
     </element>
   </define>
-  <define name="IsoOrganizationType">
-    <optional>
-      <ref name="technical-committee"/>
-    </optional>
-    <optional>
-      <ref name="subcommittee"/>
-    </optional>
-    <optional>
-      <ref name="workgroup"/>
-    </optional>
-    <optional>
-      <ref name="secretariat"/>
-    </optional>
-  </define>
 </grammar>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.0.1".freeze
+    VERSION = "3.0.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 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-standoc