metanorma-iso 3.0.3 → 3.0.5

data/lib/metanorma/iso/section.rb

@@ -4,7 +4,9 @@ require "uri" if /^2\./.match?(RUBY_VERSION)
 module Metanorma
   module Iso
     class Converter < Standoc::Converter
-      def clause_parse(attrs, xml, node)
+
+      # KILL
+      def clause_parsex(attrs, xml, node)
         node.option? "appendix" and return appendix_parse(attrs, xml, node)
         super
       end
@@ -14,7 +16,8 @@ module Metanorma
         clause_parse(attrs, xml, node)
       end
 
-      def appendix_parse(attrs, xml, node)
+      # KILL
+      def appendix_parsex(attrs, xml, node)
         attrs[:"inline-header"] = node.option? "inline-header"
         set_obligation(attrs, node)
         xml.appendix **attr_code(attrs) do |xml_section|
@@ -23,6 +26,10 @@ module Metanorma
         end
       end
 
+      def support_appendix?(_node)
+        true
+      end
+
       def patent_notice_parse(xml, node)
         # xml.patent_notice do |xml_section|
         #  xml_section << node.content

data/lib/metanorma/iso/validate.rb

@@ -14,16 +14,14 @@ module Metanorma
     class Converter < Standoc::Converter
       def isosubgroup_validate(root)
         root.xpath("//technical-committee/@type").each do |t|
-          unless %w{TC PC JTC JPC}.include? t.text
+          %w{TC PC JTC JPC}.include?(t.text) or
             @log.add("Document Attributes", nil,
                      "invalid technical committee type #{t}")
-          end
         end
         root.xpath("//subcommittee/@type").each do |t|
-          unless %w{SC JSC}.include? t.text
+          %w{SC JSC}.include?(t.text) or
             @log.add("Document Attributes", nil,
                      "invalid subcommittee type #{t}")
-          end
         end
       end
 
@@ -193,15 +191,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_list.rb

@@ -61,7 +61,7 @@ module Metanorma
         when ":", "" then list_after_colon_punctuation(list, entries)
         when "." then entries.each { |li| list_full_sentence(li) }
         else style_warning(list, "All lists must be preceded by " \
-                                 "colon or full stop", prectext)
+                                 "colon or full stop", prectext, display: false)
         end
       end
 
@@ -81,7 +81,7 @@ module Metanorma
         text = elem.text.strip
         starts_lowercase?(text) or
           style_warning(elem, "List entry of broken up sentence must start " \
-                              "with lowercase letter", text)
+                              "with lowercase letter", text, display: false)
         list_semicolon_phrase_punct(elem, text, last)
       end
 
@@ -90,11 +90,12 @@ module Metanorma
         if last
           punct == "." or
             style_warning(elem, "Final list entry of broken up " \
-                                "sentence must end with full stop", text)
+                                "sentence must end with full stop", text,
+                          display: false)
         else
           punct == ";" or
             style_warning(elem, "List entry of broken up sentence must " \
-                                "end with semicolon", text)
+                                "end with semicolon", text, display: false)
         end
       end
 
@@ -103,11 +104,11 @@ module Metanorma
         text = elem.text.strip
         starts_uppercase?(text) or
           style_warning(elem, "List entry of separate sentences must start " \
-                              "with uppercase letter", text)
+                              "with uppercase letter", text, display: false)
         punct = text.strip.sub(/^.*?(\S)$/m, "\\1")
         punct == "." or
           style_warning(elem, "List entry of separate sentences must " \
-                              "end with full stop", text)
+                              "end with full stop", text, display: false)
       end
 
       # allow that all-caps word (acronym) is agnostic as to lowercase

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.3".freeze
+    VERSION = "3.0.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc