metanorma-iso 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0af0800e26b96ca0808ae0be76f68c3311325d2271c10a1c91cd112bc041dcc4
-  data.tar.gz: 587c652c18c8845754062388caf26d4968b6d1f7742bb049a04fe41b88dae29a
+  metadata.gz: 64ff031dbcbae3aeb600c99c3c200b27983e96d865a49c52413245c470885824
+  data.tar.gz: 81ea3cfa5672feae8e31aff1341224310f15f85d74d85a0ca017e3ceba829421
 SHA512:
-  metadata.gz: 9e0ad39b60566f4ddf7aee46f15c9cb68c32e44e61a1f55bf26a64b7ffbe5c65ab8015dc41f4b95afdf06e79fa2c0c46fe75b3ccd93a6d19ebbfb6747fbb4f85
-  data.tar.gz: 695551d2e13d64d7b522634fcfb6e81a002e9f0a1c0440cc6ef1614b8bc53546f23d8c2b53159665644f5e31bd2dde43a610930e01fdf6a5850675deac68fcb7
+  metadata.gz: fdb2b2f7a30d439df33decf4e0f97fedf91f7545aa7ee7f1c43e9a4a66b21ef942ddb7e9f77520ebdbb68dcc509332e0651a866f2ec33e98835e70c67f641546
+  data.tar.gz: 03500425f5f236f69010d688aaa906719f52eac6695d4dbe1ed78d6b63e6d2943a8b2299f8d19a05ae18570deb6f3d22b380a6f1b69da4d386d2d817da42273e

data/lib/isodoc/iso/i18n-en.yaml

@@ -78,3 +78,5 @@ requirements:
   modspec:
     description: Description
     provisions: Provisions
+    conformancetests: Conformance tests
+    # pending proper handling of inflection

data/lib/isodoc/iso/i18n-fr.yaml

@@ -72,3 +72,4 @@ requirements:
   modspec:
     description: Description
     provisions: Dispositions
+    conformancetests: Tests de conformité

data/lib/isodoc/iso/iso.amendment.xsl

@@ -5,6 +5,7 @@
 	<xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
 
 	<xsl:key name="attachments" match="iso:eref[java:endsWith(java:java.lang.String.new(@bibitemid),'.exp')]" use="@bibitemid"/>
+	<xsl:key name="attachments2" match="iso:eref[contains(@bibitemid,'.exp_')]" use="@bibitemid"/>
 
 	<xsl:variable name="namespace_full">https://www.metanorma.org/ns/iso</xsl:variable>
 
@@ -435,6 +436,15 @@
 					<xsl:variable name="url" select="concat('url(file:',$basepath, @bibitemid, ')')"/>
 					<pdf:embedded-file src="{$url}" filename="{@bibitemid}"/>
 				</xsl:for-each>
+				<xsl:for-each select="//*[local-name() = 'eref'][generate-id(.)=generate-id(key('attachments2',@bibitemid)[1])]">
+					<xsl:variable name="bibitemid" select="@bibitemid"/>
+					<xsl:variable name="uri" select="normalize-space($bibitems/*[local-name() ='bibitem'][@hidden = 'true'][@id = $bibitemid][1]/*[local-name() = 'uri'][@type='citation'])"/>
+					<xsl:if test="$uri != ''">
+						<xsl:variable name="url" select="concat('url(file:',$basepath, $uri, ')')"/>
+						<xsl:variable name="filename" select="concat(substring-before($bibitemid, '.exp_'), '.exp')"/>
+						<pdf:embedded-file src="{$url}" filename="{$filename}"/>
+					</xsl:if>
+				</xsl:for-each>
 			</fo:declarations>
 
 			<xsl:call-template name="addBookmarks">
@@ -1948,6 +1958,28 @@
 		</fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'eref'][contains(@bibitemid,'.exp_')]" priority="2">
