mn-requirements 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e446f52e8a55fc21a99df29ce798a2a7ea84d987d07aceb23d64b5c1c77be7e3
-  data.tar.gz: f1142726f55149df21ff127df360b656cd14b9c376f7d13844ba04451239b5b1
+  metadata.gz: bec40fff7706ba8af4ebbc7e39c0a9110cd5ffc96730cace20586ae6beeb93c2
+  data.tar.gz: 7c3d55500016be83b0cbb85e2f85dfcbc416208a3d2a48ec8fa527ecd54f4607
 SHA512:
-  metadata.gz: 2617c33c902c0caddd8ac9f47f4b9fd497ce04482ef53195d50e13776e3f2a165ec1c13f3891efb67cfdbfc11b891dcff9a598894bf344d6f97a3b538bc171b8
-  data.tar.gz: dba9959bd392290b870c539410f8d50b55203308d96b3ec786c1c6a9532bcbc7e650f89a614390425f2fe21d52853109dfd63f792729de68aab92b20345ab684
+  metadata.gz: 307c6f011e3b445bdb3cd2a3340286d4012dde7da55bad0473ec15924cc47dbac6661a330e06d4946344e03c9cc40571a59419566fde258aecd0f23f2656ad76
+  data.tar.gz: 6dadbc51c3ca8304eb295d14175b805709310bf13b7fdf4ddfafa4febac2dd54f3271d4b6eb735b28dc00896c03021d4cd0b6fdee074ad7cde0de071f2a48518

data/lib/metanorma/modspec/table_cleanup.rb

@@ -69,31 +69,27 @@ module Metanorma
           r.at(ns("./th"))&.text&.strip == hdr or break
           td = r.remove.at(ns("./td"))
           id = td["id"] ? "<bookmark id='#{td['id']}'/>" : ""
-          ret << id + to_xml(td.children).strip
+          ret << (id + to_xml(td.children).strip)
         end
         ret
       end
 
       def requirement_table_nested_cleanup(node, out, table)
         rows = []
-        table.xpath(ns("./tbody/tr/td/*/fmt-provision/table"))
-          .sort_by do |t|
-            [t.at(ns(".//fmt-name//span[@class = 'fmt-element-name']"))&.text,
-             t.at(ns(".//fmt-name//semx[@element = 'autonum']"))&.text&.to_i]
-          end.each do |t|
-            x = t.at(ns("./thead/tr")) or next
-            x.at(ns("./th")).children =
-              requirement_table_nested_cleanup_hdr(node)
-            f = x.at(ns("./td/fmt-name")) and
-              f.parent.children = to_xml(f.children).strip
-            td = x.at(ns("./td"))
-            td["id"] = t["original-id"] || t["id"]
-            if desc = t.at(ns("./tbody/tr/td/semx[@element = 'description']"))
-              p = desc.at(ns("./p")) and p.replace(p.children)
-              td << " #{to_xml(desc)}"
-            end
-            rows << x
+        requirement_table_nested_cleanup_sort(table).each do |t|
+          x = t.at(ns("./thead/tr")) or next
+          x.at(ns("./th")).children =
+            requirement_table_nested_cleanup_hdr(node)
+          f = x.at(ns("./td/fmt-name")) and
+            f.parent.children = to_xml(f.children).strip
+          td = x.at(ns("./td"))
+          td["id"] = t["original-id"] || t["id"]
+          if desc = t.at(ns("./tbody/tr/td/semx[@element = 'description']"))
+            p = desc.at(ns("./p")) and p.replace(p.children)
+            td << " #{to_xml(desc)}"
           end
+          rows << x
+        end
         table.xpath(ns("./tbody/tr[./td/*/fmt-provision/table]"))
           .each_with_index do |t, i|
           t.replace(rows[i])
@@ -102,6 +98,25 @@ module Metanorma
         table
       end
 
+      def requirement_table_nested_cleanup_sort(table)
+        table.xpath(ns("./tbody/tr/td/*/fmt-provision/table"))
+          .sort_by do |t|
+            [t.at(ns(".//fmt-name//span[@class = 'fmt-element-name']"))&.text,
+             *autonum_sort_key(
+               t.at(ns(".//fmt-name//semx[@element = 'autonum']"))&.text,
+             )]
+          end
+      end
+
+      # allow autonum to be sorted numerically, but break up non-numeric text
+      # to allow for autonum values like "1a", "1b", etc. and delimited autonum
+      # values like "1.1", "1.2", etc.
+      def autonum_sort_key(text)
+        text ||= ""
+        nums = text.scan(/\d+/).map(&:to_i)
+        [nums, text]
+      end
+
       def requirement_table_nested_cleanup_hdr(node)
         label = "provision"
         node["type"] == "conformanceclass" and label = "conformancetest"

data/lib/metanorma/requirements/version.rb

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

data/mn-requirements.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "metanorma-standoc", ">= 3.4.1"
+  spec.add_development_dependency "metanorma-standoc", ">= 3.4.2"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement