metanorma-plateau 1.0.6 → 1.0.8

data/lib/isodoc/plateau/presentation_xml_convert.rb

@@ -36,14 +36,14 @@ module IsoDoc
         source1(elem, :para)
         # if we haven't already removed it...
         elem.parent or return
-        #elem.parent.next = "<p>#{to_xml(elem.remove)}</p>"
+        # elem.parent.next = "<p>#{to_xml(elem.remove)}</p>"
         elem.parent.next = elem.remove
       end
 
       def listsource(elem, ancestor)
         source1(elem, ancestor)
         elem.parent or return
-        #elem.parent.next = "<p>#{to_xml(elem.remove)}</p>"
+        # elem.parent.next = "<p>#{to_xml(elem.remove)}</p>"
         elem.parent.next = elem.remove
       end
 
@@ -88,33 +88,35 @@ module IsoDoc
         cols
       end
 
-      # if there is already a full-row cell at the start of tfoot, use that to move content into
+      # if there is already a full-row cell at the start of tfoot,
+      # use that to move content into
       # else create a full-row cell at the start of tfoot
       def initial_tfoot_cell(node)
         colspan = table_col_count(node)
         tfoot_start = node.at(ns("./tfoot/tr/td"))
         if !tfoot_start
-          node.at(ns("./tbody")).after("<tfoot><tr><td colspan='#{colspan}'> </td></tr></tfoot>").first
+          node.at(ns("./tbody")).after("<tfoot><tr #{add_id_text}><td #{add_id_text} colspan='#{colspan}'> </td></tr></tfoot>").first
           tfoot_start = node.at(ns("./tfoot/tr/td"))
         end
         if tfoot_start["colspan"] != colspan.to_s
-          tfoot_start.parent.previous = "<tr><td colspan='#{colspan}'> </td></tr>"
+          tfoot_start.parent.previous = "<tr #{add_id_text}><td #{add_id_text} colspan='#{colspan}'> </td></tr>"
           tfoot_start = node.at(ns("./tfoot/tr/td"))
         end
         tfoot_start
       end
 
-      # if there is already a full-row cell at the end of tfoot, use that to move content into
+      # if there is already a full-row cell at the end of tfoot,
+      # use that to move content into
       # else create a full-row cell at the end of tfoot
       def final_tfoot_cell(node)
         colspan = table_col_count(node)
         tfoot_start = node.at(ns("./tfoot/tr[last()]/td"))
         if !tfoot_start
-          node.at(ns("./tbody")).after("<tfoot><tr><td colspan='#{colspan}'> </td></tr></tfoot>").first
+          node.at(ns("./tbody")).after("<tfoot><tr #{add_id_text}><td #{add_id_text} colspan='#{colspan}'> </td></tr></tfoot>").first
           tfoot_start = node.at(ns("./tfoot/tr[last()]/td"))
         end
         if tfoot_start["colspan"] != colspan.to_s
-          tfoot_start.parent.next = "<tr><td colspan='#{colspan}'> </td></tr>"
+          tfoot_start.parent.next = "<tr #{add_id_text}><td #{add_id_text} colspan='#{colspan}'> </td></tr>"
           tfoot_start = node.at(ns("./tfoot/tr[last()]/td"))
         end
         tfoot_start
@@ -122,23 +124,27 @@ module IsoDoc
 
       def table1(node)
         super
-        # move dl, notes, footnotes, fmt-source, fmt-footnote-container inside tfoot
-        if node.at(ns("./dl"))
-          tf = initial_tfoot_cell(node)
-          node.xpath(ns("./dl")).reverse_each do |x|
-            tf.children.first.previous = x.remove
-          end
+        # move dl, notes, footnotes, fmt-source,
+        # fmt-footnote-container inside tfoot
+        table_dl_to_tfoot(node)
+        table_content_to_tfoot(node)
+      end
+
+      def table_dl_to_tfoot(node)
+        node.at(ns("./dl")) or return
+        tf = initial_tfoot_cell(node)
+        node.xpath(ns("./dl")).reverse_each do |x|
+          tf.children.first.previous = x.remove
         end
