metanorma-iso 2.2.1 → 2.2.3

data/lib/metanorma/iso/isostandard.rng

@@ -1,90 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
   <include href="isodoc.rng">
     <start>
       <ref name="iso-standard"/>
     </start>
-    <define name="organization">
-      <element name="organization">
-        <oneOrMore>
-          <ref name="orgname"/>
-        </oneOrMore>
-        <optional>
-          <ref name="abbreviation"/>
-        </optional>
-        <optional>
-          <ref name="uri"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="org-identifier"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="contact"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="technical-committee"/>
-        </optional>
-        <optional>
-          <ref name="subcommittee"/>
-        </optional>
-        <optional>
-          <ref name="workgroup"/>
-        </optional>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
-      </element>
-    </define>
-    <define name="BibDataExtensionType">
-      <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <optional>
-        <ref name="horizontal"/>
-      </optional>
-      <ref name="editorialgroup"/>
-      <optional>
-        <ref name="approvalgroup"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <ref name="structuredidentifier"/>
-      <optional>
-        <ref name="stagename"/>
-      </optional>
-    </define>
-    <define name="bdate">
-      <element name="date">
-        <attribute name="type">
-          <choice>
-            <ref name="BibliographicDateType"/>
-            <text/>
-          </choice>
-        </attribute>
-        <choice>
-          <group>
-            <element name="from">
-              <ref name="ISO8601Date"/>
-            </element>
-            <optional>
-              <element name="to">
-                <ref name="ISO8601Date"/>
-              </element>
-            </optional>
-          </group>
-          <element name="on">
-            <choice>
-              <ref name="ISO8601Date"/>
-              <value>--</value>
-              <value>–</value>
-            </choice>
-          </element>
-        </choice>
-      </element>
-    </define>
     <define name="sections">
       <element name="sections">
         <zeroOrMore>
@@ -266,40 +186,6 @@
         </optional>
       </element>
     </define>
-    <define name="DocumentType">
-      <choice>
-        <value>international-standard</value>
-        <value>technical-specification</value>
-        <value>technical-report</value>
-        <value>publicly-available-specification</value>
-        <value>international-workshop-agreement</value>
-        <value>guide</value>
-        <value>amendment</value>
-        <value>technical-corrigendum</value>
-        <value>directive</value>
-      </choice>
-    </define>
-    <define name="DocumentSubtype">
-      <choice>
-        <value>specification</value>
-        <value>method-of-test</value>
-        <value>vocabulary</value>
-        <value>code-of-practice</value>
-      </choice>
-    </define>
-    <define name="structuredidentifier">
-      <element name="structuredidentifier">
-        <optional>
-          <attribute name="type"/>
-        </optional>
-        <group>
-          <ref name="documentnumber"/>
-          <optional>
-            <ref name="tc-documentnumber"/>
-          </optional>
-        </group>
-      </element>
-    </define>
     <define name="foreword">
       <element name="foreword">
         <ref name="Basic-Section"/>
@@ -310,11 +196,6 @@
         <ref name="Content-Section"/>
       </element>
     </define>
-    <define name="editorialgroup">
-      <element name="editorialgroup">
-        <ref name="ISOProjectGroup"/>
-      </element>
-    </define>
     <define name="Content-Section">
       <optional>
         <attribute name="id">
@@ -360,33 +241,6 @@
     </define>
   </include>
   <!-- end overrides -->
-  <define name="ISOProjectGroup">
-    <zeroOrMore>
-      <ref name="agency"/>
-    </zeroOrMore>
-    <oneOrMore>
-      <ref name="technical-committee"/>
-    </oneOrMore>
-    <zeroOrMore>
-      <ref name="subcommittee"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="workgroup"/>
-    </zeroOrMore>
-    <optional>
-      <ref name="secretariat"/>
-    </optional>
-  </define>
-  <define name="approvalgroup">
-    <element name="approvalgroup">
-      <ref name="ISOProjectGroup"/>
-    </element>
-  </define>
-  <define name="agency">
-    <element name="agency">
-      <text/>
-    </element>
-  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together
@@ -423,46 +277,6 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="horizontal">
-    <element name="horizontal">
-      <data type="boolean"/>
-    </element>
-  </define>
-  <define name="documentnumber">
-    <element name="project-number">
-      <optional>
-        <attribute name="part">
-          <data type="int"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="subpart">
-          <data type="int"/>
-        </attribute>
-      </optional>
-      <text/>
-    </element>
-  </define>
-  <define name="tc-documentnumber">
-    <element name="tc-document-number">
-      <data type="int"/>
-    </element>
-  </define>
-  <define name="subcommittee">
-    <element name="subcommittee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="workgroup">
-    <element name="workgroup">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="secretariat">
-    <element name="secretariat">
-      <text/>
-    </element>
-  </define>
   <define name="clause-hanging-paragraph-with-footnote">
     <element name="clause">
       <optional>
@@ -506,12 +320,4 @@
       <ref name="Clause-Section"/>
     </element>
   </define>
-  <define name="stagename">
-    <element name="stagename">
-      <optional>
-        <attribute name="abbreviation"/>
-      </optional>
-      <text/>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/iso/relaton-iso.rng

@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="biblio-standoc.rng">
+    <define name="BibDataExtensionType">
+      <optional>
+        <attribute name="schema-version"/>
+      </optional>
+      <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
+      <optional>
+        <ref name="horizontal"/>
+      </optional>
+      <ref name="editorialgroup"/>
+      <optional>
+        <ref name="approvalgroup"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="ics"/>
+      </zeroOrMore>
+      <ref name="structuredidentifier"/>
+      <optional>
+        <ref name="stagename"/>
+      </optional>
+      <optional>
+        <ref name="updates_document_type"/>
+      </optional>
+    </define>
+    <define name="bdate">
+      <element name="date">
+        <attribute name="type">
+          <choice>
+            <ref name="BibliographicDateType"/>
+            <text/>
+          </choice>
+        </attribute>
+        <choice>
+          <group>
+            <element name="from">
+              <ref name="ISO8601Date"/>
+            </element>
+            <optional>
+              <element name="to">
+                <ref name="ISO8601Date"/>
+              </element>
+            </optional>
+          </group>
+          <element name="on">
+            <choice>
+              <ref name="ISO8601Date"/>
+              <value>--</value>
+              <value>–</value>
+            </choice>
+          </element>
+        </choice>
+      </element>
+    </define>
+    <define name="organization">
+      <element name="organization">
+        <oneOrMore>
+          <ref name="orgname"/>
+        </oneOrMore>
+        <optional>
+          <ref name="abbreviation"/>
+        </optional>
+        <optional>
+          <ref name="uri"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="org-identifier"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="contact"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="technical-committee"/>
+        </optional>
+        <optional>
+          <ref name="subcommittee"/>
+        </optional>
+        <optional>
+          <ref name="workgroup"/>
+        </optional>
+        <optional>
+          <ref name="secretariat"/>
+        </optional>
+      </element>
+    </define>
+    <define name="DocumentType">
+      <choice>
+        <value>international-standard</value>
+        <value>technical-specification</value>
+        <value>technical-report</value>
+        <value>publicly-available-specification</value>
+        <value>international-workshop-agreement</value>
+        <value>guide</value>
+        <value>amendment</value>
+        <value>technical-corrigendum</value>
+        <value>directive</value>
+      </choice>
+    </define>
+    <define name="DocumentSubtype">
+      <choice>
+        <value>specification</value>
+        <value>method-of-test</value>
+        <value>vocabulary</value>
+        <value>code-of-practice</value>
+      </choice>
+    </define>
+    <define name="structuredidentifier">
+      <element name="structuredidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
+        <group>
+          <ref name="documentnumber"/>
+          <optional>
+            <ref name="tc-documentnumber"/>
+          </optional>
+        </group>
+      </element>
+    </define>
+    <define name="editorialgroup">
+      <element name="editorialgroup">
+        <ref name="ISOProjectGroup"/>
+      </element>
+    </define>
+  </include>
+  <define name="updates_document_type">
+    <element name="updates-document-type">
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="ISOProjectGroup">
+    <zeroOrMore>
+      <ref name="agency"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="technical-committee"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subcommittee"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="workgroup"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="ISOProjectGroup"/>
+    </element>
+  </define>
+  <define name="agency">
+    <element name="agency">
+      <text/>
+    </element>
+  </define>
+  <define name="horizontal">
+    <element name="horizontal">
+      <data type="boolean"/>
+    </element>
+  </define>
+  <define name="documentnumber">
+    <element name="project-number">
+      <optional>
+        <attribute name="part">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="subpart">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="amendment">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="corrigendum">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="origyr">
+          <ref name="ISO8601Date"/>
+        </attribute>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="tc-documentnumber">
+    <element name="tc-document-number">
+      <data type="int"/>
+    </element>
+  </define>
+  <define name="subcommittee">
+    <element name="subcommittee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="workgroup">
+    <element name="workgroup">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="secretariat">
+    <element name="secretariat">
+      <text/>
+    </element>
+  </define>
+  <define name="stagename">
+    <element name="stagename">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+</grammar>

data/lib/metanorma/iso/validate.rb

@@ -66,7 +66,7 @@ module Metanorma
           if /^(ISO|IEC)/.match?(t["citeas"]) &&
               !/: ?(\d+{4}|–)$/.match?(t["citeas"])
             @log.add("Style", t,
-                     "undated reference #{t['citeas']} should not contain "\
+                     "undated reference #{t['citeas']} should not contain " \
                      "specific elements")
           end
         end
@@ -79,7 +79,7 @@ module Metanorma
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-r-ref_clause3
       def term_xrefs_validate(xmldoc)
         termids = xmldoc
-          .xpath("//sections/terms | //sections/clause[.//terms] | "\
+          .xpath("//sections/terms | //sections/clause[.//terms] | " \
                  "//annex[.//terms]").each_with_object({}) do |t, m|
           t.xpath(".//*/@id").each { |a| m[a.text] = true }
           t.name == "terms" and m[t["id"]] = true
@@ -93,11 +93,11 @@ module Metanorma
         closest_id = xref.xpath("./ancestor::*[@id]")&.last or return
         (termids[xref["target"]] && !termids[closest_id["id"]]) and
           @log.add("Style", xref,
-                   "only terms clauses can cross-reference terms clause "\
+                   "only terms clauses can cross-reference terms clause " \
                    "(#{xref['target']})")
         (!termids[xref["target"]] && termids[closest_id["id"]]) and
           @log.add("Style", xref,
-                   "non-terms clauses cannot cross-reference terms clause "\
+                   "non-terms clauses cannot cross-reference terms clause " \
                    "(#{xref['target']})")
       end
 
@@ -179,7 +179,7 @@ module Metanorma
         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
@@ -191,7 +191,7 @@ module Metanorma
                  when "amendment", "technical-corrigendum" # @amd
                    "isostandard-amd.rng"
                  else
-                   "isostandard.rng"
+                   "isostandard-compile.rng"
                  end
         schema_validate(formattedstr_strip(doc.dup),
                         File.join(File.dirname(__FILE__), schema))

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.2.1".freeze
+    VERSION = "2.2.3".freeze
   end
 end

data/lib/metanorma/requirements/modspec.rb

@@ -29,41 +29,28 @@ module Metanorma
           out
         end
 
-        def recommend_title(node, out)
-          label = node.at(ns("./identifier")) or return
-          out.add_child("<tr><td>#{@labels['modspec']['identifier']}</td>"\
-                        "<td><tt>#{label.children.to_xml}</tt></td>")
-        end
-
-        def requirement_component_parse(node, out)
-          if node["exclude"] != "true" && node.name == "description"
-            lbl = "statement"
-            recommend_class(node.parent) == "recommendclass" and
-              lbl = "description"
-            out << "<tr><td>#{@labels['modspec'][lbl]}</td>"\
-                   "<td>#{node.children.to_xml}</td></tr>"
-          else
-            super
-          end
-        end
-
-        def requirement_table_cleanup(node, table)
-          return table unless table["type"] == "recommendclass"
-
-          label = if node["type"] == "conformanceclass" then "conformancetests"
-                  else "provisions" end
+        def requirement_table_nested_cleanup(node, table)
+          table["type"] == "recommendclass" or return table
           ins = table.at(ns("./tbody/tr[td/table]")) or return table
-          ins.replace("<tr><td>#{@labels['modspec'][label]}</td>" +
-                      "<td>#{nested_tables_names(table)}</td></tr>")
+          ins.replace(requirement_table_cleanup_nested_replacement(node, table))
           table.xpath(ns("./tbody/tr[td/table]")).each(&:remove)
           table
         end
 
+        def requirement_table_cleanup_nested_replacement(node, table)
+          label = "provision"
+          node["type"] == "conformanceclass" and label = "conformancetest"
+          n = nested_tables_names(table)
+          hdr = @i18n.inflect(@labels["modspec"][label],
+                              number: n.size == 1 ? "sg" : "pl")
+          "<tr><th>#{hdr}</th><td>#{n.join('<br/>')}</td></tr>"
+        end
+
         def nested_tables_names(table)
           table.xpath(ns("./tbody/tr/td/table"))
             .each_with_object([]) do |t, m|
               m << t.at(ns("./name")).children.to_xml
-            end.join("<br/>")
+            end
         end
 
         def postprocess_anchor_struct(block, anchor)
@@ -86,20 +73,17 @@ module Metanorma
             end
         end
 
-        def reqt_links_test(docxml)
-          docxml.xpath(ns("//requirement | //recommendation | //permission"))
-            .each_with_object({}) do |r, m|
-              next unless %w(conformanceclass
-                             verification).include?(r["type"])
+        def reqt_links_test1(reqt, acc)
+          return unless %w(conformanceclass
+                           verification).include?(reqt["type"])
 
-              subj = r.at(ns("./classification[tag = 'target']/value"))
-              id = r.at(ns("./identifier")) or next
-              lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref_reqt2reqt,
-                                  false)
-              next unless subj
+          subj = reqt_extract_target(reqt)
+          id = reqt.at(ns("./identifier")) or return
+          lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref_reqt2reqt,
+                              false)
+          return unless subj
 
-              m[subj.text] = { lbl: lbl, id: r["id"] }
-            end
+          acc[subj.text] = { lbl: lbl, id: reqt["id"] }
         end
 
         def reqt_links_class(docxml)

data/metanorma-iso.gemspec

@@ -25,9 +25,12 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
-  spec.files         = `git ls-files`.split("\n")
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
+  end
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-standoc", "~> 2.2.4"
   spec.add_dependency "mnconvert", "~> 1.14"