mn-requirements 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f81b57e8350c7018f06bb68420de8d7b409b7f9ff4b81eb0d98d06f484e246e
-  data.tar.gz: 771ba5edb39491ad133dfc2d8cacaba2e11a0eba8b95389a2d834ddd84d0227a
+  metadata.gz: 61a7b742b3eee69725297f3d99f3f2646531ad3ef11033c388d364200d22cfdc
+  data.tar.gz: 5579921659997f451c184364ce4183e6db2cd69fe9c4f109920df710e0ea5830
 SHA512:
-  metadata.gz: 38d500ecb762b731b2ef373c55c67b0cfef8e4a93bfcf4619d629c6fe69fae635c4362502bf3235a94f3b5cfbab7248fcd5e7110c42640916bd4e3b3b33e21dc
-  data.tar.gz: 8d5c5b770acd55b9b0006345f3c743e863239257c353626e4f56f0cb50dc218f9512338080e30bec75160e89b61bf85b747296ead049480812625799cc3fc74e
+  metadata.gz: 24ffc3cb2a01b8124cad5a6ac9b08e3e032afc4c6bf0ba630992ccb301d1d72b7cb63693ff95065f133ba16b8b2e2dfe56a61842f7db84e79bb82c5ecf50168e
+  data.tar.gz: b7e03abb8ff4d4d905fa28e4497540e79d8cc7f87cf1b65ca90174b41a5aef4145ac81b5280963cbbe00026ae8b15ff4364c122468a81c2276b7e6d8ff39ba80

data/lib/metanorma/modspec/cleanup.rb

@@ -122,10 +122,10 @@ module Metanorma
       end
 
       def add_misc_container(xmldoc)
-        unless ins = xmldoc.at("//misc-container")
+        unless ins = xmldoc.at("//metanorma-extension")
           a = xmldoc.at("//termdocsource") || xmldoc.at("//bibdata")
-          a.next = "<misc-container/>"
-          ins = xmldoc.at("//misc-container")
+          a.next = "<metanorma-extension/>"
+          ins = xmldoc.at("//metanorma-extension")
         end
         ins
       end

data/lib/metanorma/modspec/reqt_label.rb

@@ -23,7 +23,7 @@ module Metanorma
 
       def recommendation_label_xref(elem, label, xrefs, type)
         id = @reqtlabels[label]
-        number = xrefs.anchor(id, :xref, false)
+        number = xrefs.anchor(id, :modspec, false)
         number.nil? and return type
         elem.ancestors("requirement, recommendation, permission").empty? and
           return number
@@ -73,7 +73,7 @@ module Metanorma
         docxml.reqt_iter do |r, m|
           id = r.at(ns("./identifier")) or next
           m[id.text] =
-            { id: r["id"], lbl: @xrefs.anchor(r["id"], :xref, false) }
+            { id: r["id"], lbl: @xrefs.anchor(r["id"], :modspec, false) }
         end
       end
 
@@ -85,7 +85,7 @@ module Metanorma
         %w(conformanceclass verification).include?(reqt["type"]) or return
         subj = reqt_extract_target(reqt)
         id = reqt.at(ns("./identifier")) or return
-        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
+        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :modspec, false)
         (subj && lbl) or return
         acc[subj.text] = { lbl: lbl, id: reqt["id"] }
       end
@@ -121,7 +121,7 @@ module Metanorma
 
       def reqt_links_class1(id, parent_reqt, reqt, acc)
         id1 = reqt.at(ns("./identifier")) or return acc
-        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
+        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :modspec, false)
         lbl or return acc
         acc[id1.text] = { lbl: lbl, id: parent_reqt["id"] }
         acc

data/lib/metanorma/modspec/xrefs.rb

@@ -72,10 +72,10 @@ module Metanorma
       def postprocess_anchor_struct(block, anchor)
         super
         anchor[:xref_bare] = anchor[:xref]
-        if l = block.at(ns("./identifier"))&.text
+        l = block.at(ns("./identifier")) and
           anchor[:xref] += l10n(": ") +
-            "<tt><xref style='id' target='#{block['id']}'>#{l}</xref></tt>"
-        end
+            "<tt><xref style='id' target='#{block['id']}'>#{l.text}</xref></tt>"
+        anchor[:modspec] = anchor[:xref]
         anchor
       end
     end

data/lib/metanorma/requirements/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Requirements processing and rendering according to different models