metanorma-iso 3.1.0 → 3.1.2

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.1.0".freeze
+    VERSION = "3.1.2".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}}]."

data/metanorma-iso.gemspec

@@ -50,5 +50,5 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "xml-c14n"
+  spec.add_development_dependency "canon"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="