metanorma-iso 3.0.10 → 3.1.0

data/lib/isodoc/iso/presentation_section.rb

@@ -29,13 +29,13 @@ module IsoDoc
       def warning_for_missing_metadata_post(docxml, ret)
         from = docxml.at(ns("//sections/*/@id"))&.text or return
         ret = <<~REVIEW
-          <review date='#{Date.today}' reviewer='Metanorma' #{add_id_text} from='#{from}' to='#{from}'>
+          <annotation date='#{Date.today}' reviewer='Metanorma' #{add_id_text} from='#{from}' to='#{from}'>
           <p><strong>Metadata warnings:</strong></p> #{ret}
-          </review>
+          </annotation>
         REVIEW
-        unless ins = docxml.at(ns("//review-container"))
-          docxml.root << "<review-container></review-container>"
-          ins = docxml.at(ns("//review-container"))
+        unless ins = docxml.at(ns("//annotation-container"))
+          docxml.root << "<annotation-container></annotation-container>"
+          ins = docxml.at(ns("//annotation-container"))
         end
         ins.add_first_child ret
       end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -139,7 +139,7 @@ module IsoDoc
       end
 
       def table1_fmt_xref_modspec(elem)
-        p = elem.parent.parent.at(ns("./fmt-xref-label"))
+        p = elem.parent.parent.at(ns("./fmt-xref-label")) or return
         t = elem.at(ns("./fmt-xref-label"))&.remove or return
         n = t.at(ns("./span[@class='fmt-element-name'][2]")) or return
         while i = n.next

data/lib/isodoc/iso/word_cleanup.rb

@@ -123,6 +123,7 @@ module IsoDoc
 
       def authority_copyright_style(auth)
         auth.xpath(".//p[not(@class)]").each { |p| p["class"] = "zzCopyright" }
+        auth.xpath(".//p[@class = 'Tablebody']").each { |p| p["class"] = "zzCopyright" }
         auth.xpath(".//p[@id = 'boilerplate-message']").each do |p|
           p["class"] = "zzCopyright1"
         end

data/lib/metanorma/iso/base.rb

@@ -65,9 +65,9 @@ module Metanorma
       end
 
       def ol_attrs(node)
-        attr_code(keep_attrs(node).merge(id_attr(node))
-                  .merge("explicit-type": olist_style(node.attributes[1]),
-                         start: node.attr("start")))
+        ret = super
+        ret.delete(:type)
+        ret
       end
 
       def admonition_name(node)

data/lib/metanorma/iso/cleanup.rb

@@ -33,6 +33,9 @@ module Metanorma
       end
 
       def ol_cleanup(doc)
+        doc.xpath("//ol[@type]").each do |x|
+          x.delete("type")
+        end
         doc.xpath("//ol[@explicit-type]").each do |x|
           x["type"] = x["explicit-type"]
           x.delete("explicit-type")

data/lib/metanorma/iso/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/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.0.10".freeze
+    VERSION = "3.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-23 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc