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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50fb4bacd89f6ca82b53a110f58e73e8c7fee162ce7ee712aad0515c01cc1ad
-  data.tar.gz: 64d2bbc56979a832374002a3a9dde0115903ca7c793228af46b0f6e8cd1d4d95
+  metadata.gz: 4f60dbd78e23c39885f24c3228ee357e87403531f06e9383337648f5f958e512
+  data.tar.gz: 66e522c7127639c738ff30874836094655948746a259a92829f29a578526fdad
 SHA512:
-  metadata.gz: a7f069c5015bd59b9834472adbb60c9f0f67c0c248aa02d265bd5e4f37ac9f0f9b4920e6a57efaa16b91430d9f1991b0a71112f9c14f7d8900c42495b26f5d67
-  data.tar.gz: d7c33b582fc403401644a2e82f4cb8727a0ef8d27a3a02ce12261f70bf8e52dc901a72c20ba2c10aaec735a8f1c53d5bf510adb87e28ee746b401502831d008e
+  metadata.gz: 516518c28ea8a160ff658c8e1b4459ccfba92084c39cddb9358f617433a749253d904baf568feecb04ecc392923f7d2cc88550a6527d1fc5aa643134065d4f3d
+  data.tar.gz: cc3bbbb3475890477b3a6d3a7960791a8eebba0a6b1234c5f751d47a1a9d4047badf1743bc3e51b031791fb51842e222723a555acef218b0e1f9ad0c92a579d2

data/docs/citation-style-pack.adoc

@@ -291,7 +291,7 @@ is a rule to promote:
 
 |`ItuIdentifier` |`identifier: itu`
 |`NistIdentifier`, `NistCreator`, `NistDate`, `SerialDate`, `NistSeries`, `NistComponentPart`, `NistPublisher`, `Draft` |the NIST author-year rule set
-|`IeeeIdentifier`, `IeeeComponentPart`, `IeeeAccess`, `IeeeMedium` |the IEEE-SA rule set (designation-first standards)
+|`IeeeIdentifier`, `IeeeComponentPart`, `IeeeAccess`, `IeeeMedium` |**[impl]** promoted: `ieee_identifier`, `ieee_component_part`, `ieee_access`, `ieee_medium`
 |`BipmCreator`, `BipmComponentPart`, `BipmProduction`, `BipmExtent`, `BipmMedium`, `BipmEdition`, `BipmVolume` |the BIPM rule set
 |`IhoEdition`, `IhoCreator` |affiliation-composite creators
 |`JisComponentPart`, `JisSeries`, `JisExtent` |the JIS host-citation rules

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/rules.rb

@@ -15,8 +15,90 @@ module Relaton
           end
         end
 
+        # The IEEE-SA identifiers: DOI and ISBN carry their kind label
+        # with a colon ("DOI: https://doi.org/…")
+        class IeeeIdentifier < Elements::Identifier
+          private
+
+          def render_id(docidentifier)
+            return "#{docidentifier.type}: #{docidentifier.content}" if
+              %w[DOI ISBN].include?(docidentifier.type)
+
+            super
+          end
+        end
+
+        # The IEEE component part: "in Pellegrini, A. D., and P. K.
+        # Smith (eds.): <em>host</em>, production" — the names first,
+        # the eds marker in the close paren, the host title after the
+        # colon, the production after a comma
+        class IeeeComponentPart < Elements::ComponentPart
+          def render
+            h = host or return ""
+            out = +"in #{host_person_names(h)} (#{eds_label(h)}): "
+            out += host_title.to_s
+            production = Elements::Production
+              .new(h, style: @style, i18n: @i18n).render.to_s
+            out += ", #{production}" unless production.empty?
+            out
+          end
+
+          private
+
+          def host_editors(h)
+            Array(h.contributor).select { |c| has_role?(c, "editor") }
+          end
+
+          def eds_label(h)
+            @i18n.label(host_editors(h).one? ? "ed" : "eds")
+          end
+
+          # The IEEE host form: the first editor inverted, subsequent
+          # editors direct
+          def host_person_names(h)
+            host_editors(h).each_with_index.map { |c, i|
+              person = c.person or next ""
+
+              if i.zero?
+                [person_surname(person), person_given(person)]
+                  .reject(&:empty?).join(", ")
+              else
+                [person_given(person), person_surname(person)]
+                  .reject(&:empty?).join(" ")
+              end
+            }.reject(&:empty?).then { |names| join_names(names) }
+          end
+        end
+
+        # The IEEE access date, bare and unbracketed
+        # ("accessed September 3, 2019")
+        class IeeeAccess < Elements::Access
+          def render
+            "#{@i18n.label('viewed')} #{date_text}"
+          end
+        end
+
+        # The IEEE medium, capitalized and carrying its own trailing
+        # comma ("Dataset,", "Preprint,")
+        class IeeeMedium < Elements::Medium
+          private
+
+          def medium
+            m = @model.medium or return ""
+            text = m.carrier.to_s
+            text = m.genre.to_s if text.empty?
+            text = [m.form.to_s, m.size.to_s].reject(&:empty?)
+              .join(", ") if text.empty?
+            text.empty? ? "" : "#{text.sub(/^\w/) { |c| c.upcase }},"
+          end
+        end
+
         REGISTRY = {
           "status_bare" => BareStatus,
+          "ieee_identifier" => IeeeIdentifier,
+          "ieee_component_part" => IeeeComponentPart,
+          "ieee_access" => IeeeAccess,
+          "ieee_medium" => IeeeMedium,
         }.freeze
 
         class << self

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.33".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.33
 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