metanorma-iso 1.8.5 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03102677d8945780e2f740623d37d330fe17e21da1a09c22366c363280494f3d
-  data.tar.gz: 02ea370f541458d81368951748aa0b1c23c8512a455d4b43f454a86f1e1c2e24
+  metadata.gz: 8557db1b500f1f756f6f4c755f1adffd884529b0aa77bdce9dc47cdf38288948
+  data.tar.gz: 4d7f35c2b6ab91853e06d225d9ec679b2696e9392b2695d6002ff9c2fdb9fd90
 SHA512:
-  metadata.gz: d8d33cbd55be69bcb3e5538213c228fb41ca608239621a6e3e4323cfdb38f7a4cfd020afb29c9b704d0e450ee6a6dec8db6fd1c67a7c606b1698190d7263e250
-  data.tar.gz: ee9de2ba543b4527ed413cc673f3451ae2e521c356bd0c704808c2bb193fd6f5ade5f081ff148be9ec5a543fba65efe67371796c48e40b4a8f1a0617c5a46704
+  metadata.gz: 0c40cff218ad2aacbeaf1ca44f315398115c9e9fc13e8fa2a845456328e94b743b0c08ede991ff12204ba4da67ce5cc541369082265c4580b0fd23addec64fa8
+  data.tar.gz: 06f917f6556624e961dfb33f59be02c88440b8a842909d280e1c41bbe3540e783931bd309f6f99af8d7f15caf4af42c1de55634270c471889a239f418ec267f4

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
     steps:

data/lib/asciidoctor/iso/cleanup.rb

@@ -3,7 +3,6 @@ require "nokogiri"
 require "htmlentities"
 require "json"
 require "pathname"
-require "open-uri"
 
 module Asciidoctor
   module ISO

data/lib/asciidoctor/iso/isodoc.rng

@@ -204,6 +204,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="dt">
+      <element name="dt">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -899,7 +911,7 @@
   </include>
   <!-- end overrides -->
   <define name="docsubtype">
-    <element name="docsubtype">
+    <element name="subdoctype">
       <ref name="DocumentSubtype"/>
     </element>
   </define>
@@ -955,7 +967,34 @@
   <define name="concept">
     <element name="concept">
       <optional>
-        <attribute name="term"/>
+        <attribute name="ital">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="ref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <element name="refterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="renderterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
       </optional>
       <choice>
         <ref name="eref"/>
@@ -972,8 +1011,14 @@
       <ref name="imagemap"/>
       <ref name="svgmap"/>
       <ref name="inputform"/>
+      <ref name="toc"/>
     </choice>
   </define>
+  <define name="toc">
+    <element name="toc">
+      <ref name="ul"/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -981,6 +1026,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1212,6 +1260,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">
@@ -1473,26 +1527,26 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <group>
+    <choice>
       <choice>
         <group>
-          <zeroOrMore>
+          <oneOrMore>
             <ref name="BasicBlock"/>
-          </zeroOrMore>
+          </oneOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
         <ref name="amend"/>
       </choice>
-      <zeroOrMore>
+      <oneOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </zeroOrMore>
-    </group>
+      </oneOrMore>
+    </choice>
   </define>
   <define name="Annex-Section">
     <optional>

data/lib/asciidoctor/iso/isostandard.rng

@@ -101,7 +101,11 @@
           <ref name="definitions"/>
         </optional>
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
@@ -136,7 +140,7 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <group>
+      <choice>
         <choice>
           <group>
             <oneOrMore>
@@ -151,7 +155,7 @@
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </group>
+      </choice>
     </define>
     <define name="term">
       <element name="term">

data/lib/asciidoctor/iso/section.rb

@@ -33,6 +33,9 @@ module Asciidoctor
       def sectiontype(node, level = true)
         return nil if @amd
 
+        ret = sectiontype_streamline(sectiontype1(node))
+        return ret if ret == "terms and definitions" && @vocab
+
         super
       end
     end

data/lib/asciidoctor/iso/validate.rb

@@ -32,7 +32,7 @@ module Asciidoctor
         root.xpath("//xref").each do |t|
           preceding = t.at("./preceding-sibling::text()[last()]")
           next unless !preceding.nil? &&
-            /\b(see| refer to)\s*$/mi.match(preceding)
+            /\b(see| refer to)\s*\Z/mi.match(preceding)
 
           (target = root.at("//*[@id = '#{t['target']}']")) || next
           if target&.at("./ancestor-or-self::*[@obligation = 'normative']")
@@ -46,7 +46,7 @@ module Asciidoctor
       def see_erefs_validate(root)
         root.xpath("//eref").each do |t|
           prec = t.at("./preceding-sibling::text()[last()]")