-        if node.at(ns("./note | ./fmt-source | ./example | ./fmt-footnote-container"))
-          tf = final_tfoot_cell(node)
-          node.xpath(ns("./example")).each do |x|
-            tf.children.last.next = x.remove
-          end
-          node.xpath(ns("./note")).each { |x| tf.children.last.next = x.remove }
-          node.xpath(ns("./fmt-footnote-container")).each do |x|
-            tf.children.last.next = x.remove
-          end
-          node.xpath(ns("./fmt-source")).each do |x|
+      end
+
+      def table_content_to_tfoot(node)
+        node.at(ns("./note | ./fmt-source | ./example | " \
+          "./fmt-footnote-container")) or return
+        tf = final_tfoot_cell(node)
+        %w(example note fmt-footnote-container
+           fmt-source).each do |n|
+          node.xpath(ns("./#{n}")).each do |x|
             tf.children.last.next = x.remove
           end
         end

data/lib/metanorma/plateau/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.5 -->
+<!-- VERSION v2.0.7 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -76,6 +76,7 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
         <a:documentation>Title proper for a clause</a:documentation>
+        <ref name="RequiredId"/>
         <zeroOrMore>
           <ref name="TextElement"/>
         </zeroOrMore>
@@ -83,10 +84,19 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <zeroOrMore>
         <element name="variant-title">
           <a:documentation>Alternate title for a clause</a:documentation>
+          <ref name="RequiredId"/>
           <ref name="TypedTitleString"/>
         </element>
       </zeroOrMore>
     </define>
+    <define name="tname">
+      <element name="name">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="NestedTextElement"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="UlBody">
       <optional>
         <ref name="tname">
@@ -475,6 +485,7 @@ normative or informative references, some split references into sections organiz
     <!-- exclude figures? -->
     <define name="dd">
       <element name="dd">
+        <ref name="OptionalId"/>
         <zeroOrMore>
           <!-- exclude figures? -->
           <ref name="BasicBlock"/>
@@ -526,6 +537,7 @@ normative or informative references, some split references into sections organiz
       </choice>
     </define>
     <define name="TrAttributes">
+      <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
           <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -595,6 +607,7 @@ gives an explicit page orientation</a:documentation>
   </include>
   <!-- end overrides -->
   <define name="FnAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="hiddenref">
         <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
@@ -604,6 +617,7 @@ This is done if the footnote reference is already presented in some other form,
     </optional>
   </define>
   <define name="TdAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
         <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -801,6 +815,12 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
   </define>
   <define name="OptionalId" combine="interleave">
     <optional>
@@ -808,6 +828,12 @@ titlecase, or lowercase</a:documentation>
         <a:documentation> User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </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>
@@ -954,6 +980,7 @@ titlecase, or lowercase</a:documentation>
 is used in particular to capture mutually agreed definitions of codepoints in Unicode Private Use Area</a:documentation>
         </attribute>
       </optional>
+      <ref name="OptionalId"/>
       <oneOrMore>
         <ref name="TextElement">
           <a:documentation>Textual content of span</a:documentation>
@@ -1808,7 +1835,7 @@ used in document amendments</a:documentation>
     </element>
   </define>
   <define name="TermAttributes">
-    <ref name="OptionalId"/>
+    <ref name="RequiredId"/>
     <ref name="LocalizedStringAttributes"/>
     <ref name="BlockAttributes"/>
   </define>
@@ -2151,6 +2178,7 @@ used in document amendments</a:documentation>
   <define name="termdefinition">
     <a:documentation>The definition of a term applied in the current document</a:documentation>
     <element name="definition">
+      <ref name="RequiredId"/>
       <optional>
         <attribute name="type">
           <a:documentation>Type of definition, used to differentiate it from other definitions of the same term if present</a:documentation>
@@ -2172,6 +2200,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="verbaldefinition">
     <element name="verbal-definition">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
@@ -2192,6 +2221,7 @@ used in document amendments</a:documentation>
   <define name="nonverbalrep">
     <a:documentation>Non-verbal representation of the term</a:documentation>
     <element name="non-verbal-representation">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the non-verbal representation of the term</a:documentation>

data/lib/metanorma/plateau/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "1.0.6".freeze
+    VERSION = "1.0.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-12 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-jis