relaton-render 3.0.0.pre.alpha.21 → 3.0.0.pre.alpha.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc55ca6da22673e6173486336211c48510588218d75e08672e8b3cfc09308cd
-  data.tar.gz: 0a338c96b9ec80bbd6b345c86d6fa15a9b14810db27729104f1386391f46de69
+  metadata.gz: d485246fb8d04c771c257c63295000ade2b54462caaa884aa0a1aecdb22a6498
+  data.tar.gz: 8cbb2bed01af3e82d57ebc064853ead1dc0fd7215aab812b782ce5faaf59d4c3
 SHA512:
-  metadata.gz: 4d172ba4dd2697389d3372a37eaf460d7673ab7a2ba693e8365f8777f241c8dc19df5b2dc9082563aaeeb08866634318dccfbed54d61a378b341ee0c7b88e954
-  data.tar.gz: c0258407ac4ca2672164299ffe50b4ea671498dced9f653b06eb818e448e824e405b77e321a4e756f17710aba74a7f2892d69dfea3d7e6e216f84e23c6e6b190
+  metadata.gz: 467f05b5d476d4eb759d2248b863eca01e5319b18ab98c95c7283921a27ba5cdaf5ac9fcf93f8b10e24c2dee08028bdeeea25a975473d6311820f46229670826
+  data.tar.gz: cd5caf02198e2d34538eab81c0cd0732b1b276bc62195352e9aee68cd61221b180a585b4a3ff9d218664b3ec6deb7dc1d7c937fe85cd02bf887b8a84162071b9

data/lib/relaton/render/general.rb

@@ -148,6 +148,8 @@ module Relaton
                   short
                 end
 
+        title = renderer.title_citation(item)
+
         {
           full: ref,
           default: item.docidentifier.first&.content.to_s,
@@ -155,8 +157,14 @@ module Relaton
           author_date: renderer.author_date_citation(
             item, disambiguator: disambiguator,
           ),
+          author_date_br: renderer.bracketed_date_citation(
+            item, disambiguator: disambiguator,
+          ),
           author: renderer.in_text_author(item),
-          title: renderer.title_citation(item),
+          date: renderer.disambiguated_date(item, disambiguator: disambiguator),
+          reference_tag: "",
+          title: title,
+          title_reference_tag: title,
         }
       end
 
@@ -256,7 +264,8 @@ module Relaton
       # and every flavor still pass string keys.
       def deep_symbolize(value)
         case value
-        when Hash then value.to_h { |k, v| [k.to_sym, deep_symbolize(v)] }
+        # isodoc i18n hashes carry nil keys (an unlabeled punct slot)
+        when Hash then value.to_h { |k, v| [k&.to_sym, deep_symbolize(v)] }
         when Array then value.map { |v| deep_symbolize(v) }
         else value
         end

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

@@ -118,9 +118,12 @@ module Relaton
         end
 
         def join_names(names)
-          # A style with no join word renders a plain serial list
+          # A style with no join word renders a plain serial list,
+          # separated per the locale (the comma, or the CJK 、)
           if @i18n.label("and").empty? && names.size > 1
-            return names.join(", ")
+            sep = @i18n.label("list_separator")
+            sep = ", " if sep == "list_separator"
+            return names.join(sep)
           end
 
           oxford = @i18n.label("oxford_comma")

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

@@ -34,12 +34,12 @@ module Relaton
               # from the next element, which follows directly in the
               # template; a lone editor is unmarked unless declared
               if editors? && marked?
-                "#{period(joined)} (#{role_word}) "
+                "#{period(joined)}#{role_space}#{role_parenthesis} "
               else
                 "#{period(joined)} "
               end
             else
-              marker = editors? && marked? ? " (#{role_word})" : ''
+              marker = editors? && marked? ? "#{role_space}#{role_parenthesis}" : ''
               "#{joined}#{marker}"
             end
           end
@@ -48,10 +48,30 @@ module Relaton
           # plain join, without the wrap and sentence period (1.x
           # short-cite templates carried no wrap)
           def plain_render
-            marker = editors? && creators.size > 1 ? " (#{role_word})" : ''
+            marker = editors? && creators.size > 1 ?
+              "#{role_space}#{role_parenthesis}" : ''
             "#{join(names)}#{marker}"
           end
 