-          next unless !prec.nil? && /\b(see|refer to)\s*$/mi.match(prec)
+          next unless !prec.nil? && /\b(see|refer to)\s*\Z/mi.match(prec)
 
           unless target = root.at("//*[@id = '#{t['bibitemid']}']")
             @log.add("Bibliography", t,
@@ -80,23 +80,11 @@ module Asciidoctor
         xmldoc.xpath("//term").each do |t|
           para = t.at("./definition") || return
           term = t.at("./preferred").text
-          termdef_warn(para.text, /^(the|a)\b/i, t, term,
+          termdef_warn(para.text, /\A(the|a)\b/i, t, term,
                        "term definition starts with article")
-          termdef_warn(para.text, /\.$/i, t, term,
+          termdef_warn(para.text, /\.\Z/i, t, term,
                        "term definition ends with period")
         end
-        cited_term_style(xmldoc)
-      end
-
-      # ISO/IEC DIR 2, 16.5.10
-      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)
-        end
       end
 
       def doctype_validate(xmldoc)
@@ -150,7 +138,6 @@ module Asciidoctor
         isosubgroup_validate(doc.root)
         onlychild_clause_validate(doc.root)
         termdef_style(doc.root)
-        iev_validate(doc.root)
         see_xrefs_validate(doc.root)
         see_erefs_validate(doc.root)
         locality_erefs_validate(doc.root)

data/lib/asciidoctor/iso/validate_section.rb

@@ -42,7 +42,7 @@ module Asciidoctor
         f.empty? && return
         (f.size == 1) || @log.add("Style", f.first, ONE_SYMBOLS_WARNING)
         f.first.elements.each do |e|
-          unless e.name == "dl"
+          unless %w(title dl).include? e.name
             @log.add("Style", f.first, NON_DL_SYMBOLS_WARNING)
             return
           end
@@ -99,57 +99,73 @@ module Asciidoctor
         "//clause[descendant::references][not(parent::clause)]".freeze
 
       def sections_sequence_validate(root)
-        vocab = root&.at("//bibdata/ext/subdoctype")&.text == "vocabulary"
+        names, n = sections_sequence_validate_start(root)
+        if root&.at("//bibdata/ext/subdoctype")&.text == "vocabulary"
+          names, n = sections_sequence_validate_body_vocab(names, n)
+        else
+          names, n = sections_sequence_validate_body(names, n)
+        end
+        sections_sequence_validate_end(names, n)
+      end
+
+      def sections_sequence_validate_start(root)
         names = root.xpath(SECTIONS_XPATH)
         names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val])
         n = names[0]
         names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val])
-        if n&.at("./self::introduction")
+        n&.at("./self::introduction") and
           names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val])
-        end
         names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val])
         n = names.shift
-        if n&.at("./self::definitions")
-          n = names.shift
-        end
-        if n.nil? || n.name != "clause"
-          @log.add("Style", n, "Document must contain at least one clause")
+        n = names.shift if n&.at("./self::definitions")
+        [names, n]
+      end
+
+      def sections_sequence_validate_body(names, elem)
+        if elem.nil? || elem.name != "clause"
+          @log.add("Style", elem, "Document must contain at least one clause")
         end
-        n&.at("./self::clause") ||
-          @log.add("Style", n, "Document must contain clause after "\
+        elem&.at("./self::clause") ||
+          @log.add("Style", elem, "Document must contain clause after "\
                    "Terms and Definitions")
-        n&.at("./self::clause[@type = 'scope']") &&
-          @log.add("Style", n, "Scope must occur before Terms and Definitions")
-        n = names.shift
-        while n&.name == "clause" || (vocab && n&.name == "terms")
-          n&.at("./self::clause[@type = 'scope']")
-          @log.add("Style", n, "Scope must occur before Terms and Definitions")
-          n = names.shift
+        elem&.at("./self::clause[@type = 'scope']") &&
+          @log.add("Style", elem, "Scope must occur before Terms and Definitions")
+        elem = names.shift
+        while elem&.name == "clause"
+          elem&.at("./self::clause[@type = 'scope']")
+          @log.add("Style", elem, "Scope must occur before Terms and Definitions")
+          elem = names.shift
         end
-        if vocab
-          unless %w(annex references terms).include? n&.name
-            @log.add("Style", n, "Only terms, annexes and references can follow clauses")
-          end
-        else
-          unless %w(annex references).include? n&.name
-            @log.add("Style", n, "Only annexes and references can follow clauses")
-          end
+        %w(annex references).include? elem&.name or
+          @log.add("Style", elem, "Only annexes and references can follow clauses")
+        [names, elem]
+      end
+
+      def sections_sequence_validate_body_vocab(names, elem)
+        while elem && %w(clause terms).include?(elem.name)
+          elem = names.shift
         end
-        while n&.name == "annex"
-          n = names.shift
-          if n.nil?
+        %w(annex references).include? elem&.name or
+          @log.add("Style", elem, "Only annexes and references can follow terms and clauses")
+        [names, elem]
+      end
+
+      def sections_sequence_validate_end(names, elem)
+        while elem&.name == "annex"
+          elem = names.shift
+          if elem.nil?
             @log.add("Style", nil, "Document must include (references) "\
                      "Normative References")
           end
         end
-        n&.at("./self::references[@normative = 'true']") ||
+        elem&.at("./self::references[@normative = 'true']") ||
           @log.add("Style", nil, "Document must include (references) "\
                    "Normative References")
-        n = names&.shift
-        n&.at("./self::references[@normative = 'false']") ||
-          @log.add("Style", n, "Final section must be (references) Bibliography")
+        elem = names&.shift
+        elem&.at("./self::references[@normative = 'false']") ||
+          @log.add("Style", elem, "Final section must be (references) Bibliography")
         names.empty? ||
-          @log.add("Style", n, "There are sections after the final Bibliography")
+          @log.add("Style", elem, "There are sections after the final Bibliography")
       end
 
       def style_warning(node, msg, text = nil)

data/lib/asciidoctor/iso/validate_style.rb

@@ -102,8 +102,8 @@ module Asciidoctor
       # ISO/IEC DIR 2, Table B.1
       def style_number(node, text)
         style_two_regex_not_prev(
-          node, text, /^(?<num>-?[0-9]{4,}[,0-9]*)$/,
-          %r{\b(ISO|IEC|IEEE/|(in|January|February|March|April|May|June|August|September|October|November|December)\b)$},
+          node, text, /^(?<num>-?[0-9]{4,}[,0-9]*)\Z/,
+          %r{\b(ISO|IEC|IEEE/|(in|January|February|March|April|May|June|August|September|October|November|December)\b)\Z},
           "number not broken up in threes"
         )
         style_regex(/\b(?<num>[0-9]+\.[0-9]+)/i,
@@ -123,7 +123,7 @@ module Asciidoctor
       # ISO/IEC DIR 2, 8.4
       # ISO/IEC DIR 2, 9.3
       def style_abbrev(node, text)
-        style_regex(/(^|\s)(?!e\.g\.|i\.e\.)
+        style_regex(/(\A|\s)(?!e\.g\.|i\.e\.)
                     (?<num>[a-z]{1,2}\.([a-z]{1,2}|\.))\b/ix,
                     "no dots in abbreviations", node, text)
         style_regex(/\b(?<num>ppm)\b/i,

data/lib/isodoc/iso/base_convert.rb

@@ -112,9 +112,9 @@ module IsoDoc
 
       def formula_where(dlist, out)
         return if dlist.nil?
-        return super unless (dlist&.xpath(ns("./dt"))&.size == 1 && 
-                             dlist&.at(ns("./dd"))&.elements&.size == 1 &&
-                             dlist&.at(ns("./dd/p")))
+        return super unless dlist&.xpath(ns("./dt"))&.size == 1 &&
+          dlist&.at(ns("./dd"))&.elements&.size == 1 &&
+          dlist&.at(ns("./dd/p"))
 
         out.span **{ class: "zzMoveToFollowing" } do |s|
           s << "#{@i18n.where} "
@@ -128,8 +128,11 @@ module IsoDoc
         type = node["type"]
         name = admonition_name(node, type)
         out.div **{ id: node["id"], class: admonition_class(node) } do |div|
-          node.first_element_child.name == "p" ?
-            admonition_p_parse(node, div, name) : admonition_parse1(node, div, name)
+          if node.first_element_child.name == "p"
+            admonition_p_parse(node, div, name)
+          else
+            admonition_parse1(node, div, name)
+          end
         end
       end
 
@@ -160,10 +163,32 @@ module IsoDoc
       end
 
       def middle(isoxml, out)
-        super
+        middle_title(isoxml, out)
+        middle_admonitions(isoxml, out)
+        i = scope isoxml, out, 0
+        i = norm_ref isoxml, out, i
+        # i = terms_defs isoxml, out, i
+        # symbols_abbrevs isoxml, out, i
+        clause_etc isoxml, out, i
+        annex isoxml, out
+        bibliography isoxml, out
         indexsect isoxml, out
       end
 
+      def clause_etc(isoxml, out, num)
+        isoxml.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
+                        "//sections/terms | //sections/definitions")).each do |f|
+          out.div **attr_code(id: f["id"],
+                              class: f.name == "definitions" ? "Symbols" : nil) do |div|
+            num = num + 1
+            clause_name(num, f&.at(ns("./title")), div, nil)
+            f.elements.each do |e|
+              parse(e, div) unless %w{title source}.include? e.name
+            end
+          end
+        end
+      end
+
       def indexsect(isoxml, out)
         isoxml.xpath(ns("//indexsect")).each do |i|
           clause_parse(i, out)