+		<xsl:variable name="bibitemid" select="@bibitemid"/>
+		<xsl:variable name="uri" select="normalize-space($bibitems/*[local-name() ='bibitem'][@hidden = 'true'][@id = $bibitemid][1]/*[local-name() = 'uri'][@type='citation'])"/>
+		<xsl:choose>
+			<xsl:when test="$uri != ''">
+				<xsl:variable name="filename" select="concat(substring-before($bibitemid, '.exp_'), '.exp')"/>
+				<fo:inline xsl:use-attribute-sets="eref-style">
+					<xsl:variable name="url" select="concat('url(embedded-file:', $filename, ')')"/>
+					<fo:basic-link external-destination="{$url}" fox:alt-text="{@citeas}">
+						<xsl:if test="normalize-space(@citeas) = ''">
+							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
+						</xsl:if>
+						<xsl:apply-templates/>
+					</fo:basic-link>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="eref"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<!-- =================== -->
 	<!-- Index processing -->
 	<!-- =================== -->
@@ -9049,7 +9081,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -5,6 +5,7 @@
 	<xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
 
 	<xsl:key name="attachments" match="iso:eref[java:endsWith(java:java.lang.String.new(@bibitemid),'.exp')]" use="@bibitemid"/>
+	<xsl:key name="attachments2" match="iso:eref[contains(@bibitemid,'.exp_')]" use="@bibitemid"/>
 
 	<xsl:variable name="namespace_full">https://www.metanorma.org/ns/iso</xsl:variable>
 
@@ -435,6 +436,15 @@
 					<xsl:variable name="url" select="concat('url(file:',$basepath, @bibitemid, ')')"/>
 					<pdf:embedded-file src="{$url}" filename="{@bibitemid}"/>
 				</xsl:for-each>
+				<xsl:for-each select="//*[local-name() = 'eref'][generate-id(.)=generate-id(key('attachments2',@bibitemid)[1])]">
+					<xsl:variable name="bibitemid" select="@bibitemid"/>
+					<xsl:variable name="uri" select="normalize-space($bibitems/*[local-name() ='bibitem'][@hidden = 'true'][@id = $bibitemid][1]/*[local-name() = 'uri'][@type='citation'])"/>
+					<xsl:if test="$uri != ''">
+						<xsl:variable name="url" select="concat('url(file:',$basepath, $uri, ')')"/>
+						<xsl:variable name="filename" select="concat(substring-before($bibitemid, '.exp_'), '.exp')"/>
+						<pdf:embedded-file src="{$url}" filename="{$filename}"/>
+					</xsl:if>
+				</xsl:for-each>
 			</fo:declarations>
 
 			<xsl:call-template name="addBookmarks">
@@ -1948,6 +1958,28 @@
 		</fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'eref'][contains(@bibitemid,'.exp_')]" priority="2">
+		<xsl:variable name="bibitemid" select="@bibitemid"/>
+		<xsl:variable name="uri" select="normalize-space($bibitems/*[local-name() ='bibitem'][@hidden = 'true'][@id = $bibitemid][1]/*[local-name() = 'uri'][@type='citation'])"/>
+		<xsl:choose>
+			<xsl:when test="$uri != ''">
+				<xsl:variable name="filename" select="concat(substring-before($bibitemid, '.exp_'), '.exp')"/>
+				<fo:inline xsl:use-attribute-sets="eref-style">
+					<xsl:variable name="url" select="concat('url(embedded-file:', $filename, ')')"/>
+					<fo:basic-link external-destination="{$url}" fox:alt-text="{@citeas}">
+						<xsl:if test="normalize-space(@citeas) = ''">
+							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
+						</xsl:if>
+						<xsl:apply-templates/>
+					</fo:basic-link>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="eref"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<!-- =================== -->
 	<!-- Index processing -->
 	<!-- =================== -->
@@ -9049,7 +9081,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>

data/lib/isodoc/iso/xref.rb

@@ -1,3 +1,5 @@
+require_relative "xref_section"
+
 module IsoDoc
   module Iso
     class Counter < IsoDoc::XrefGen::Counter