+          # The editor role marker's parentheses follow the locale
+          # (ASCII for Latin scripts, fullwidth for CJK)
+          def role_parenthesis
+            open = @i18n.punct_fetch("open-paren", "(")
+            close = @i18n.punct_fetch("close-paren", ")")
+            "#{open}#{role_word}#{close}"
+          end
+
+          # CJK cites the role marker tight against the name list
+          def role_space
+            @i18n.punct_fetch("marker-space", " ")
+          end
+
+          # The template-level role slot ("{{role}}"): the marker with
+          # its locale spacing, when the creators are all editors
+          def role_marker
+            editors? ? "#{role_space}#{role_parenthesis}" : ""
+          end
+
           def role_placement
             @style.scheme.name_form.role_placement || "glue"
           end

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

@@ -14,10 +14,39 @@ 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
+
             word = @i18n.label("edition_#{number}")
             return word unless word == "edition_#{number}"
 
-            "#{ordinalize(number)} #{@i18n.label('edition')}"
+            cardinal_form || "#{ordinalize(number)} #{@i18n.label('edition')}"
+          end
+
+          # The plain cardinal form ("edition 7")
+          def cardinal_form
+            locale_template("edition_cardinal", number) ||
+              locale_template("version_cardinal", number)
+          end
+
+          private
+
+          # A locale template carrying {{ var1 }} (optionally through
+          # the ordinal_word filter) populated with the edition number;
+          # a bare label (no placeholder) is not one
+          def locale_template(key, value)
+            raw = @i18n.label(key)
+            return nil if raw == key || raw !~ /\{{/
+
+            if raw.include?("ordinal_word")
+              word = @i18n.label("ordinal_word_#{value}")
+              word = ordinalize(value) if word == "ordinal_word_#{value}"
+              raw.gsub(/\{\{\s*var1[^}]*\}\}/, word)
+            else
+              raw.gsub("{{ var1 }}", value.to_s)
+            end
           end
 
           private

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

@@ -17,17 +17,24 @@ module Relaton
               return no_place_production_publisher_first if places.empty? &&
                 no_place_declared?
 
-              return [publishers.join("; "), places.join("; ")]
+              return [publishers.join("; "), places.map { |p| cjk_place(p) }]
                 .reject(&:empty?).join(production_sep)
             end
 
             return no_place_production if places.empty? && no_place_declared?
 
-            [places.join("; "), publishers.join("; ")]
+            [places.map { |p| cjk_place(p) }, publishers.join("; ")]
               .reject(&:empty?).join(production_sep)
           end
 
-          def publisher_first?
+          # A CJK locale's place names carry the CJK-Latin separator
+        # ("Cambridge、UK" over "Cambridge, UK")
+        def cjk_place(place)
+          sep = @i18n.punct_fetch("cjk-latin-separator", "")
+          sep.empty? ? place : place.gsub(", ", sep)
+        end
+
+        def publisher_first?
             @i18n.punct_fetch("production_order", "") == "publisher_first"
           end
 

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

@@ -28,7 +28,11 @@ module Relaton
 
             type = value.is_a?(Hash) ? value[:type] : value.type
             unit = type && @i18n.label("size_#{type}")
-            unit.nil? || unit == "size_#{type}" ? content : "#{content} #{unit}"
+            return content if unit.nil? || unit == "size_#{type}"
+
+            # The value/unit glue is locale-declared (CJK cites tight,
+            # "巻1" over "vol. 1")
+            "#{unit}#{@i18n.punct_fetch('size-join', ' ')}#{content}"
           end
         end
       end

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

@@ -30,6 +30,7 @@ module Relaton
             key = slot.to_s.delete("_").downcase
             table[key] = element_field(slot)
           end
+          table["role"] = role_field
           table["dategroup"] = dategroup_field
           table["disambiguateddate"] = disambiguated_date_field(table["date"])
           unless table["dategroup"].present?
@@ -38,6 +39,20 @@ module Relaton
           table.merge(name_fields)
         end
 
+        # The creators' editor-role marker ("(eds.)", "（編）"), as a
+        # template slot: a creator list that is not all editors cites no
+        # role
+        def role_field
+          creator = Elements.build(:creator, @model, style: @style,
+                                   i18n: @i18n, elements: @elements)
+          return Template::Field[false, ""] unless
+            creator&.present? && creator.respond_to?(:role_marker)
+
+          marker = creator.role_marker
+          marker.empty? ? Template::Field[false, ""] :
+            Template::Field[true, marker]
+        end
+
         # The date carrying the batch disambiguation suffix ("2022a"):
         # identity when the caller passes none
         def disambiguated_date_field(date)

data/lib/relaton/render/iso690/i18n/en.yml

@@ -1,6 +1,16 @@
 lang: en
 labels:
   edition: "ed"
+  ordinal_word_1: "First"
+  ordinal_word_2: "Second"
+  ordinal_word_3: "Third"
+  ordinal_word_4: "Fourth"
+  ordinal_word_5: "Fifth"
+  ordinal_word_6: "Sixth"
+  ordinal_word_7: "Seventh"
+  ordinal_word_8: "Eighth"
+  ordinal_word_9: "Ninth"
+  ordinal_word_10: "Tenth"
   size_volume: "vol."
   size_page: "pp."
   page: "p."

data/lib/relaton/render/iso690/i18n/ja.yml

@@ -0,0 +1,38 @@
+lang: ja
+labels:
+  edition: "版"
+  size_volume: "巻"
+  size_page: "頁"
+  page: "頁"
+  pages: "頁"
+  volume: "巻"
+  issue: "号"
+  version: "版"
+  viewed: "閲覧"
+  series_no: "番号"
+  report_no: "報告番号"
+  available_from: "入手先："
+  at_url: "URL："
+  in: "収録："
+  ed: "編"
+  eds: "編"
+  updated: "更新"
+  no_place: "出版地不明"
+  edition_cardinal: "第{{ var1 }}版"
+  edition_ordinal: "第{{ var1 }}版"
+  version_cardinal: "第{{ var1 }}版"
+  in_series: "シリーズ"
+  list_separator: "、 "
+  and: ""
+  oxford_comma: ""
+  date_range: "–"
+punct:
+  size-join: ""
+  marker-space: ""
+  production_sep: "： "
+  cjk-latin-separator: "、 "
+  period: "。"
+  comma: "、"
+  colon: "："
+  open-paren: "（"
+  close-paren: "）"

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

@@ -43,6 +43,7 @@ module Relaton
           known = %w[
             edition series_no report_no available_from in and oxford_comma
             ed eds date_range others no_date no_author at
+            edition_ordinal edition_cardinal version_cardinal
           ]
           hash.each do |key, value|
             labels[key.to_s] = value if known.include?(key.to_s) && !value.nil?

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

@@ -92,6 +92,28 @@ module Relaton
             .reject(&:empty?).join(" ")
         end
 
+        # The bracketed author-date in-text capsule ("Aluffi （2022）"):
+        # the author and the date in the locale's parentheses
+        def bracketed_date_citation(model, disambiguator: nil)
+          f = Fields.new(model, style: @style, i18n: @i18n,
+                         disambiguator: disambiguator,
+                         elements: @elements).to_h
+          date = f["disambiguateddate"].text
+          return "" if date.empty?
+
+          open = @i18n.punct_fetch("open-paren", "(")
+          close = @i18n.punct_fetch("close-paren", ")")
+          [in_text_author(model), "#{open}#{date}#{close}"]
+            .reject(&:empty?).join(" ")
+        end
+
+        # The disambiguated date alone (the citation renderings' date)
+        def disambiguated_date(model, disambiguator: nil)
+          Fields.new(model, style: @style, i18n: @i18n,
+                     disambiguator: disambiguator,
+                     elements: @elements).to_h["disambiguateddate"].text
+        end
+
         # The title citation ("{{ title }}" in the 1.x citetemplate):
         # the title element's plain form, no style markers
         def title_citation(model)

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

@@ -124,9 +124,14 @@ module Relaton
         end
 
         # A template's paired literal ("({{production}})") closes even
-        # when nothing follows the present element it wraps
+        # when nothing follows the present element it wraps. Fullwidth
+        # parens (CJK) pair the same way
         def close_pending_paren?(out, value)
-          value.start_with?(")") && out.count("(") > out.count(")")
+          return false unless value.start_with?(")", "\uFF09")
+
+          opens = out.count("(") + out.count("\uFF08")
+          closes = out.count(")") + out.count("\uFF09")
+          opens > closes
         end
 
         def terminate(body)

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "3.0.0.pre.alpha.21".freeze
+    VERSION = "3.0.0.pre.alpha.22".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.21
+  version: 3.0.0.pre.alpha.22
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-06 00:00:00.000000000 Z
+date: 2026-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -143,6 +143,7 @@ files:
 - lib/relaton/render/iso690/i18n.rb
 - lib/relaton/render/iso690/i18n/en.yml
 - lib/relaton/render/iso690/i18n/fr.yml
+- lib/relaton/render/iso690/i18n/ja.yml
 - lib/relaton/render/iso690/identifier_kinds.rb
 - lib/relaton/render/iso690/index_renderer.rb
 - lib/relaton/render/iso690/kinds.rb