mn-requirements 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e26c223fccd1addd079ca0f89fe9fad9f81e7fa1e43c4607245cb95e5c3292
-  data.tar.gz: f6765320c97a6a49b164973d39084b72b57206f4a8b3e9eeb86a3835df1cbad0
+  metadata.gz: 835ebdf2e3bbc0dea0c8eb3103e3aebe23f896d9610a99a1ddafc45b3e7953f2
+  data.tar.gz: 984be6317de16bd417ae59c7645ba970a32ba2add0261679c683560a01c5476c
 SHA512:
-  metadata.gz: 4eb0f1c8d3782eea7066f71809ee2ac05d5cc7d6fa470dee2054c4a4154cb08eda814b5fcc2241cdbe345b3f149b15a0152a2daa76d5fb5df4c1ce41b26cb6e4
-  data.tar.gz: 76b1638cdc8a99eb7d6ff2fdfd321fff08fe64bf40b07a2b5ec46aecc7a1110a2feee171b25b334a6b468ab4636056511ad002aec3e78ba67c63d1d3f4ee3cc7
+  metadata.gz: 1fd6e0090c521fa3817505429b75ec281e1f801257143f675ec82eb90eea20d0a2848aff92fa9d13f95dde5ddf5b9bee11e15f5b919bf779b8ed1fbf2f6305fe
+  data.tar.gz: c7c3fabad721fa9c88e738bce338105b2b856de8747c60aee62b8cfc0e39e7c140afc328697c4f668f13704afc96ad896a5f61f96914e2fc0644b6e61b659ad9

data/Gemfile

@@ -9,5 +9,3 @@ gemspec
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
-
-gem "isodoc", "~> 2.2.3.1"

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -20,9 +20,25 @@ requirements:
     target: استهداف
     testpurpose: هدف الاختبار
     testmethod: طريقة اختبار
-    dependency: الاعتماد
-    indirectdependency: التبعية غير المباشرة
+    dependency: المتطلبات المسبقة
+    indirectdependency: شرط مسبق غير مباشر
     identifier: المعرف
     included_in: مدرج في
     statement: بيان
     guidance: إرشاد
+    implements: تنفذ
+    provision: بيان المعياري
+inflection:
+  بيان المعياري:
+    sg: بيان المعياري
+    pl: البيانات المعيارية
+  اختبار المطابقة:
+    sg: اختبار المطابقة
+    pl: اختبارات المطابقة
+  المتطلبات المسبقة:
+    sg: المتطلبات المسبقة
+    pl: المتطلبات الأساسية
+  شرط مسبق غير مباشر:
+    sg: شرط مسبق غير مباشر
+    pl: المتطلبات الأساسية غير المباشرة
+

data/lib/isodoc-yaml/i18n-de.yaml

@@ -20,10 +20,24 @@ requirements:
     target: Ziel
     testpurpose: Testzweck
     testmethod: Testmethode
-    dependency: Abhängigkeit
-    indirectdependency: Indirekte Abhängigkeit
+    dependency: Voraussetzung
+    indirectdependency: Indirekte Voraussetzung
     identifier: Kennung
     included_in: Enthalten in
     statement: Aussage
     guidance: Anleitung
-
+    implements: Implementiert
+    provision: Normative Aussage
+inflection:
+  Normative Aussage:
+    sg: Normative Aussage
+    pl: Normative Aussagen
+  Conformance test:
+    sg: Konformitätstest
+    pl: Konformitätstests
+  Voraussetzung:
+    sg: Voraussetzung
+    pl: Voraussetzungen
+  Indirekte Voraussetzung:
+    sg: Indirekte Voraussetzung
+    pl: Indirekte Voraussetzungen

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

@@ -20,10 +20,27 @@ requirements:
     target: Target
     testpurpose: Test purpose
     testmethod: Test method
-    dependency: Dependency
-    indirectdependency: Indirect Dependency
+    dependency: Prerequisite
+    indirectdependency: Indirect prerequisite
     identifier: Identifier
     included_in: Included in
     statement: Statement
     guidance: Guidance
-
+    implements: Implements
+    provision: Normative statement
+inflection:
+  Normative statement:
+    sg: Normative statement
+    pl: Normative statements
+  Conformance test:
+    sg: Conformance test
+    pl: Conformance tests
+  Statement:
+    sg: Statement
+    pl: Statements
+  Prerequisite:
+    sg: Prerequisite
+    pl: Prerequisites
+  Indirect prerequisite:
+    sg: Indirect prerequisite
+    pl: Indirect prerequisites

data/lib/isodoc-yaml/i18n-es.yaml

@@ -20,9 +20,28 @@ requirements:
     target: Objetivo
     testpurpose: Propósito de prueba
     testmethod: Método de prueba
-    dependency: Dependencia
-    indirectdependency: Dependencia indirecta
+    dependency: Requisito
+    indirectdependency: Requisito indirecto
     identifier: Identificador
     included_in: Incluido en
     statement: Declaración
     guidance: Orientación
+    implements: Implementa
+    provision: Declaración normativa
+inflection:
+  Declaración normativa:
+    sg: Declaración normativa
+    pl: Declaraciones normativas
+  Prueba de conformidad:
+    sg: Prueba de conformidad
+    pl: Pruebas de conformidad
+  Déclaration:
+    sg: Déclaration
+    pl: Déclarations
+  Prérequis:
+    sg: Prérequis
+    pl: Prérequis
+  Dépendance indirecte:
+    sg: Prérequis indirect
+    pl: Prérequis indirects
+

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

@@ -20,10 +20,28 @@ requirements:
     target: Cible
     testpurpose: Objectif du test
     testmethod: Méthode du test
-    dependency: Dépendance
-    indirectdependency: Dépendance indirecte
+    dependency: Prérequis
+    indirectdependency: Prérequis indirect
     identifier: Identifiant
     included_in: Inclus dans
     statement: Déclaration
     guidance: Avis
+    implements: Implémente
+    provision: Déclaration normative
+inflection:
+  Déclaration normative:
+    sg: Déclaration normative
+    pl: Déclarations normatives
+  Test de conformité:
+    sg: Tests de conformité
+    pl: Tests de conformité
+  Déclaration:
+    sg: Déclaration
+    pl: Déclarations
+  Prérequis:
+    sg: Prérequis
+    pl: Prérequis
+  Dépendance indirecte:
+    sg: Prérequis indirect
+    pl: Prérequis indirects
 

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -20,10 +20,28 @@ requirements:
     target: Цель
     testpurpose: Цель теста
     testmethod: Метод теста
-    dependency: Зависимость
-    indirectdependency: Косвенная зависимость
+    dependency: Условие
+    indirectdependency: Косвенное условие
     identifier: Идентификатор
     included_in: Входит в
     statement: Утверждение
     guidance: Руководство
+    implements: Реализует
+    provision: Нормативное положение
+inflection:
+  Нормативное положение:
+    sg: Нормативное положение
+    pl: Нормативные положения
+  Проверка на соответствие:
+    sg: Проверка на соответствие
+    pl: Проверки на соответствие
+  Утверждение:
+    sg: Утверждение
+    pl: Утверждения
+  Условие:
+    sg: Условие
+    pl: Условия
+  Косвенное условие:
+    sg: Косвенное условие
+    pl: Косвенное условия
 

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -20,10 +20,11 @@ requirements:
     target: 目标
     testpurpose: 测试目的
     testmethod: 测试方法
-    dependency: 依赖
-    indirectdependency: 间接依赖
+    dependency: 先决条件
+    indirectdependency: 间接先决条件
     identifier: 标识符
     included_in: 包含在
     statement: 陈述
     guidance: 指导意见
-
+    implements: 它实现
+    provision: 规范性陈述

data/lib/metanorma/default/cleanup.rb

@@ -16,8 +16,8 @@ module Metanorma
 
       def requirement_inherit_insert(reqt)
         ins = reqt.at("./classification") || reqt.at(
-          "./description | ./measurementtarget | ./specification | "\
-          "./verification | ./import | ./description | ./component | "\
+          "./description | ./measurementtarget | ./specification | " \
+          "./verification | ./import | ./description | ./component | " \
           "./requirement | ./recommendation | ./permission",
         ) and return ins
         requirement_inherit_insert1(reqt)
@@ -56,7 +56,7 @@ module Metanorma
       end
 
       def requirement_description_cleanup1(reqt)
-        while d = reqt.at("./description[following-sibling::*[1]"\
+        while d = reqt.at("./description[following-sibling::*[1]" \
                           "[self::description]]")
           n = d.next.remove
           d << n.children
@@ -115,7 +115,7 @@ module Metanorma
         dlist.xpath("./dt[text()='classification']").each do |e|
           val = e.at("./following::dd/p") || e.at("./following::dd")
           req_classif_parse(val.children.to_xml).each do |r|
-            ins.next = "<classification><tag>#{r[0]}</tag>"\
+            ins.next = "<classification><tag>#{r[0]}</tag>" \
                        "<value>#{r[1]}</value></classification>"
             ins = ins.next
           end
@@ -137,7 +137,7 @@ module Metanorma
 
       def reqt_dl_to_classif2(term, ins)
         val = term.at("./following::dd/p") || e.at("./following::dd")
-        ins.next = "<classification><tag>#{term.text}</tag>"\
+        ins.next = "<classification><tag>#{term.text}</tag>" \
                    "<value>#{val.children.to_xml}</value></classification>"
         ins.next
       end

data/lib/metanorma/default/isodoc.rb

@@ -45,12 +45,12 @@ module Metanorma
         label, title, name = recommendation_labels(node)
         ret = name ? [name] : []
         if label || title
-          ret << l10n(":") unless ret.empty?
+          ret << ":" unless ret.empty?
           ret += ["<br/>", label]
-          ret << l10n(". ") if label && title
+          ret << ". " if label && title
           ret << title
         end
-        out << "<name>#{ret.compact.join}</name>"
+        out << "<name>#{l10n(ret.compact.join)}</name>"
         out
       end
 
@@ -76,7 +76,8 @@ module Metanorma
       def recommendation_attr_keyvalue(node, key, value)
         tag = node.at(ns("./#{key}")) or return nil
         value = node.at(ns("./#{value}")) or return nil
-        "#{tag.text.capitalize}: #{value.children.to_xml}"
+        l10n("#{Metanorma::Utils.strict_capitalize_first tag.text}: " \
+             "#{value.children.to_xml}")
       end
 
       def recommendation_attributes(node, out)

data/lib/metanorma/modspec/cleanup.rb

@@ -49,9 +49,17 @@ module Metanorma
           requirement_metadata1(val, d, d)
           d.remove
         end
-        requirement_metadata_requirement_tags.include?(term.text) &&
-          !val.text.empty? and
+        requirement_metadata_requirement_tags.include?(term.text) or
+          return val
+        requirement_metadata1_component_val2id(val)
+      end
+
+      def requirement_metadata1_component_val2id(val)
+        if val.at(".//link") && val.text.strip.empty?
+          val.children = "<identifier>#{val.at('.//link')['target']}</identifier>"
+        elsif !val.text.strip.empty?
           val.children = "<identifier>#{val.text.strip}</identifier>"
+        end
         val
       end
 
@@ -66,7 +74,10 @@ module Metanorma
       end
 
       def requirement_target_identifiers(reqt)
-        reqt.xpath("./classification[tag = 'target']/value[link]").each do |v|
+        reqt.xpath("./classification[tag][value/link]").each do |c|
+          %w(target indirect-dependency implements)
+            .include?(c.at("./tag").text.downcase) or next
+          v = c.at("./value[link]")
           v.children = v.at("./link/@target").text
         end
       end

data/lib/metanorma/modspec/isodoc.rb

@@ -1,5 +1,6 @@
 require_relative "xrefs"
 require_relative "reqt_label"
+require_relative "table_cleanup"
 
 module Metanorma
   class Requirements
@@ -7,7 +8,7 @@ module Metanorma
       def requirement_render1(node)
         init_lookups(node.document)
         ret = requirement_guidance_parse(node, super)
-        requirement_table_cleanup(ret)
+        requirement_table_cleanup(node, ret)
       end
 
       def recommendation_base(node, _klass)
@@ -34,11 +35,11 @@ module Metanorma
       def recommendation_header(reqt, out)
         n = recommendation_name(reqt, nil)
         x = if reqt.ancestors("requirement, recommendation, permission").empty?
-              "<thead><tr><th scope='colgroup' colspan='2'>"\
-                "<p class='#{recommend_name_class(reqt)}'>#{n}</p>"\
+              "<thead><tr><th scope='colgroup' colspan='2'>" \
+                "<p class='#{recommend_name_class(reqt)}'>#{n}</p>" \
                 "</th></tr></thead>"
             else
-              "<thead><tr><td>#{recommendation_class_label(reqt)}</td>"\
+              "<thead><tr><th>#{recommendation_class_label(reqt)}</th>" \
                 "<td>#{n}</td></tr></thead>"
             end
         out << x
@@ -52,23 +53,23 @@ module Metanorma
         return ret unless title &&
           node.ancestors("requirement, recommendation, permission").empty?
 
-        ret += l10n(": ") unless !name || name.text.empty?
+        ret += ": " unless !name || name.text.empty?
         ret += title.children.to_xml
-        ret
+        l10n(ret)
       end
 
       def recommendation_attributes(node, out)
         ins = out.add_child("<tbody></tbody>").first
         recommend_title(node, ins)
         recommendation_attributes1(node).each do |i|
-          ins.add_child("<tr><td>#{i[0]}</td><td>#{i[1]}</td></tr>")
+          ins.add_child("<tr><th>#{i[0]}</th><td>#{i[1]}</td></tr>")
         end
         ins
       end
 
       def recommend_title(node, out)
         label = node.at(ns("./identifier")) or return
-        out.add_child("<tr><td scope='colgroup' colspan='2'>"\
+        out.add_child("<tr><td scope='colgroup' colspan='2'>" \
                       "<tt>#{label.children.to_xml}</tt></td>")
       end
 
@@ -86,37 +87,47 @@ module Metanorma
           head << [@labels["default"]["obligation"], oblig]
         subj = node.at(ns("./subject"))&.children and
           head << [rec_subj(node), subj]
-        node.xpath(ns("./classification[tag = 'target']/value")).each do |v|
-          xref = recommendation_id(v.text) and
-            head << [rec_target(node), xref]
-        end
+        head = recommendation_attributes1_target(node, head)
         head += recommendation_backlinks(node)
         recommendation_attributes1_dependencies(node, head)
       end
 
+      def recommendation_attributes1_target(node, head)
+        node.xpath(ns("./classification[tag][value]")).each do |c|
+          c.at(ns("./tag")).text.casecmp("target").zero? or next
+          xref = recommendation_id(c.at(ns("./value")).text) and
+            head << [rec_target(node), xref]
+        end
+        head
+      end
+
       def recommendation_backlinks(node)
         ret = []
         id = node.at(ns("./identifier")) or return ret
-        %w(general class).include?(node["type"]) and
-          xref = recommendation_link_test(id.text) and
-          ret << [@labels["modspec"]["conformancetest"], xref]
-        ret
-        (node["type"].nil? || node["type"].empty? ||
-        node["type"] == "verification") and
-          xref = recommendation_link_class(id.text) and
-          ret << [@labels["modspec"]["included_in"], xref]
-        ret
+        ret = recommendation_backlinks_test(node, id, ret)
+        recommendation_backlinks_class(node, id, ret)
       end
 
       def recommendation_attributes1_dependencies(node, head)
+        head = recommendation_attributes1_inherit(node, head)
+        recommendation_attributes_dependencies2(node, head)
+      end
+
+      def recommendation_attributes1_inherit(node, head)
         node.xpath(ns("./inherit")).each do |i|
           head << [@labels["modspec"]["dependency"],
                    recommendation_id(i.children.to_xml)]
         end
-        node.xpath(ns("./classification[tag = 'indirect-dependency']/value"))
-          .each do |v|
-          xref = recommendation_id(v.children.to_xml) and
-            head << [@labels["modspec"]["indirectdependency"], xref]
+        head
+      end
+
+      def recommendation_attributes_dependencies2(node, head)
+        %w(indirect-dependency implements).each do |x|
+          node.xpath(ns("./classification[tag][value]")).each do |c|
+            c.at(ns("./tag")).text.casecmp(x).zero? or next
+            xref = recommendation_id(c.at(ns("./value")).children.to_xml) and
+              head << [@labels["modspec"][x.gsub(/-/, "")], xref]
+          end
         end
         head
       end
@@ -130,7 +141,7 @@ module Metanorma
         return node unless node.at(ns("./component[@class = 'step']"))
 
         d = node.at(ns("./component[@class = 'step']"))
-        d = d.replace("<ol class='steps'><li#{id_attr(d)}>"\
+        d = d.replace("<ol class='steps'><li#{id_attr(d)}>" \
                       "#{d.children.to_xml}</li></ol>").first
         node.xpath(ns("./component[@class = 'step']")).each do |f|
           f = f.replace("<li#{id_attr(f)}>#{f.children.to_xml}</li>").first
@@ -143,7 +154,7 @@ module Metanorma
         return out if node["class"] == "guidance"
 
         node = recommendation_steps(node)
-        out << "<tr#{id_attr(node)}><td>#{node['label']}</td>"\
+        out << "<tr#{id_attr(node)}><th>#{node['label']}</th>" \
                "<td>#{node.children}</td></tr>"
         out
       end
@@ -151,8 +162,9 @@ module Metanorma
       def recommendation_attr_keyvalue(node, key, value)
         tag = node.at(ns("./#{key}")) or return nil
         value = node.at(ns("./#{value}")) or return nil
-        !%w(target indirect-dependency).include?(tag.text) or return nil
-        [tag.text.capitalize, value.children]
+        !%w(target indirect-dependency implements).include?(tag.text.downcase) or
+          return nil
+        [Metanorma::Utils.strict_capitalize_first(tag.text), value.children]
       end
 
       def reqt_component_type(node)
@@ -181,7 +193,7 @@ module Metanorma
       def requirement_guidance_parse(node, out)
         ins = out.at(ns("./tbody"))
         node.xpath(ns("./component[@class = 'guidance']")).each do |f|
-          ins << "<tr#{id_attr(f)}><td>#{@labels['modspec']['guidance']}</td>"\
+          ins << "<tr#{id_attr(f)}><th>#{@labels['modspec']['guidance']}</th>" \
                  "<td>#{f.children}</td></tr>"
         end
         out
@@ -191,20 +203,12 @@ module Metanorma
         node.xpath(ns("./dt")).each do |dt|
           dd = dt.next_element
           dd&.name == "dd" or next
-          out.add_child("<tr><td>#{dt.children.to_xml}</td>"\
+          out.add_child("<tr><th>#{dt.children.to_xml}</th>" \
                         "<td>#{dd.children.to_xml}</td></tr>")
         end
         out
       end
 
-      def requirement_table_cleanup(table)
-        table.xpath(ns("./tbody/tr/td/table")).each do |t|
-          x = t.at(ns("./thead/tr")) or next
-          t.parent.parent.replace(x)
-        end
-        table
-      end
-
       def rec_subj(node)
         case node["type"]
         when "class" then @labels["modspec"]["targettype"]

data/lib/metanorma/modspec/reqt_label.rb

@@ -48,7 +48,7 @@ module Metanorma
 
       def recommendation_class_label(node)
         case node["type"]
-        when "verification" then @labels["modspec"]["#{node.name}test"]
+        when "verification" then @labels["modspec"]["conformancetest"]
         when "class" then @labels["modspec"]["#{node.name}class"]
         when "abstracttest" then @labels["modspec"]["abstracttest"]
         when "conformanceclass" then @labels["modspec"]["conformanceclass"]
@@ -73,16 +73,26 @@ module Metanorma
       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"])
+            reqt_links_test1(r, m)
+          end
+      end
 
-            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, false)
-            next unless subj && lbl
+      def reqt_links_test1(reqt, acc)
+        return unless %w(conformanceclass
+                         verification).include?(reqt["type"])
 
-            m[subj.text] = { lbl: lbl, id: r["id"] }
-          end
+        subj = reqt_extract_target(reqt)
+        id = reqt.at(ns("./identifier")) or return
+        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
+        return unless subj && lbl
+
+        acc[subj.text] = { lbl: lbl, id: reqt["id"] }
+      end
+
+      def reqt_extract_target(reqt)
+        reqt.xpath(ns("./classification[tag][value]")).detect do |x|
+          x.at(ns("./tag")).text.casecmp("target").zero?
+        end&.at(ns("./value"))
       end
 
       def recommendation_link_test(ident)
@@ -116,6 +126,22 @@ module Metanorma
         test = @reqt_ids[ident&.strip] or return ident&.strip
         "<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
       end
+
+      def recommendation_backlinks_test(node, id, ret)
+        (%w(general class).include?(node["type"]) &&
+          xref = recommendation_link_test(id.text)) or return ret
+        lbl = node["type"] == "general" ? "conformancetest" : "conformanceclass"
+        ret << [@labels["modspec"][lbl], xref]
+        ret
+      end
+
+      def recommendation_backlinks_class(node, id, ret)
+        (node["type"].nil? || node["type"].empty? ||
+        node["type"] == "verification") and
+          xref = recommendation_link_class(id.text) and
+          ret << [@labels["modspec"]["included_in"], xref]
+        ret
+      end
     end
   end
 end

data/lib/metanorma/modspec/table_cleanup.rb

@@ -0,0 +1,62 @@
+module Metanorma
+  class Requirements
+    class Modspec < Default
+      def requirement_table_cleanup(node, table)
+        table = requirement_table_nested_cleanup(node, table)
+        requirement_table_consec_rows_cleanup(node, table)
+        table
+      end
+
+      def requirement_table_consec_rows_cleanup(_node, table)
+        table.xpath(ns("./tbody/tr")).each do |tr|
+          conflate_table_rows?(tr) or next
+          conflate_table_rows(tr)
+        end
+      end
+
+      def conflate_table_rows?(trow)
+        tr1 = trow.next or return
+        tr1.name == "tr" or return
+
+        th = trow.at(ns("./th"))&.text
+        th && th == tr1.at(ns("./th"))&.text
+      end
+
+      def conflate_table_rows(trow)
+        th = trow.at(ns("./th"))
+        hdr = th.text
+        th.children = @i18n.inflect(hdr, number: "pl")
+        td = th.next_element
+        res = [td.children.to_xml]
+        res += gather_consec_table_rows(trow, hdr)
+        td.children = res.join("<br/>")
+      end
+
+      def gather_consec_table_rows(trow, hdr)
+        ret = []
+        trow.xpath("./following-sibling::xmlns:tr").each do |r|
+          break unless r.at(ns("./th[text() = '#{hdr}']"))
+
+          ret << r.remove.at(ns("./td")).children.to_xml
+        end
+        ret
+      end
+
+      def requirement_table_nested_cleanup(node, table)
+        table.xpath(ns("./tbody/tr/td/table")).each do |t|
+          x = t.at(ns("./thead/tr")) or next
+          x.at(ns("./th")).children =
+            requirement_table_nested_cleanup_hdr(node)
+          t.parent.parent.replace(x)
+        end
+        table
+      end
+
+      def requirement_table_nested_cleanup_hdr(node)
+        label = "provision"
+        node["type"] == "conformanceclass" and label = "conformancetest"
+        @i18n.get["requirements"]["modspec"][label]
+      end
+    end
+  end
+end

data/lib/metanorma/modspec/validate.rb

@@ -8,7 +8,7 @@ module Metanorma
       end
 
       def nested_reqt?(reqt)
-        reqt.at("./ancestor::requirement | ./ancestor::recommendation | "\
+        reqt.at("./ancestor::requirement | ./ancestor::recommendation | " \
                 "./ancestor::permission")
       end
 
@@ -22,11 +22,13 @@ module Metanorma
         class_to_children(reqt, "class", "general")
         class_to_children(reqt, "conformanceclass", "verification")
         children_to_class(reqt, "verification", "conformanceclass")
+        reqt_to_dependency(reqt)
       end
 
       def type2validate(reqt)
         type = reqt["type"]
         type = "general" if type.nil? || type.empty?
+        type = "verification" if type == "abstracttest"
         type
       end
 
@@ -35,12 +37,33 @@ module Metanorma
         verification: "Conformance test",
         class: "Requirement class",
         conformanceclass: "Conformance class",
+        provision: "Provision",
+        dependency: "Prerequisite",
+        indirect_dependency: "Indirect prerequisite",
+        implements: "Implemented provision",
       }.freeze
 
       def log_reqt(reqt, leftclass, rightclass)
-        @log.add("Requirements", reqt[:elem],
-                 "#{CLASS2LABEL[leftclass.to_sym]} #{reqt[:label] || reqt[:id]} "\
-                 "has no corresponding #{CLASS2LABEL[rightclass.to_sym]}")
+        @log.add("Requirements", reqt[:elem], <<~MSG
+          #{CLASS2LABEL[leftclass.to_sym]} #{reqt[:label] || reqt[:id]} has no corresponding #{CLASS2LABEL[rightclass.to_sym]}
+        MSG
+        )
+      end
+
+      def log_reqt2(reqt, leftclass, target, rightclass)
+        @log.add("Requirements", reqt[:elem], <<~MSG
+          #{CLASS2LABEL[leftclass]} #{reqt[:label] || reqt[:id]} points to #{CLASS2LABEL[rightclass]} #{target} outside this document
+        MSG
+        )
+      end
+
+      def reqt_to_dependency(reqt)
+        r = @ids[:id][reqt["id"]]
+        %i(dependency indirect_dependency implements).each do |x|
+          r[x].each do |d|
+            @ids[:label][d] or log_reqt2(r, :provision, d, x)
+          end
+        end
       end
 
       def reqt_to_conformance(reqt, reqtclass, confclass)
@@ -48,7 +71,7 @@ module Metanorma
 
         r = @ids[:id][reqt["id"]]
         (r[:label] && @ids[:class][confclass]&.any? do |x|
-           x[:subject] == r[:label]
+           x[:subject].include?(r[:label])
          end) and return
         log_reqt(r, reqtclass, confclass)
       end
@@ -58,7 +81,7 @@ module Metanorma
 
         r = @ids[:id][reqt["id"]]
         (r[:subject] && @ids[:class][reqtclass]&.any? do |x|
-           r[:subject] == x[:label]
+           r[:subject].include?(x[:label])
          end) and return
         log_reqt(r, confclass, reqtclass)
       end
@@ -83,7 +106,7 @@ module Metanorma
 
       def reqt_links(docxml)
         docxml.xpath("//requirement | //recommendation | //permission")
-          .each_with_object({ id: {}, class: {} }) do |r, m|
+          .each_with_object({ id: {}, class: {}, label: {} }) do |r, m|
             next if nested_reqt?(r)
 
             reqt_links1(r, m)
@@ -92,19 +115,30 @@ module Metanorma
 
       def reqt_links1(reqt, hash)
         type = type2validate(reqt)
-        hash[:id][reqt["id"]] = reqt_links_struct(reqt)
+        a = reqt_links_struct(reqt)
+        hash[:id][reqt["id"]] = a
         hash[:class][type] ||= []
-        hash[:class][type] << hash[:id][reqt["id"]]
+        hash[:class][type] << a
+        hash[:label][a[:label]] = reqt["id"]
         hash
       end
 
+      def classif_tag(reqt, tag)
+        reqt.xpath("./classification[tag][value]")
+          .each_with_object([]) do |c, m|
+          c.at("./tag").text.casecmp(tag).zero? or next
+          m << c.at("./value").text
+        end
+      end
+
       def reqt_links_struct(reqt)
         { id: reqt["id"], elem: reqt, label: reqt.at("./identifier")&.text,
-          subject: reqt.at("./classification[tag = 'target']/value")&.text,
+          subject: classif_tag(reqt, "target"),
           child: reqt.xpath("./requirement | ./recommendation | ./permission")
-            .map do |r|
-                   r.at("./identifier")&.text
-                 end }
+            .map { |r| r.at("./identifier")&.text },
+          dependency: reqt.xpath("./inherit").map(&:text),
+          indirect_dependency: classif_tag(reqt, "indirect-dependency"),
+          implements: classif_tag(reqt, "implements") }
       end
     end
   end

data/lib/metanorma/modspec/xrefs.rb

@@ -3,39 +3,54 @@ module Metanorma
     class Modspec < Default
       def req_class_paths
         [
-          { klass: "permissionclass", label: @labels["modspec"]["permissionclass"],
+          { klass: "permissionclass",
+            label: @labels["modspec"]["permissionclass"],
             xpath: "permission[@type = 'class']" },
-          { klass: "requirementclass", label: @labels["modspec"]["requirementclass"],
+          { klass: "requirementclass",
+            label: @labels["modspec"]["requirementclass"],
             xpath: "requirement[@type = 'class']" },
-          { klass: "recommendationclass", label: @labels["modspec"]["recommendationclass"],
+          { klass: "recommendationclass",
+            label: @labels["modspec"]["recommendationclass"],
             xpath: "recommendation[@type = 'class']" },
-          { klass: "permissiontest", label: @labels["modspec"]["permissiontest"],
+          { klass: "permissiontest",
+            label: @labels["modspec"]["conformancetest"],
             xpath: "permission[@type = 'verification']" },
-          { klass: "recommendationtest", label: @labels["modspec"]["recommendationtest"],
+          { klass: "recommendationtest",
+            label: @labels["modspec"]["conformancetest"],
             xpath: "recommendation[@type = 'verification']" },
-          { klass: "requirementtest", label: @labels["modspec"]["requirementtest"],
+          { klass: "requirementtest",
+            label: @labels["modspec"]["conformancetest"],
             xpath: "requirement[@type = 'verification']" },
-          { klass: "abstracttest", label: @labels["modspec"]["abstracttest"],
+          { klass: "abstracttest",
+            label: @labels["modspec"]["abstracttest"],
             xpath: "permission[@type = 'abstracttest']" },
-          { klass: "abstracttest", label: @labels["modspec"]["abstracttest"],
+          { klass: "abstracttest",
+            label: @labels["modspec"]["abstracttest"],
             xpath: "requirement[@type = 'abstracttest']" },
-          { klass: "abstracttest", label: @labels["modspec"]["abstracttest"],
+          { klass: "abstracttest",
+            label: @labels["modspec"]["abstracttest"],
             xpath: "recommendation[@type = 'abstracttest']" },
-          { klass: "conformanceclass", label: @labels["modspec"]["conformanceclass"],
+          { klass: "conformanceclass",
+            label: @labels["modspec"]["conformanceclass"],
             xpath: "permission[@type = 'conformanceclass']" },
-          { klass: "conformanceclass", label: @labels["modspec"]["conformanceclass"],
+          { klass: "conformanceclass",
+            label: @labels["modspec"]["conformanceclass"],
             xpath: "requirement[@type = 'conformanceclass']" },
-          { klass: "conformanceclass", label: @labels["modspec"]["conformanceclass"],
+          { klass: "conformanceclass",
+            label: @labels["modspec"]["conformanceclass"],
             xpath: "recommendation[@type = 'conformanceclass']" },
-          { klass: "permission", label: @labels["default"]["permission"],
-            xpath: "permission[not(@type = 'verification' or @type = 'class' "\
+          { klass: "permission",
+            label: @labels["default"]["permission"],
+            xpath: "permission[not(@type = 'verification' or @type = 'class' " \
                    "or @type = 'abstracttest' or @type = 'conformanceclass')]" },
-          { klass: "recommendation", label: @labels["default"]["recommendation"],
-            xpath: "recommendation[not(@type = 'verification' or "\
-                   "@type = 'class' or @type = 'abstracttest' or "\
+          { klass: "recommendation",
+            label: @labels["default"]["recommendation"],
+            xpath: "recommendation[not(@type = 'verification' or " \
+                   "@type = 'class' or @type = 'abstracttest' or " \
                    "@type = 'conformanceclass')]" },
-          { klass: "requirement", label: @labels["default"]["requirement"],
-            xpath: "requirement[not(@type = 'verification' or @type = 'class' "\
+          { klass: "requirement",
+            label: @labels["default"]["requirement"],
+            xpath: "requirement[not(@type = 'verification' or @type = 'class' " \
                    "or @type = 'abstracttest' or @type = 'conformanceclass')]" },
         ]
       end

data/lib/metanorma/requirements/selector.rb

@@ -14,8 +14,9 @@ module Metanorma
       @i18n = i18n_klass(options[:lang] || "en",
                          options[:script] || "Latn",
                          options[:locale],
-                         options[:i18nhash])
-      @labels = @i18n.get.deep_merge(options[:labels] || {})["requirements"]
+                         options[:labels])
+      # @labels = @i18n.get.deep_merge(options[:labels] || {})["requirements"]
+      @labels = @i18n.get["requirements"]
       @models =
         model_names.each_with_object({}) { |k, m| m[k] = create(k) }
     end

data/lib/metanorma/requirements/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   class Requirements
-    VERSION = "0.1.7".freeze
+    VERSION = "0.1.9".freeze
   end
 end

data/mn-requirements.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "isodoc-i18n", "~> 1.1.0"
+  spec.add_dependency "isodoc-i18n", "~> 1.1.2"
   spec.add_dependency "metanorma-utils", "~> 1.4.0"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - lib/metanorma/modspec/isodoc.rb
 - lib/metanorma/modspec/modspec.rb
 - lib/metanorma/modspec/reqt_label.rb
+- lib/metanorma/modspec/table_cleanup.rb
 - lib/metanorma/modspec/validate.rb
 - lib/metanorma/modspec/xrefs.rb
 - lib/metanorma/requirements/selector.rb