@@ -17,11 +19,10 @@ module IsoDoc
 
       def initial_anchor_names_amd(doc)
         if @parse_settings.empty? || @parse_settings[:clauses]
-          doc.xpath(ns("//preface/*")).each do |c|
-            c.element? and preface_names(c)
-          end
-          doc.xpath(ns("//sections/clause")).each do |c|
-            c.element? and preface_names(c)
+          ["//preface/*", "//sections/clause"].each do |xpath|
+            doc.xpath(ns(xpath)).each do |c|
+              c.element? and preface_names(c)
+            end
           end
         end
       end
@@ -49,76 +50,6 @@ module IsoDoc
         end
       end
 
-      # we can reference 0-number clauses in introduction
-      def introduction_names(clause)
-        return if clause.nil?
-
-        clause.at(ns("./clause")) and
-          @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
-                                     xref: clause.at(ns("./title"))&.text }
-        i = Counter.new
-        clause.xpath(ns("./clause")).each do |c|
-          i.increment(c)
-          section_names1(c, "0.#{i.print}", 2)
-        end
-      end
-
-      def annex_names(clause, num)
-        appendix_names(clause, num)
-        super
-      end
-
-      def appendix_names(clause, _num)
-        i = Counter.new
-        clause.xpath(ns("./appendix")).each do |c|
-          i.increment(c)
-          @anchors[c["id"]] =
-            anchor_struct(i.print, nil, @labels["appendix"],
-                          "clause").merge(level: 2, subtype: "annex",
-                                          container: clause["id"])
-          j = Counter.new
-          c.xpath(ns("./clause | ./references")).each do |c1|
-            j.increment(c1)
-            lbl = "#{@labels['appendix']} #{i.print}.#{j.print}"
-            appendix_names1(c1, l10n(lbl), 3, clause["id"])
-          end
-        end
-      end
-
-      # subclauses are not prefixed with "Clause"
-      # retaining subtype for the semantics
-      def section_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, level: level, xref: num, subtype: "clause" }
-        i = Counter.new
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
-                        "./references"))
-          .each do |c|
-          i.increment(c)
-          section_names1(c, "#{num}.#{i.print}", level + 1)
-        end
-      end
-
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level,
-                                   subtype: "annex" }
-        i = Counter.new
-        clause.xpath(ns("./clause | ./references")).each do |c|
-          i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", level + 1)
-        end
-      end
-
-      def appendix_names1(clause, num, level, container)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level,
-                                   container: container }
-        i = Counter.new
-        clause.xpath(ns("./clause | ./references")).each do |c|
-          i.increment(c)
-          appendix_names1(c, "#{num}.#{i.print}", level + 1, container)
-        end
-      end
-
       def hierarchical_formula_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|
@@ -132,10 +63,10 @@ module IsoDoc
         end
       end
 
-      def figure_anchor(elem, sublabel, label)
+      def figure_anchor(elem, sublabel, label, klass)
         @anchors[elem["id"]] = anchor_struct(
           (sublabel ? "#{label} #{sublabel}" : label),
-          nil, @labels["figure"], "figure", elem["unnumbered"]
+          nil, @labels[klass] || klass.capitalize, klass, elem["unnumbered"]
         )
         sublabel && elem["unnumbered"] != "true" and
           @anchors[elem["id"]][:label] = sublabel
@@ -143,27 +74,49 @@ module IsoDoc
 
       def sequential_figure_names(clause)
         j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
+        clause.xpath(ns(FIGURE_NO_CLASS)).noblank
           .each_with_object(IsoDoc::XrefGen::Counter.new) do |t, c|
           j = subfigure_increment(j, c, t)
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          next if blank?(t["id"])
+          figure_anchor(t, sublabel, c.print, "figure")
+        end
+        sequential_figure_class_names(clause)
+      end
 
-          figure_anchor(t, sublabel, c.print)
+      def sequential_figure_class_names(clause)
+        c = {}
+        j = 0
+        clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
+          .each do |t|
+          c[t["class"]] ||= IsoDoc::XrefGen::Counter.new
+          j = subfigure_increment(j, c[t["class"]], t)
+          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
+          figure_anchor(t, sublabel, c.print, t["class"])
         end
       end
 
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
-          .each do |t|
+        clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
           label = "#{num}#{hiersep}#{c.print}"
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          next if blank?(t["id"])
+          figure_anchor(t, sublabel, label, "figure")
+        end
+        hierarchical_figure_class_names(clause, num)
+      end
 
-          figure_anchor(t, sublabel, label)
+      def hierarchical_figure_class_names(clause, num)
+        c = {}
+        j = 0
+        clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
+          .noblank.each do |t|
+          c[t["class"]] ||= IsoDoc::XrefGen::Counter.new
+          j = subfigure_increment(j, c[t["class"]], t)
+          label = "#{num}#{hiersep}#{c.print}"
+          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
+          figure_anchor(t, sublabel, label, t["class"])
         end
       end
 
@@ -180,10 +133,6 @@ module IsoDoc
         end
       end
 
-      def annex_name_lbl(clause, num)
-        super.sub(%r{<br/>(.*)$}, "<br/><span class='obligation'>\\1</span>")
-      end
-
       def list_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -

data/lib/isodoc/iso/xref_section.rb

@@ -0,0 +1,79 @@
+module IsoDoc
+  module Iso
+    class Xref < IsoDoc::Xref
+      # we can reference 0-number clauses in introduction
+      def introduction_names(clause)
+        return if clause.nil?
+
+        clause.at(ns("./clause")) and
+          @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
+                                     xref: clause.at(ns("./title"))&.text }
+        i = Counter.new
+        clause.xpath(ns("./clause")).each do |c|
+          i.increment(c)
+          section_names1(c, "0.#{i.print}", 2)
+        end
+      end
+
+      def annex_names(clause, num)
+        appendix_names(clause, num)
+        super
+      end
+
+      def appendix_names(clause, _num)
+        i = Counter.new
+        clause.xpath(ns("./appendix")).each do |c|
+          i.increment(c)
+          @anchors[c["id"]] =
+            anchor_struct(i.print, nil, @labels["appendix"],
+                          "clause").merge(level: 2, subtype: "annex",
+                                          container: clause["id"])
+          j = Counter.new
+          c.xpath(ns("./clause | ./references")).each do |c1|
+            j.increment(c1)
+            lbl = "#{@labels['appendix']} #{i.print}.#{j.print}"
+            appendix_names1(c1, l10n(lbl), 3, clause["id"])
+          end
+        end
+      end
+
+      # subclauses are not prefixed with "Clause"
+      # retaining subtype for the semantics
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref: num, subtype: "clause" }
+        i = Counter.new
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+                        "./references"))
+          .each do |c|
+          i.increment(c)
+          section_names1(c, "#{num}.#{i.print}", level + 1)
+        end
+      end
+
+      def annex_names1(clause, num, level)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level,
+                                   subtype: "annex" }
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          i.increment(c)
+          annex_names1(c, "#{num}.#{i.print}", level + 1)
+        end
+      end
+
+      def appendix_names1(clause, num, level, container)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level,
+                                   container: container }
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          i.increment(c)
+          appendix_names1(c, "#{num}.#{i.print}", level + 1, container)
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        super.sub(%r{<br/>(.*)$}, "<br/><span class='obligation'>\\1</span>")
+      end
+    end
+  end
+end

data/lib/metanorma/iso/isodoc.rng

@@ -205,6 +205,15 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style">
+            <choice>
+              <value>basic</value>
+              <value>full</value>
+              <value>short</value>
+            </choice>
+          </attribute>
+        </optional>
         <ref name="XrefBody"/>
       </element>
     </define>

data/lib/metanorma/iso/isostandard.rng

