mn-requirements 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e6c91b33ab3f3b3eb4ce26df120009dfe92441024891d766115421023630ea
-  data.tar.gz: 800e1d60081b242bd3aa921004839ac0cabbcde5102a6d8c29d1d652e22b5cfc
+  metadata.gz: afda052b107a46deb4475c78df7261e3cfb708b4525372da5c00d71040aaabcd
+  data.tar.gz: 68c1ef39846359da8902e194495d105ebc767bbfc8284ab81946b49483b8be63
 SHA512:
-  metadata.gz: ad9db2b90feb438a6e146cc943585ccaf81b525147b9556860f11175976e65c247b44d2d084cfcae43b9d89fbba7d9b7bab8fef00f5d2051ea7ed1fd450b0c77
-  data.tar.gz: 4d875db98cb7ef2942ead616f49268314a12e592aecd5422b7f586fd98cf8fdf485d752e2fdf522dd9dc4640aab1f5e9e12e5c79dff6debbd9f17687396b3b32
+  metadata.gz: a467cdddb7c5bf675f7979d4b2d6a1581a21b0c76b30abbeec951cc0ab377088d7dea7efbb4e2195a6817e0d020a7311acad4eab2718bdddc209f931fb544796
+  data.tar.gz: c6bdc8ef9f159456a474a25476925d77497fe36809a69a63f9be9e712d4a9db86f25410d52e6850b1707c50f21a0a36f82beeea4e59007cff8a3aa49f028dc08

data/lib/metanorma/modspec/isodoc.rb

@@ -51,7 +51,7 @@ module Metanorma
         return ret unless title &&
           node.ancestors("requirement, recommendation, permission").empty?
 
-        ret += l10n(": ") if name
+        ret += l10n(": ") unless !name || name.text.empty?
         ret += title.children.to_xml
         ret
       end
@@ -67,8 +67,8 @@ module Metanorma
 
       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>")
+        out.add_child("<tr><td scope='colgroup' colspan='2'>"\
+                      "<tt>#{label.children.to_xml}</tt></td>")
       end
 
       def recommendation_attributes1(node)

data/lib/metanorma/modspec/reqt_label.rb

@@ -65,7 +65,8 @@ module Metanorma
         docxml.xpath(ns("//requirement | //recommendation | //permission"))
           .each_with_object({}) do |r, m|
             id = r.at(ns("./identifier")) or next
-            m[id.text] = r["id"]
+            m[id.text] =
+              { id: r["id"], lbl: @xrefs.anchor(r["id"], :xref, false) }
           end
       end
 
@@ -77,7 +78,7 @@ module Metanorma
 
             subj = r.at(ns("./classification[tag = 'target']/value"))
             id = r.at(ns("./identifier")) or next
-            lbl = @xrefs.anchor(@reqt_ids[id.text.strip], :xref, false)
+            lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
             next unless subj && lbl
 
             m[subj.text] = { lbl: lbl, id: r["id"] }
@@ -98,7 +99,7 @@ module Metanorma
             r.xpath(ns("./requirement | ./recommendation | ./permission"))
               .each do |r1|
               id1 = r1.at(ns("./identifier")) or next
-              lbl = @xrefs.anchor(@reqt_ids[id.text.strip], :xref, false)
+              lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
               next unless lbl
 
               m[id1.text] = { lbl: lbl, id: r["id"] }
@@ -113,7 +114,7 @@ module Metanorma
 
       def recommendation_id(ident)
         test = @reqt_ids[ident&.strip] or return ident&.strip
-        "<xref target='#{test}'>#{ident.strip}</xref>"
+        "<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
       end
     end
   end

data/lib/metanorma/requirements/selector.rb

@@ -11,7 +11,7 @@ module Metanorma
       @i18n = i18n_klass(options[:lang] || "en",
                          options[:script] || "Latn",
                          options[:i18nhash])
-      @labels = @i18n.get.merge(options[:labels] || {})["requirements"]
+      @labels = @i18n.get.deep_merge(options[:labels] || {})["requirements"]
       @models = {}
       model_names.each { |k| @models[k] = create(k) }
     end

data/lib/metanorma/requirements/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n