metanorma-ribose 2.5.6 → 2.5.9

data/lib/isodoc/ribose/xref.rb

@@ -6,7 +6,8 @@ module IsoDoc
     end
 
     class Xref < IsoDoc::Generic::Xref
-      def annex_name_lbl(clause, num)
+      # KILL
+      def annex_name_lblx(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
         clause["obligation"] == "normative" and
           obl = l10n("(#{@labels['norm_annex']})")
@@ -28,7 +29,8 @@ module IsoDoc
         end
       end
 
-      def section_names1(clause, num, level)
+      # KILL
+      def section_names1x(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level, xref: num }
         # subclauses are not prefixed with "Clause"
@@ -39,8 +41,25 @@ module IsoDoc
         end
       end
 
+      # subclauses are not prefixed with "Clause"
+      # retaining subtype for the semantics
+      def section_name_anchors(clause, num, level)
+        if clause["type"] == "section"
+          xref = labelled_autonum(@labels["section"], num)
+          label = labelled_autonum(@labels["section"], num)
+          @anchors[clause["id"]] =
+            { label:, xref:, elem: @labels["section"],
+              title: clause_title(clause), level: level, type: "clause" }
+        elsif level > 1
+          #num = semx(clause, num)
+          @anchors[clause["id"]] =
+            { label: num, level: level, xref: num, subtype: "clause" }
+        else super end
+      end
+
       # we can reference 0-number clauses in introduction
-      def introduction_names(clause)
+      # # KILL
+      def introduction_namesx(clause)
         clause.nil? and return
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
@@ -49,6 +68,18 @@ module IsoDoc
         clause.xpath(ns("./clause")).each do |c|
           section_names1(c, i.increment(c).print, 2)
         end
+      end
+            # we can reference 0-number clauses in introduction
+      def introduction_names(clause)
+        clause.nil? and return
+        clause.at(ns("./clause")) and
+          @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
+                                     xref: clause.at(ns("./title"))&.text }
+        #i = Counter.new(0, prefix: "0")
+        i = Counter.new(0)
+        clause.xpath(ns("./clause")).each do |c|
+          section_names1(c, semx(clause, "0"), i.increment(c).print, 2)
+        end
       end
     end
   end

data/lib/metanorma/ribose/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.0 -->
+<!-- VERSION v1.4.1 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.5.6".freeze
+    VERSION = "2.5.9".freeze
   end
 end

data/metanorma-ribose.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.7.2"
+  spec.add_dependency "metanorma-generic", "~> 2.7.4"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: 2.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: 2.7.4
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement