metanorma-iso 3.0.2 → 3.0.4

data/lib/metanorma/iso/validate.rb

@@ -92,11 +92,11 @@ module Metanorma
 
       def term_xrefs_validate1(xref, termids)
         closest_id = xref.xpath("./ancestor::*[@id]")&.last or return
-        (termids[xref["target"]] && !termids[closest_id["id"]]) and
+        termids[xref["target"]] && !termids[closest_id["id"]] and
           @log.add("Style", xref,
                    "only terms clauses can cross-reference terms clause " \
                    "(#{xref['target']})")
-        (!termids[xref["target"]] && termids[closest_id["id"]]) and
+        !termids[xref["target"]] && termids[closest_id["id"]] and
           @log.add("Style", xref,
                    "non-terms clauses cannot cross-reference terms clause " \
                    "(#{xref['target']})")
@@ -193,15 +193,12 @@ module Metanorma
         end
       end
 
-      def validate(doc)
-        content_validate(doc)
-        schema = case @doctype
-                 when "amendment", "technical-corrigendum" # @amd
-                   "isostandard-amd.rng"
-                 else "isostandard-compile.rng"
-                 end
-        schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), schema))
+      def schema_file
+        case @doctype
+        when "amendment", "technical-corrigendum" # @amd
+          "isostandard-amd.rng"
+        else "isostandard-compile.rng"
+        end
       end
     end
   end

data/lib/metanorma/iso/validate_requirements.rb

@@ -124,12 +124,15 @@ module Metanorma
 
       def style_no_guidance(node, text, docpart)
         @lang == "en" or return
-        r = requirement_check(text)
-        style_warning(node, "#{docpart} may contain requirement", r) if r
-        r = permission_check(text)
-        style_warning(node, "#{docpart} may contain permission", r) if r
-        r = recommendation_check(text)
-        style_warning(node, "#{docpart} may contain recommendation", r) if r
+        r = requirement_check(text) and
+          style_warning(node, "#{docpart} may contain requirement", r,
+                        display: false)
+        r = permission_check(text) and
+          style_warning(node, "#{docpart} may contain permission", r,
+                        display: false)
+        r = recommendation_check(text) and
+          style_warning(node, "#{docpart} may contain recommendation", r,
+                        display: false)
       end
     end
   end

data/lib/metanorma/iso/validate_style.rb

@@ -30,15 +30,17 @@ module Metanorma
       # ISO/IEC DIR 2, 13.2
       def introduction_style(node)
         @novalid and return
-        r = requirement_check(extract_text(node))
-        style_warning(node, "Introduction may contain requirement", r) if r
+        r = requirement_check(extract_text(node)) and
+          style_warning(node, "Introduction may contain requirement", r,
+                        display: false)
       end
 
       # ISO/IEC DIR 2, 16.5.6
       def definition_style(node)
         @novalid and return
-        r = requirement_check(extract_text(node))
-        style_warning(node, "Definition may contain requirement", r) if r
+        r = requirement_check(extract_text(node)) and
+          style_warning(node, "Definition may contain requirement", r,
+                        display: false)
       end
 
       # ISO/IEC DIR 2, 16.5.7
@@ -70,8 +72,7 @@ module Metanorma
       # style check with a regex on a token
       # and a negative match on its preceding token
       def style_two_regex_not_prev(n, text, regex, re_prev, warning)
-        return if text.nil?
-
+        text.nil? and return
         arr = Tokenizer::WhitespaceTokenizer.new.tokenize(text)
         arr.each_index do |i|
           m = regex.match arr[i]
@@ -108,7 +109,8 @@ module Metanorma
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-s-might
       def style_ambig_words(node, text)
         r = ambig_words_check(text) and
-          style_warning(node, "may contain ambiguous provision", r)
+          style_warning(node, "may contain ambiguous provision", r,
+                        display: false)
         @lang == "en" and style_regex(/\b(?<num>billions?)\b/i,
                                       "ambiguous number", node, text)
       end
@@ -208,12 +210,11 @@ module Metanorma
         end
       end
 
-      def style_warning(node, msg, text = nil)
-        return if @novalid
-
+      def style_warning(node, msg, text = nil, display: true)
+        @novalid and return
         w = msg
         w += ": #{text}" if text
-        @log.add("Style", node, w)
+        @log.add("Style", node, w, display:)
       end
 
       ASSETS_TO_STYLE =

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.0.2".freeze
+    VERSION = "3.0.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -352,6 +352,7 @@ files:
 - lib/isodoc/iso/metadata.rb
 - lib/isodoc/iso/pdf_convert.rb
 - lib/isodoc/iso/presentation_bibdata.rb
+- lib/isodoc/iso/presentation_section.rb
 - lib/isodoc/iso/presentation_terms.rb
 - lib/isodoc/iso/presentation_xml_convert.rb
 - lib/isodoc/iso/presentation_xref.rb