metanorma-jis 0.5.10 → 0.6.1

data/lib/isodoc/jis/presentation_list.rb

@@ -48,8 +48,11 @@ module IsoDoc
 
       def dl_to_para_name(node)
         e = node.at(ns("./fmt-name")) or return ""
-        node.parent.parent["type"] == "participants" and return ""
+        if node.parent.parent.parent.parent.parent["type"] == "participants"
+          ""
+        else
         "<p class='ListTitle'>#{e.children.to_xml}</p>"
+        end
       end
 
       def dl_to_para_terms(node)

data/lib/isodoc/jis/presentation_table.rb

@@ -0,0 +1,97 @@
+module IsoDoc
+  module Jis
+    class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def table1(node)
+        super
+        cols = table_cols_count(node)
+        ins = node.at(ns("./fmt-xref-label")) ||
+          node.at(ns("./fmt-name"))
+        thead = table_thead_pt(node, ins)
+        table_unit_notes(node, thead, cols)
+        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
+
+      # 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)
+        empty_row = full_row(colspan, " ", border: true)
+        node.at(ns("./tfoot/tr/td")) or
+          node.at(ns("./tbody")).after("<tfoot>#{empty_row}</tfoot>").first
+        tfoot_start = node.at(ns("./tfoot/tr/td"))
+        tfoot_start["colspan"] != colspan.to_s and
+          tfoot_start.parent.previous = empty_row
+        node.at(ns("./tfoot/tr/td"))
+      end
+
+      def final_tfoot_cell(node)
+        colspan = table_col_count(node)
+        empty_row = full_row(colspan, " ", border: true)
+        node.at(ns("./tfoot/tr[last()]/td")) or
+          node.at(ns("./tbody")).after("<tfoot>#{empty_row}</tfoot>").first
+        tfoot_start = node.at(ns("./tfoot/tr[last()]/td"))
+        tfoot_start["colspan"] != colspan.to_s and
+          tfoot_start.parent.next = empty_row
+        node.at(ns("./tfoot/tr[last()]/td"))
+      end
+
+      def table_thead_pt(node, name)
+        node.at(ns("./thead")) ||
+          name&.after("<thead> </thead>")&.next ||
+          node.elements.first.before("<thead> </thead>").previous
+      end
+
+      def table_cols_count(node)
+        cols = 0
+        node.at(ns(".//tr")).xpath(ns("./td | ./th")).each do |x|
+          cols += x["colspan"]&.to_i || 1
+        end
+        cols
+      end
+
+      def table_unit_notes(node, thead, cols)
+        unit_notes = node.xpath(ns(".//note[@type = 'units']"))
+        unit_notes.empty? and return
+        thead.children.first.previous = full_row(cols, unit_notes.remove.to_xml)
+      end
+
+      def full_row(cols, elem, border: false)
+        b = border ? "" : " border='0'"
+        <<~XML
+          <tr #{add_id_text}><td #{add_id_text}#{b} colspan='#{cols}'>#{elem}</td></tr>
+        XML
+      end
+    end
+  end
+end

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -2,6 +2,7 @@ require_relative "init"
 require "isodoc"
 require_relative "presentation_section"
 require_relative "presentation_list"
+require_relative "presentation_table"
 require_relative "../../relaton/render-jis/general"
 
 module IsoDoc
@@ -46,40 +47,6 @@ module IsoDoc
         node.children.to_xml.gsub(%r{</?p( [^>]*)?>}, "")
       end
 
