metanorma-iso 3.0.10 → 3.1.1

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/isodoc/iso/xref.rb

@@ -48,7 +48,6 @@ module IsoDoc
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
-            #"#{num}#{hier_separator}#{c.increment(t).print}", t,
             hiersemx(clause, num, c.increment(t), t), t,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
             "formula", { unnumb: t["unnumbered"], container: true }
@@ -86,8 +85,8 @@ module IsoDoc
           @anchors[elem["id"]][:label] = sublabel
           @anchors[elem["id"]][:xref] = @anchors[elem.parent["id"]][:xref] +
             " " + semx(elem, sublabel) + delim_wrap(subfigure_delim)
-                    x = @anchors[elem.parent["id"]][:container] and
-          @anchors[elem["id"]][:container] = x
+          x = @anchors[elem.parent["id"]][:container] and
+            @anchors[elem["id"]][:container] = x
         end
       end
 
@@ -128,7 +127,6 @@ module IsoDoc
         j = 0
         clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
-          #label = "#{num}#{hier_separator}#{c.print}"
           sublabel = subfigure_label(j)
           figure_anchor(t, sublabel, hiersemx(clause, num, c, t), "figure")
         end
@@ -142,9 +140,9 @@ module IsoDoc
           .noblank.each do |t|
           c[t["class"]] ||= IsoDoc::XrefGen::Counter.new
           j = subfigure_increment(j, c[t["class"]], t)
-          #label = "#{num}#{hier_separator}#{c.print}"
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          figure_anchor(t, sublabel, hiersemx(clause, num, c[t["class"]], t), t["class"])
+          figure_anchor(t, sublabel, hiersemx(clause, num, c[t["class"]], t),
+                        t["class"])
         end
       end
 
@@ -160,7 +158,7 @@ module IsoDoc
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
           c = Counter.new
           notes.noblank.each do |n|
-            #n["id"] ||= "_#{UUIDTools::UUID.random_create}"
+            # n["id"] ||= "_#{UUIDTools::UUID.random_create}"
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list",
                                               { unnumb: false, container: true })
@@ -197,22 +195,20 @@ module IsoDoc
       end
 
       def modspec_table_components_xrefs(table, table_label, container: false)
-        table.xpath(ns(".//tr[@id] | .//td[@id] | .//bookmark[@id]")).each do |tr|
+        table
+          .xpath(ns(".//tr[@id] | .//td[@id] | .//bookmark[@id]")).each do |tr|
           xref_to_modspec(tr["id"], table_label) or next
           container or @anchors[tr["id"]].delete(:container)
         end
       end
 
       def xref_to_modspec(id, table_label)
-        #(@anchors[id] && !@anchors[id][:has_modspec]) or return
+        # (@anchors[id] && !@anchors[id][:has_modspec]) or return
         (@anchors[id] && !@anchors[id][:has_table_prefix]) or return
         @anchors[id][:has_table_prefix] = true
         x = @anchors_previous[id][:xref_bare] || @anchors_previous[id][:xref]
-        # @anchors[id][:xref] = l10n("#{table_label}<span class='fmt-comma'>,</span> #{x}")
-
         @anchors[id][:xref] = l10n(@klass.connectives_spans(@i18n.nested_xref
           .sub("%1", table_label).sub("%2", x)))
-
         @anchors[id][:modspec] = @anchors_previous[id][:modspec]
         @anchors[id][:subtype] = "modspec" # prevents citetbl style from beign applied
         true

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/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/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/front_id.rb

@@ -187,9 +187,6 @@ module Metanorma
 
       def iso_id_default(params)
         params_nolang = params.dup.tap { |hs| hs.delete(:language) }
-        #params1 = if params[:unpublished]
-                    #params_nolang.dup.tap { |hs| hs.delete(:year) }
-                  #else params_nolang end
         params1 = params_nolang
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)
@@ -205,9 +202,6 @@ module Metanorma
       end
 
       def iso_id_with_lang(params)
-        #params1 = if params[:unpublished]
-                    #params.dup.tap { |hs| hs.delete(:year) }
-                  #else params end
         params1 = params
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)
@@ -220,7 +214,7 @@ module Metanorma
 
       def structured_id(node, xml)
         node.attr("docnumber") or return
-        part, subpart = node&.attr("partnumber")&.split("-")
+        part, subpart = node.attr("partnumber")&.split("-")
         xml.structuredidentifier do |i|
           i.project_number(node.attr("docnumber"), **attr_code(
             part:, subpart:,

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.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/iso/validate_requirements.rb

@@ -18,15 +18,15 @@ module Metanorma
         \\b
       REGEXP
 
-      def requirement_re
-        Regexp.new(self.class::REQUIREMENT_RE_STR.gsub(/\s/, "")
-          .gsub("_", "\\s"), Regexp::IGNORECASE)
+      def str_to_regexp(str)
+        Regexp.new(str.gsub(/\s/, "").gsub("_", "\\s"), Regexp::IGNORECASE)
       end
 
       def requirement_check(text)
         @lang == "en" or return
-        text.split(/\.\s+/).each do |t|
-          return t if requirement_re.match t
+        re = str_to_regexp(self.class::REQUIREMENT_RE_STR)
+        text.gsub(/\s+/, " ").split(/\.\s+/).each do |t|
+          return t if re.match t
         end
         nil
       end
@@ -39,15 +39,11 @@ module Metanorma
         \\b
       REGEXP
 
-      def recommendation_re
-        Regexp.new(self.class::RECOMMENDATION_RE_STR.gsub(/\s/, "")
-          .gsub("_", "\\s"), Regexp::IGNORECASE)
-      end
-
       def recommendation_check(text)
         @lang == "en" or return
-        text.split(/\.\s+/).each do |t|
-          return t if recommendation_re.match t
+        re = str_to_regexp(self.class::RECOMMENDATION_RE_STR)
+        text.gsub(/\s+/, " ").split(/\.\s+/).each do |t|
+          return t if re.match t
         end
         nil
       end
@@ -61,15 +57,11 @@ module Metanorma
         \\b
       REGEXP
 
-      def permission_re
-        @lang == "en" or return
-        Regexp.new(self.class::PERMISSION_RE_STR.gsub(/\s/, "")
-          .gsub("_", "\\s"), Regexp::IGNORECASE)
-      end
-
       def permission_check(text)
-        text.split(/\.\s+/).each do |t|
-          return t if permission_re.match t
+        @lang == "en" or return
+        re = str_to_regexp(self.class::PERMISSION_RE_STR)
+        text.gsub(/\s+/, " ").split(/\.\s+/).each do |t|
+          return t if re.match t
         end
         nil
       end
@@ -84,14 +76,10 @@ module Metanorma
         \\b
       REGEXP
 
-      def possibility_re
-        @lang == "en" or return
-        Regexp.new(self.class::POSSIBILITY_RE_STR.gsub(/\s/, "")
-          .gsub("_", "\\s"), Regexp::IGNORECASE)
-      end
-
       def possibility_check(text)
-        text.split(/\.\s+/).each { |t| return t if possibility_re.match t }
+        @lang == "en" or return
+        re = str_to_regexp(self.class::POSSIBILITY_RE_STR)
+        text.gsub(/\s+/, " ").split(/\.\s+/).each { |t| return t if re.match t }
         nil
       end
 
@@ -103,21 +91,31 @@ module Metanorma
       end
 
       AMBIG_WORDS_RE_STR = <<~REGEXP.freeze
-        \\b
-            need_to | needs_to | might | could
-        \\b
+        \\b(
+            need_to | needs_to | might | could | family_of_standards | suite_of_standards
+        )\\b
       REGEXP
 
-      def ambig_words_re
+      def ambig_words_check(text)
         @lang == "en" or return
-        Regexp.new(self.class::AMBIG_WORDS_RE_STR.gsub(/\s/, "")
-          .gsub("_", "\\s"), Regexp::IGNORECASE)
+        re = str_to_regexp(self.class::AMBIG_WORDS_RE_STR)
+        text.gsub(/\s+/, " ").split(/\.\s+/).each do |t|
+          return t if re.match t
+        end
+        nil
       end
 
-      def ambig_words_check(text)
+      MISSPELLED_WORDS_RE_STR = <<~REGEXP.freeze
+        \\b(
+            on-line | cyber_security | cyber-security
+        )\\b
+      REGEXP
+
+      def misspelled_words_check(text)
         @lang == "en" or return
-        text.split(/\.\s+/).each do |t|
-          return t if ambig_words_re.match t
+        re = str_to_regexp(self.class::MISSPELLED_WORDS_RE_STR)
+        text.gsub(/\s+/, " ").split(/\.\s+/).each do |t|
+          return t if re.match t
         end
         nil
       end

data/lib/metanorma/iso/validate_style.rb

@@ -91,7 +91,7 @@ module Metanorma
         style_units(node, text)
         style_punct(node, text)
         style_subscript(node)
-        style_ambig_words(node, text)
+        style_problem_words(node, text)
       end
 
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-s-quantity
@@ -107,12 +107,17 @@ module Metanorma
 
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-s-need
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-s-might
-      def style_ambig_words(node, text)
+      # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-s-family
+      # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-s-it
+      # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-use-of
+      def style_problem_words(node, text)
         r = ambig_words_check(text) and
           style_warning(node, "may contain ambiguous provision", r,
                         display: false)
-        @lang == "en" and style_regex(/\b(?<num>billions?)\b/i,
-                                      "ambiguous number", node, text)
+        r = misspelled_words_check(text) and
+          style_warning(node, "dispreferred spelling", r,
+                        display: false)
+        style_regex(/\b(?<num>billions?)\b/i, "ambiguous number", node, text)
       end
 
       # ISO/IEC DIR 2, 9.1

data/lib/metanorma/iso/version.rb

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

data/lib/relaton/render/config.yml

@@ -25,7 +25,7 @@ template:
   manual: book
   techreport: book
   proceedings: book
-  inbook: "{{ creatornames | selective_upcase }}. ({{role}}) {{ title }} . <em>{{host_title}}</em> ({{host_role}} {{ host_creatornames | replace: '+++', ''}}.) . {{ edition | capitalize_first }}. ({{ series }}). {% if place %}{{place}}:{%endif%} {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  inbook: "{{ creatornames | selective_upcase }}. ({{role}}) {{ title }} . <em>{{host_title}}</em> ({{host_role}} {{ host_creatornames | replace: '+++', ''}}) . {{ edition | capitalize_first }}. ({{ series }}). {% if place %}{{place}}:{%endif%} {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
   inproceedings: inbook
   incollection: inbook
   journal: "<em>{{ title}}</em> . {{ edition | capitalize_first }}. {{place}}: {{publisher}}. {{date}}. {{size}}. {{extent}}. ._{{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.1.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: metanorma-standoc