@@ -508,6 +508,9 @@
   </define>
   <define name="stagename">
     <element name="stagename">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/iso/validate.rb

@@ -27,7 +27,7 @@ module Metanorma
         end
       end
 
-      # ISO/IEC DIR 2, 15.5.3
+      # ISO/IEC DIR 2, 15.5.3, 20.2
       # does not deal with preceding text marked up
       def see_xrefs_validate(root)
         root.xpath("//xref").each do |t|

data/lib/metanorma/iso/version.rb

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

data/lib/metanorma/requirements/modspec.rb

@@ -18,9 +18,9 @@ module Metanorma
           return lbl unless title &&
             elem.ancestors("requirement, recommendation, permission").empty?
 
-          lbl += l10n(": ") if lbl
+          lbl += ": " if lbl
           lbl += title.children.to_xml
-          lbl
+          l10n(lbl)
         end
 
         # ISO labels modspec reqt as table, with reqt label as title
@@ -38,7 +38,8 @@ module Metanorma
         def requirement_component_parse(node, out)
           if node["exclude"] != "true" && node.name == "description"
             lbl = "statement"
-            lbl = "description" if recommend_class(node.parent) == "recommendclass"
+            recommend_class(node.parent) == "recommendclass" and
+              lbl = "description"
             out << "<tr><td>#{@labels['modspec'][lbl]}</td>"\
                    "<td>#{node.children.to_xml}</td></tr>"
           else
@@ -46,11 +47,13 @@ module Metanorma
           end
         end
 
-        def requirement_table_cleanup(table)
+        def requirement_table_cleanup(node, table)
           return table unless table["type"] == "recommendclass"
 
+          label = if node["type"] == "conformanceclass" then "conformancetests"
+                  else "provisions" end
           ins = table.at(ns("./tbody/tr[td/table]")) or return table
-          ins.replace("<tr><td>#{@labels['modspec']['provisions']}</td>" +
+          ins.replace("<tr><td>#{@labels['modspec'][label]}</td>" +
                       "<td>#{nested_tables_names(table)}</td></tr>")
           table.xpath(ns("./tbody/tr[td/table]")).each(&:remove)
           table
@@ -67,8 +70,8 @@ module Metanorma
           super
           anchor[:xref_reqt2reqt] = anchor[:xref_bare]
           if l = block.at(ns("./title"))
-            anchor[:xref_reqt2reqt] +=
-              l10n(": ") + l.children.to_xml.strip
+            anchor[:xref_reqt2reqt] =
+              l10n("#{anchor[:xref_reqt2reqt]}: #{l.children.to_xml.strip}")
           end
           anchor
         end

data/spec/metanorma/base_spec.rb

@@ -1005,7 +1005,7 @@ RSpec.describe Metanorma::ISO do
                   <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                   <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                   <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
-                  <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+                  <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
                   <docnumber>123</docnumber>
                   <date type='published'><on>2001-05</on></date>
                   <contributor>
@@ -1078,7 +1078,7 @@ RSpec.describe Metanorma::ISO do
                  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
                  <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
                  <docidentifier type='ISO' primary="true">ISO 125</docidentifier>
-                 <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
+                 <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
                  <docnumber>125</docnumber>
                  <contributor>
                    <role type='publisher'/>
@@ -1130,7 +1130,7 @@ RSpec.describe Metanorma::ISO do
                      <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
                      <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
                      <docidentifier type='ISO' primary="true">ISO 125:2020</docidentifier>
-                     <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
+                     <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
                      <docnumber>125</docnumber>
                      <date type='published'>
                        <on>2020-02</on>

data/spec/metanorma/refs_spec.rb

@@ -78,7 +78,7 @@ RSpec.describe Metanorma::ISO do
               <uri type="src">https://www.iso.org/standard/81720.html</uri>
               <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
               <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
-              <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+              <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:ed-1:fr</docidentifier>
               <docnumber>17664</docnumber>
               <contributor>
                 <role type="publisher"/>
@@ -127,7 +127,7 @@ RSpec.describe Metanorma::ISO do
                   <uri type="src">https://www.iso.org/standard/81720.html</uri>
                   <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
                   <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
-                  <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+                  <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:ed-1:fr</docidentifier>
                   <docnumber>17664</docnumber>
                   <contributor>
                     <role type="publisher"/>
@@ -410,7 +410,7 @@ RSpec.describe Metanorma::ISO do
                <uri type='src'>https://www.iso.org/standard/2405.html</uri>
                <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
                <docidentifier type='ISO' primary='true'>ISO 31-0</docidentifier>
-               <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso:31:-0:ed-1</docidentifier>
                <docnumber>31</docnumber>
                <contributor>
                  <role type='publisher'/>
@@ -447,7 +447,7 @@ RSpec.describe Metanorma::ISO do
                    <uri type='src'>https://www.iso.org/standard/2405.html</uri>
                    <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
                    <docidentifier type='ISO' primary='true'>ISO 31-0:1974</docidentifier>
-                   <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso:31:-0:ed-1</docidentifier>
                    <docnumber>31</docnumber>
                    <date type='published'>
                      <on>1974-01</on>
@@ -494,7 +494,7 @@ RSpec.describe Metanorma::ISO do
                <uri type='src'>https://www.iso.org/standard/76389.html</uri>
                <uri type='rss'>https://www.iso.org/contents/data/standard/07/63/76389.detail.rss</uri>
                <docidentifier type='ISO' primary='true'>ISO 683-3:2019</docidentifier>
-               <docidentifier type='URN'>urn:iso:std:iso:683:-3:stage-95.99:ed-3</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso:683:-3:ed-3</docidentifier>
                <docnumber>683</docnumber>
                <date type='published'>
                  <on>2019-01</on>
@@ -589,7 +589,7 @@ RSpec.describe Metanorma::ISO do
           <uri type="src">https://www.iso.org/standard/81720.html</uri>
           <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
           <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
-          <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+          <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:ed-1:fr</docidentifier>
           <docnumber>17664</docnumber>
           <contributor>
             <role type="publisher"/>
@@ -630,7 +630,7 @@ RSpec.describe Metanorma::ISO do
               <uri type="src">https://www.iso.org/standard/81720.html</uri>
               <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
               <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>
-              <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+              <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:ed-1:fr</docidentifier>
               <docnumber>17664</docnumber>
               <contributor>
                 <role type="publisher"/>

data/spec/requirements/requirement_components_spec.rb

@@ -544,7 +544,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
                    <td>Conformance test</td>
                    <td>
                      <xref target='A2'>
-                       Requirement test 1:
+                       Conformance test 1:
                        Second
                      </xref>
                    </td>
@@ -552,7 +552,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
                </tbody>
              </table>
              <table id='A2' class='modspec' type='recommendtest'>
-               <name>Table 2 — Requirement test 1: Second</name>
+               <name>Table 2 — Conformance test 1: Second</name>
                <tbody>
                  <tr>
                    <td>Identifier</td>

data/spec/requirements/requirements_spec.rb

@@ -693,7 +693,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
            <foreword id='A' displayorder='1'>
              <title>Preface</title>
              <table id='A1' class='modspec' type='recommendtest'>
-               <name>Table 1 — Permission test 1: First</name>
+               <name>Table 1 — Conformance test 1: First</name>
                <tbody>
                  <tr>
                 <td>Identifier</td>
@@ -1058,7 +1058,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
                    </td>
                  </tr>
                  <tr>
-                   <td>Provisions</td>
+                   <td>Conformance tests</td>
                    <td>
                      <xref target='B2'>
                        Permission 1:
@@ -1198,7 +1198,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
                    </td>
                  </tr>
                                   <tr>
-                   <td>Dispositions</td>
+                   <td>Tests de conformité</td>
                    <td>
                      <xref target='B2'>
                        Autorisation 1&#xa0;: