metanorma-iso 1.7.2 → 1.8.2

data/lib/asciidoctor/iso/section.rb

@@ -10,7 +10,7 @@ module Asciidoctor
       end
 
       def scope_parse(attrs, xml, node)
-        attrs = attrs.merge(type: "scope") unless @amd 
+        attrs = attrs.merge(type: "scope") unless @amd
         clause_parse(attrs, xml, node)
       end
 
@@ -32,6 +32,7 @@ module Asciidoctor
 
       def sectiontype(node, level = true)
         return nil if @amd
+
         super
       end
     end

data/lib/asciidoctor/iso/validate.rb

@@ -1,8 +1,9 @@
 require "metanorma-standoc"
-require_relative "./validate_style.rb"
-require_relative "./validate_requirements.rb"
-require_relative "./validate_section.rb"
-require_relative "./validate_title.rb"
+require_relative "./validate_style"
+require_relative "./validate_requirements"
+require_relative "./validate_section"
+require_relative "./validate_title"
+require_relative "./validate_image"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -10,17 +11,6 @@ require "iev"
 module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
-      # ISO/IEC DIR 2, 22.3.2
-      def onlychild_clause_validate(root)
-        root.xpath(Standoc::Utils::SUBCLAUSE_XPATH).each do |c|
-          next unless c.xpath("../clause").size == 1
-          title = c.at("./title")
-          location = c["id"] || c.text[0..60] + "..."
-          location += ":#{title.text}" if c["id"] && !title.nil?
-          @log.add("Style", nil, "#{location}: subclause is only child")
-        end
-      end
-
       def isosubgroup_validate(root)
         root.xpath("//technical-committee/@type").each do |t|
           unless %w{TC PC JTC JPC}.include? t.text
@@ -37,12 +27,13 @@ module Asciidoctor
       end
 
       # ISO/IEC DIR 2, 15.5.3
+      # does not deal with preceding text marked up
       def see_xrefs_validate(root)
         root.xpath("//xref").each do |t|
-          # does not deal with preceding text marked up
           preceding = t.at("./preceding-sibling::text()[last()]")
           next unless !preceding.nil? &&
             /\b(see| refer to)\s*$/mi.match(preceding)
+
           (target = root.at("//*[@id = '#{t['target']}']")) || next
           if target&.at("./ancestor-or-self::*[@obligation = 'normative']")
             @log.add("Style", t,
@@ -54,36 +45,34 @@ module Asciidoctor
       # ISO/IEC DIR 2, 15.5.3
       def see_erefs_validate(root)
         root.xpath("//eref").each do |t|
-          preceding = t.at("./preceding-sibling::text()[last()]")
-          next unless !preceding.nil? &&
-            /\b(see|refer to)\s*$/mi.match(preceding)
+          prec = t.at("./preceding-sibling::text()[last()]")
+          next unless !prec.nil? && /\b(see|refer to)\s*$/mi.match(prec)
+
           unless target = root.at("//*[@id = '#{t['bibitemid']}']")
             @log.add("Bibliography", t,
                      "'#{t} is not pointing to a real reference")
             next
           end
-          if target.at("./ancestor::references[@normative = 'true']")
+          target.at("./ancestor::references[@normative = 'true']") and
             @log.add("Style", t,
                      "'see #{t}' is pointing to a normative reference")
-          end
         end
       end
 
       # ISO/IEC DIR 2, 10.4
       def locality_erefs_validate(root)
         root.xpath("//eref[descendant::locality]").each do |t|
-          if /^(ISO|IEC)/.match t["citeas"]
-            unless /:[ ]?(\d+{4}|–)$/.match t["citeas"]
-              @log.add("Style", t,
-                       "undated reference #{t['citeas']} should not contain "\
-                       "specific elements")
-            end
+          if /^(ISO|IEC)/.match?(t["citeas"]) &&
+              !(/: ?(\d+{4}|–)$/.match?(t["citeas"]))
+            @log.add("Style", t,
+                     "undated reference #{t['citeas']} should not contain "\
+                     "specific elements")
           end
         end
       end
 
-      def termdef_warn(text, re, t, term, msg)
-        re.match(text) && @log.add("Style", t, "#{term}: #{msg}")
+      def termdef_warn(text, regex, elem, term, msg)
+        regex.match(text) && @log.add("Style", elem, "#{term}: #{msg}")
       end
 
       # ISO/IEC DIR 2, 16.5.6
@@ -103,6 +92,7 @@ module Asciidoctor
       def cited_term_style(xmldoc)
         xmldoc.xpath("//term//xref").each do |x|
           next unless xmldoc.at("//term[@id = '#{x['target']}']")
+
           x&.previous&.text == " (" and x&.previous&.previous&.name == "em" or
             style_warning(x, "term citation not preceded with italicised term",
                           x.parent.text)
@@ -111,8 +101,8 @@ module Asciidoctor
 
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
-        %w(international-standard technical-specification technical-report 
-        publicly-available-specification international-workshop-agreement 
+        %w(international-standard technical-specification technical-report
+        publicly-available-specification international-workshop-agreement
         guide amendment technical-corrigendum).include? doctype or
         @log.add("Document Attributes", nil,
                  "#{doctype} is not a recognised document type")
@@ -146,83 +136,6 @@ module Asciidoctor
                    "#{iteration} is not a recognised iteration")
       end
 
-      # DRG directives 3.7; but anticipated by standoc
-      def subfigure_validate(xmldoc)
-        xmldoc.xpath("//figure//figure").each do |f|
-          { footnote: "fn", note: "note", key: "dl" }.each do |k, v|
-            f.xpath(".//#{v}").each do |n|
-              @log.add("Style", n, "#{k} is not permitted in a subfigure")
-            end
-          end
-        end
-      end
-
-      def image_name_prefix(xmldoc)
-        std = xmldoc&.at("//bibdata/ext/structuredidentifier/project-number") or return
-        num = xmldoc&.at("//bibdata/docnumber")&.text or return
-        ed = xmldoc&.at("//bibdata/edition")&.text || "1"
-        prefix = num
-        part = std["part"] and prefix += "-#{std['part']}"
-        prefix += "_ed#{ed}"
-        amd = std["amendment"] and prefix += "amd#{amd}"
-        prefix
-      end
-
-      def image_name_suffix(xmldoc)
-        case xmldoc&.at("//bibdata/language")&.text
-        when "fr" then "_f"
-        when "de" then "_d"
-        when "ru" then "_r"
-        when "es" then "_s"
-        when "ar" then "_a"
-        when "en" then "_e"
-        else
-          "_e"
-        end
-      end
-
-      def disjunct_error(i, cond1, cond2, msg1, msg2)
-        cond1 && !cond2 and @log.add("Style", i, "image name #{i['src']} #{msg1}")
-        !cond1 && cond2 and @log.add("Style", i, "image name #{i['src']} #{msg2}")
-      end
-
-      def image_name_validate1(i, prefix)
-        m = %r[(SL)?#{prefix}fig(?<tab>Tab)?(?<annex>[A-Z])?(Text)?(?<num>\d+)
-            (?<subfig>[a-z])?(?<key>_key\d+)?(?<lang>_[a-z])?$]x.match(File.basename(i["src"], ".*"))
-        if m.nil?
-          @log.add("Style", i, "image name #{i['src']} does not match DRG requirements")
-          return
-        end
-        warn i['src']
-        disjunct_error(i, i.at("./ancestor::table"), !m[:tab].nil?,
-                       "is under a table but is not so labelled", "is labelled as under a table but is not")
-        disjunct_error(i, i.at("./ancestor::annex"), !m[:annex].nil?,
-                       "is under an annex but is not so labelled", "is labelled as under an annex but is not")
-        disjunct_error(i, i.xpath("./ancestor::figure").size > 1, !m[:subfig].nil?,
-                       "does not have a subfigure letter but is a subfigure",
-                       "has a subfigure letter but is not a subfigure")
-        lang = image_name_suffix(i.document.root)
-        (m[:lang] || "_e") == lang or @log.add("Style", i, "image name #{i['src']} expected to have suffix #{lang}")
-      end
-
-      # DRG directives 3.2
-      def image_name_validate(xmldoc)
-        prefix = image_name_prefix(xmldoc) or return
-        xmldoc.xpath("//image").each do |i|
-          if /^ISO_\d+_/.match(File.basename(i["src"]))
-          elsif /^(SL)?#{prefix}fig/.match(File.basename(i["src"]))
-            image_name_validate1(i, prefix)
-          else
-            @log.add("Style", i, "image name #{i['src']} does not match DRG requirements: expect #{prefix}fig")
-          end
-        end
-      end
-
-      def figure_validate(xmldoc)
-        image_name_validate(xmldoc)
-        subfigure_validate(xmldoc)
-      end
-
       def bibdata_validate(doc)
         doctype_validate(doc)
         script_validate(doc)
@@ -250,7 +163,7 @@ module Asciidoctor
         xmldoc.xpath("//bibitem[date/on = '–']").each do |b|
           b.at("./note[@type = 'Unpublished-Status']") or
             @log.add("Style", b,
-                     "Reference #{b&.at("./@id")&.text} does not have an "\
+                     "Reference #{b&.at('./@id')&.text} does not have an "\
                      "associated footnote indicating unpublished status")
         end
       end

data/lib/asciidoctor/iso/validate_image.rb

@@ -0,0 +1,97 @@
+module Asciidoctor
+  module ISO
+    class Converter < Standoc::Converter
+      # DRG directives 3.7; but anticipated by standoc
+      def subfigure_validate(xmldoc)
+        xmldoc.xpath("//figure//figure").each do |f|
+          { footnote: "fn", note: "note", key: "dl" }.each do |k, v|
+            f.xpath(".//#{v}").each do |n|
+              @log.add("Style", n, "#{k} is not permitted in a subfigure")
+            end
+          end
+        end
+      end
+
+      def image_name_prefix(xmldoc)
+        std = xmldoc&.at("//bibdata/ext/structuredidentifier/project-number") or
+          return
+        num = xmldoc&.at("//bibdata/docnumber")&.text or return
+        ed = xmldoc&.at("//bibdata/edition")&.text || "1"
+        prefix = num
+        std["part"] and prefix += "-#{std['part']}"
+        prefix += "_ed#{ed}"
+        amd = std["amendment"] and prefix += "amd#{amd}"
+        prefix
+      end
+
+      def image_name_suffix(xmldoc)
+        case xmldoc&.at("//bibdata/language")&.text
+        when "fr" then "_f"
+        when "de" then "_d"
+        when "ru" then "_r"
+        when "es" then "_s"
+        when "ar" then "_a"
+        when "en" then "_e"
+        else
+          "_e"
+        end
+      end
+
+      def disjunct_error(img, cond1, cond2, msg1, msg2)
+        cond1 && !cond2 and
+          @log.add("Style", img, "image name #{img['src']} #{msg1}")
+        !cond1 && cond2 and
+          @log.add("Style", img, "image name #{img['src']} #{msg2}")
+      end
+
+      def image_name_parse(img, prefix)
+        m = %r[(SL)?#{prefix}fig(?<tab>Tab)?(?<annex>[A-Z])?(Text)?(?<num>\d+)
+            (?<subfig>[a-z])?(?<key>_key\d+)?(?<lang>_[a-z])?$]x
+          .match(File.basename(img["src"], ".*"))
+        m.nil? and
+          @log.add("Style", img,
+                   "image name #{img['src']} does not match DRG requirements")
+        m
+      end
+
+      def image_name_validate1(i, prefix)
+        m = image_name_parse(i, prefix) or return
+        warn i["src"]
+        disjunct_error(i, i.at("./ancestor::table"), !m[:tab].nil?,
+                       "is under a table but is not so labelled",
+                       "is labelled as under a table but is not")
+        disjunct_error(i, i.at("./ancestor::annex"), !m[:annex].nil?,
+                       "is under an annex but is not so labelled",
+                       "is labelled as under an annex but is not")
+        disjunct_error(i, i.xpath("./ancestor::figure").size > 1, !m[:subfig].nil?,
+                       "does not have a subfigure letter but is a subfigure",
+                       "has a subfigure letter but is not a subfigure")
+        lang = image_name_suffix(i.document.root)
+        (m[:lang] || "_e") == lang or
+          @log.add("Style", i,
+                   "image name #{i['src']} expected to have suffix #{lang}")
+      end
+
+      # DRG directives 3.2
+      def image_name_validate(xmldoc)
+        prefix = image_name_prefix(xmldoc) or return
+        xmldoc.xpath("//image").each do |i|
+          next if i["src"].start_with?("data:")
+
+          if /^ISO_\d+_/.match?(File.basename(i["src"]))
+          elsif /^(SL)?#{prefix}fig/.match?(File.basename(i["src"]))
+            image_name_validate1(i, prefix)
+          else
+            @log.add("Style", i,
+                     "image name #{i['src']} does not match DRG requirements: expect #{prefix}fig")
+          end
+        end
+      end
+
+      def figure_validate(xmldoc)
+        image_name_validate(xmldoc)
+        subfigure_validate(xmldoc)
+      end
+    end
+  end
+end

data/lib/asciidoctor/iso/validate_requirements.rb

@@ -1,6 +1,4 @@
 require "metanorma-standoc"
-require "nokogiri"
-require "pp"
 
 module Asciidoctor
   module ISO
@@ -19,13 +17,15 @@ module Asciidoctor
            [.,:;]_do_not )
         \\b
       REGEXP
-      REQUIREMENT_RE =
-        Regexp.new(REQUIREMENT_RE_STR.gsub(/\s/, "").gsub(/_/, "\\s"),
-                   Regexp::IGNORECASE)
+
+      def requirement_re
+        Regexp.new(self.class::REQUIREMENT_RE_STR.gsub(/\s/, "")
+          .gsub(/_/, "\\s"), Regexp::IGNORECASE)
+      end
 
       def requirement_check(text)
         text.split(/\.\s+/).each do |t|
-          return t if REQUIREMENT_RE.match t
+          return t if requirement_re.match t
         end
         nil
       end
@@ -37,13 +37,15 @@ module Asciidoctor
             it_is_(not_)?recommended_that
         \\b
       REGEXP
-      RECOMMENDATION_RE =
-        Regexp.new(RECOMMENDATION_RE_STR.gsub(/\s/, "").gsub(/_/, "\\s"),
-                   Regexp::IGNORECASE)
+
+      def recommendation_re
+        Regexp.new(self.class::RECOMMENDATION_RE_STR.gsub(/\s/, "")
+          .gsub(/_/, "\\s"), Regexp::IGNORECASE)
+      end
 
       def recommendation_check(text)
         text.split(/\.\s+/).each do |t|
-          return t if RECOMMENDATION_RE.match t
+          return t if recommendation_re.match t
         end
         nil
       end
@@ -56,13 +58,15 @@ module Asciidoctor
             no\\b[^.,]+\\b(is|are)_required
         \\b
       REGEXP
-      PERMISSION_RE =
-        Regexp.new(PERMISSION_RE_STR.gsub(/\s/, "").gsub(/_/, "\\s"),
-                   Regexp::IGNORECASE)
+
+      def permission_re
+        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
+          return t if permission_re.match t
         end
         nil
       end
@@ -76,18 +80,20 @@ module Asciidoctor
            it_is_not_possible_to
         \\b
       REGEXP
-      POSSIBILITY_RE =
-        Regexp.new(POSSIBILITY_RE_STR.gsub(/\s/, "").gsub(/_/, "\\s"),
-                   Regexp::IGNORECASE)
 
-      def possibility(text)
-        text.split(/\.\s+/).each { |t| return t if POSSIBILITY_RE.match t }
+      def possibility_re
+        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 }
         nil
       end
 
       def external_constraint(text)
         text.split(/\.\s+/).each do |t|
-          return t if /\b(must)\b/xi.match t
+          return t if /\b(must)\b/xi.match? t
         end
         nil
       end

data/lib/asciidoctor/iso/validate_section.rb

@@ -50,10 +50,11 @@ module Asciidoctor
       end
 
       def seqcheck(names, msg, accepted)
-        n = names.shift 
+        n = names.shift
         return [] if n.nil?
+
         test = accepted.map { |a| n.at(a) }
-        if test.all? { |a| a.nil? }
+        if test.all?(&:nil?)
           @log.add("Style", nil, msg)
         end
         names
@@ -74,37 +75,38 @@ module Asciidoctor
         [
           {
             msg: "Initial section must be (content) Foreword",
-            val:  ["./self::foreword"]
+            val: ["./self::foreword"],
           },
           {
             msg: "Prefatory material must be followed by (clause) Scope",
-            val: ["./self::introduction", "./self::clause[@type = 'scope']" ]
+            val: ["./self::introduction", "./self::clause[@type = 'scope']"],
           },
           {
             msg: "Prefatory material must be followed by (clause) Scope",
-            val: ["./self::clause[@type = 'scope']" ]
+            val: ["./self::clause[@type = 'scope']"],
           },
           {
             msg: "Normative References must be followed by "\
             "Terms and Definitions",
-            val: ["./self::terms | .//terms"]
+            val: ["./self::terms | .//terms"],
           },
-      ].freeze
+        ].freeze
 
       SECTIONS_XPATH =
         "//foreword | //introduction | //sections/terms | .//annex | "\
-        "//sections/definitions | //sections/clause | //references[not(parent::clause)] | "\
+        "//sections/definitions | //sections/clause | "\
+        "//references[not(parent::clause)] | "\
         "//clause[descendant::references][not(parent::clause)]".freeze
 
       def sections_sequence_validate(root)
         names = root.xpath(SECTIONS_XPATH)
-        names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val]) 
+        names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val])
         n = names[0]
-        names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val]) 
+        names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val])
         if n&.at("./self::introduction")
-          names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val]) 
+          names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val])
         end
-        names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val]) 
+        names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val])
         n = names.shift
         if n&.at("./self::definitions")
           n = names.shift
@@ -117,11 +119,11 @@ module Asciidoctor
                    "Terms and Definitions")
         n&.at("./self::clause[@type = 'scope']") &&
           @log.add("Style", nil, "Scope must occur before Terms and Definitions")
-        n = names.shift 
+        n = names.shift
         while n&.name == "clause"
           n&.at("./self::clause[@type = 'scope']")
           @log.add("Style", nil, "Scope must occur before Terms and Definitions")
-          n = names.shift 
+          n = names.shift
         end
         unless %w(annex references).include? n&.name
           @log.add("Style", nil, "Only annexes and references can follow clauses")
@@ -145,6 +147,7 @@ module Asciidoctor
 
       def style_warning(node, msg, text = nil)
         return if @novalid
+
         w = msg
         w += ": #{text}" if text
         @log.add("Style", node, w)
@@ -165,15 +168,18 @@ module Asciidoctor
 
       def tech_report_style(root)
         root.at("//bibdata/ext/doctype")&.text == "technical-report" or return
-        root.xpath("//sections/clause[not(@type = 'scope')] | //annex").each do |s|
-          r = requirement_check(extract_text(s))
-          style_warning(s, "Technical Report clause may contain requirement", r) if r
+        root.xpath("//sections/clause[not(@type = 'scope')] | //annex")
+          .each do |s|
+          r = requirement_check(extract_text(s)) and
+            style_warning(s,
+                          "Technical Report clause may contain requirement", r)
         end
       end
 
       ASSETS_TO_STYLE =
-        "//termsource | //formula | //termnote | //p[not(ancestor::boilerplate)] | "\
-        "//li[not(p)] | //dt | //dd[not(p)] | //td[not(p)] | //th[not(p)]".freeze
+        "//termsource | //formula | //termnote | "\
+        "//p[not(ancestor::boilerplate)] | //li[not(p)] | //dt | "\
+        "//dd[not(p)] | //td[not(p)] | //th[not(p)]".freeze
 
       NORM_BIBITEMS =
         "//references[@normative = 'true']/bibitem".freeze
@@ -198,10 +204,23 @@ module Asciidoctor
       end
 
       def subclause_validate(root)
-        root.xpath("//clause/clause/clause/clause/clause/clause/clause/clause").each do |c|
+        root.xpath("//clause/clause/clause/clause/clause/clause/clause/clause")
+          .each do |c|
           style_warning(c, "Exceeds the maximum clause depth of 7", nil)
         end
       end
+
+      # ISO/IEC DIR 2, 22.3.2
+      def onlychild_clause_validate(root)
+        root.xpath(Standoc::Utils::SUBCLAUSE_XPATH).each do |c|
+          next unless c.xpath("../clause").size == 1
+
+          title = c.at("./title")
+          location = c["id"] || "#{c.text[0..60]}..."
+          location += ":#{title.text}" if c["id"] && !title.nil?
+          @log.add("Style", nil, "#{location}: subclause is only child")
+        end
+      end
     end
   end
 end