-      def table1(node)
-        super
-        cols = table_cols_count(node)
-        ins = node.at(ns("./fmt-xref-label")) ||
-          node.at(ns("./fmt-name"))
-        thead = table_thead_pt(node, ins)
-        table_unit_note(node, thead, cols)
-      end
-
-      def table_thead_pt(node, name)
-        node.at(ns("./thead")) ||
-          name&.after("<thead> </thead>")&.next ||
-          node.elements.first.before("<thead> </thead>").previous
-      end
-
-      def table_cols_count(node)
-        cols = 0
-        node.at(ns(".//tr")).xpath(ns("./td | ./th")).each do |x|
-          cols += x["colspan"]&.to_i || 1
-        end
-        cols
-      end
-
-      def table_unit_note(node, thead, cols)
-        unit_note = node.at(ns(".//note[@type = 'units']")) or return
-        thead.children.first.previous = full_row(cols, unit_note.remove.to_xml)
-      end
-
-      def full_row(cols, elem)
-        <<~XML
-          <tr #{add_id_text}><td #{add_id_text} border='0' colspan='#{cols}'>#{elem}</td></tr>
-        XML
-      end
-
       def source1_label(elem, sources, ancestor)
         case ancestor
         when :table

data/lib/isodoc/jis/table.rb

@@ -4,15 +4,24 @@ module IsoDoc
       def table_title_parse(node, out); end
 
       def table_attrs(node)
+        style = table_attrs_style(node, node["class"])
+        klass = node.text.length > 4000 ? "MsoTableGridBig" : "MsoTableGrid"
+        node["plain"] == "true" and klass = nil
         { id: node["id"], title: node["alt"],
           summary: node["summary"], width: node["width"],
-          class: (node.text.length > 4000 ? "MsoTableGridBig" : "MsoTableGrid"),
-          style: "border-collapse:collapse;" \
+          class: klass,
+          style: style,
+          border: 0, cellspacing: 0, cellpadding: 0 }
+      end
+
+      def table_attrs_style(node, _klass)
+        style = node["style"]
+        node["plain"] == "true" or style ||= "border-collapse:collapse;" \
                  "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
                  "border:none;mso-padding-alt: " \
                  "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
-                 "mso-border-insidev:none;#{keep_style(node)}",
-          border: 0, cellspacing: 0, cellpadding: 0 }
+                 "mso-border-insidev:none;"
+        style
       end
 
       def make_tr_attr_style(cell, row, rowmax, totalrows, opt)
@@ -30,16 +39,16 @@ module IsoDoc
       end
 
       def new_fullcolspan_row(table, tfoot)
-        # how many columns in the table?
-        cols = 0
+        cols = 0 # how many columns in the table?
         table.at(".//tr").xpath("./td | ./th").each do |td|
           cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
-        style = "border-top:0pt;mso-border-top-alt:0pt;" \
+        table["class"].nil? or # plain table
+          style = "style='border-top:0pt;mso-border-top-alt:0pt;" \
                 "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;" \
                 "border-left:#{SW1} 1.5pt;mso-border-left-alt:#{SW1} 1.5pt;" \
-                "border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;"
-        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
+                "border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;'"
+        tfoot.add_child("<tr><td colspan='#{cols}' #{style}/></tr>")
         tfoot.xpath(".//td").last
       end
     end

data/lib/metanorma/jis/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>

data/lib/metanorma/jis/converter.rb

@@ -23,6 +23,12 @@ module Metanorma
         @default_doctype = "japanese-industrial-standard"
       end
 
+      def ol_attrs(node)
+        ret = super
+        ret.delete(:type)
+        ret
+      end
+
       def section_attributes(node)
         ret = super
         if node.attr("style") == "appendix" && node.level == 1 &&

data/lib/metanorma/jis/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.1.0 -->
 
   <!--
     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>
@@ -695,11 +735,22 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <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 +1468,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 +1512,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/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.5.10".freeze
+    VERSION = "0.6.1".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "japanese_calendar", "~> 0"
-  spec.add_dependency "metanorma-iso", "~> 3.0.10"
+  spec.add_dependency "metanorma-iso", "~> 3.1.0"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-23 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -292,6 +292,7 @@ files:
 - lib/isodoc/jis/pdf_convert.rb
 - lib/isodoc/jis/presentation_list.rb
 - lib/isodoc/jis/presentation_section.rb
+- lib/isodoc/jis/presentation_table.rb
 - lib/isodoc/jis/presentation_xml_convert.rb
 - lib/isodoc/jis/table.rb
 - lib/isodoc/jis/word_cleanup.rb