relaton-render 3.0.0.pre.alpha.31 → 3.0.0.pre.alpha.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50fb4bacd89f6ca82b53a110f58e73e8c7fee162ce7ee712aad0515c01cc1ad
-  data.tar.gz: 64d2bbc56979a832374002a3a9dde0115903ca7c793228af46b0f6e8cd1d4d95
+  metadata.gz: a4910f5153470cbaeb2050385fe5b2fb310f0d8028e64a946c419b3fd3d772df
+  data.tar.gz: ea045152f9a08da7b2548df4c41bcd39fa6195d4bcffc9119231ccdd85a91743
 SHA512:
-  metadata.gz: a7f069c5015bd59b9834472adbb60c9f0f67c0c248aa02d265bd5e4f37ac9f0f9b4920e6a57efaa16b91430d9f1991b0a71112f9c14f7d8900c42495b26f5d67
-  data.tar.gz: d7c33b582fc403401644a2e82f4cb8727a0ef8d27a3a02ce12261f70bf8e52dc901a72c20ba2c10aaec735a8f1c53d5bf510adb87e28ee746b401502831d008e
+  metadata.gz: 99e29f76607ff8c1e0b84ef5fbf9fb56c9291bb87c0ecb6d771679d2a9a7f12aaa0140692fdef6f665bdd9b9e278feaf59d2466591843ada74fc4d68740bd951
+  data.tar.gz: b5a937aae90ad6771126ece89b64bce89dc92f7fa60bebdca3719885197878125fa4d579e89990f13bc94111fc0b82dcb901d59b490ea00acca95cf8c6fccce5

data/lib/relaton/render/iso690/elements/edition.rb

@@ -14,14 +14,16 @@ module Relaton
           def render
             return "#{@i18n.label('version')} #{raw}" unless word_edition?
 
-            # The worded forms first ("First edition", "第N版" via the
-            # ordinal template), the cardinal last
-            ordinal = locale_template("edition_ordinal", number)
-            return ordinal if ordinal
-
+            # The exact worded forms first ("first edition", "第1版"),
+            # then the generic ordinal template, the cardinal last: a
+            # specific label outranks a template that would apply to
+            # any number
             word = @i18n.label("edition_#{number}")
             return word unless word == "edition_#{number}"
 
+            ordinal = locale_template("edition_ordinal", number)
+            return ordinal if ordinal
+
             cardinal_form || "#{ordinalize(number)} #{@i18n.label('edition')}"
           end
 

data/lib/relaton/render/iso690/style/locale.rb

@@ -39,12 +39,18 @@ module Relaton
             "available_at" => "available_from",
           }.freeze
 
-          def label_map
-            base = LABEL_FOR.filter_map do |attr, label|
+          # The named attributes' label map alone: a delta's named
+          # attribute (availableAt) outranks the base pack's labels
+          # hash carrying the same label key
+          def named_label_map
+            LABEL_FOR.filter_map do |attr, label|
               value = public_send(attr)
               [label, value] unless value.nil?
             end.to_h
-            base.merge(labels || {})
+          end
+
+          def label_map
+            named_label_map.merge(labels || {})
           end
         end
       end

data/lib/relaton/render/iso690/style.rb

@@ -176,7 +176,12 @@ module Relaton
           locale.in_str ||= base_locale.in_str
           locale.at ||= base_locale.at
           locale.available_at ||= base_locale.available_at
-          locale.labels.merge!(base_locale.label_map) { |_k, _b, d| d }
+          # delta labels win per key; the base's label map only fills
+          # gaps. Hash#merge! yields |key, receiver, other|, so the
+          # delta value is the second argument.
+          locale.labels.merge!(base_locale.label_map) { |_k, delta, _base| delta }
+          # a delta's named attributes assert over the inherited labels
+          locale.named_label_map.each_key { |k| locale.labels.delete(k) }
           locale.punct = (base_locale.punct || {}).merge(locale.punct || {})
         end
 

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "3.0.0.pre.alpha.31".freeze
+    VERSION = "3.0.0.pre.alpha.32".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.31
+  version: 3.0.0.pre.alpha.32
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-08 00:00:00.000000000 Z
+date: 2026-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities