metanorma-plateau 1.0.8 → 1.1.0

data/lib/isodoc/plateau/presentation_xml_convert.rb

@@ -79,77 +79,6 @@ module IsoDoc
         @counter.ol_type(node, depth) # defined in Xref::Counter
       end
 
-      # how many columns in the table?
-      def table_col_count(table)
-        cols = 0
-        table&.at(ns(".//tr"))&.xpath(ns("./td | ./th"))&.each do |td|
-          cols += (td["colspan"] ? td["colspan"].to_i : 1)
-        end
-        cols
-      end
-
-      # 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 #{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 #{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
-      # 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 #{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 #{add_id_text}><td #{add_id_text} colspan='#{colspan}'> </td></tr>"
-          tfoot_start = node.at(ns("./tfoot/tr[last()]/td"))
-        end
-        tfoot_start
-      end
-
-      def table1(node)
-        super
-        # 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
-      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
-      end
-
       # Undo JIS encoding of figure and table dl as paragraphs
       def dl(docxml)
         docxml.xpath(ns("//dl")).each { |f| dl1(f) }

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.7 -->
+<!-- VERSION v2.0.8 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -72,6 +72,46 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
         </oneOrMore>
       </element>
     </define>
+    <define name="review">
+      <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
+the type attribute defaults to `review` for reviews</a:documentation>
+      <element name="annotation">
+        <ref name="RequiredId"/>
+        <ref name="ReviewAttributes"/>
+        <oneOrMore>
+          <ref name="paragraph">
+            <a:documentation>Reviewer comments content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </element>
+    </define>
+    <define name="ruby_pronunciation">
+      <a:documentation>Ruby annotation giving pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-pronunciation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="ruby_annotation">
+      <a:documentation>Ruby annotation giving information other than pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-annotation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="annotation">
+      <a:documentation>Source code annotation, corresponding to a callout</a:documentation>
+      <element name="callout-annotation">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="paragraph"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="section-title">
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
@@ -540,7 +580,7 @@ normative or informative references, some split references into sections organiz
       <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
-          <a:documentation>CSS style: only background-color supported</a:documentation>
+          <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
         </attribute>
       </optional>
     </define>
@@ -620,7 +660,7 @@ This is done if the footnote reference is already presented in some other form,
     <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
-        <a:documentation>CSS style: only background-color supported</a:documentation>
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
       </attribute>
     </optional>
   </define>
@@ -700,6 +740,11 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>Width of the table block in rendering</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
+      </attribute>
+    </optional>
     <ref name="BlockAttributes"/>
   </define>
   <define name="FigureAttributes" combine="interleave">
@@ -1417,7 +1462,7 @@ numbers</a:documentation>
       </optional>
       <ref name="DocumentBody"/>
       <optional>
-        <ref name="review-container">
+        <ref name="annotation-container">
           <a:documentation>Annotations to the document</a:documentation>
         </ref>
       </optional>
@@ -1461,8 +1506,8 @@ numbers</a:documentation>
       </oneOrMore>
     </element>
   </define>
-  <define name="review-container">
-    <element name="review-container">
+  <define name="annotation-container">
+    <element name="annotation-container">
       <oneOrMore>
         <ref name="review"/>
       </oneOrMore>

data/lib/metanorma/plateau/version.rb

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

data/metanorma-plateau.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-jis", "~> 0.5.0"
+  spec.add_dependency "metanorma-jis", "~> 0.6.0"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"
@@ -44,7 +44,6 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-jis
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement