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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1de79ada3cccc90471f663c3279aafbf1134ff0da0bbb09197c6565e2382f17
-  data.tar.gz: 9459a2816d7d6b280891adfb5f4b020e1df1388ae6b0b2b6e6f4032645a6b020
+  metadata.gz: a4910f5153470cbaeb2050385fe5b2fb310f0d8028e64a946c419b3fd3d772df
+  data.tar.gz: ea045152f9a08da7b2548df4c41bcd39fa6195d4bcffc9119231ccdd85a91743
 SHA512:
-  metadata.gz: 6726afa5506d3532ac980f9f180b063c7886437aabf01d34664c40edec23656377974ee9b19fd64d32aa712fa97fdeeb2b1e4395c2e5bce33b126d7c8de04b9a
-  data.tar.gz: 5226d40e0f5549cda5d6cefdf1f834a6d76fb4caf3aa231f69f21119b96876d91736cdded924557aeb35669f0c6002850a9f3d8fd585a3cdc000f46222cc9ab0
+  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/iso690/styles/jis-en.yml

@@ -0,0 +1,68 @@
+# The metanorma-jis CitationStyle instance, English forms
+# (relaton-render 3.0.0.pre Iso690 engine): the ISO 690 order with the
+# Latin punctuation of the en language pack.
+name: "ISO 690 (JIS, en)"
+scheme:
+  system: name-date
+  shortFromReference: true
+  homeDocidType: []
+  nameForm:
+    initials: true
+    initialsSeparator: ""
+    initialsPeriod: true
+    surnameUpcase: false
+    subsequentSurnameUpcase: false
+    invertedAll: true
+    completenameUpcase: false
+    orgUpcase: false
+    editorsMarked: false
+  locale:
+    availableAt: "Available at:"
+    labels:
+      "and": "&"
+      oxford_comma: ""
+      series_no: ""
+templates:
+  titleOpen: ""
+  titleClose: ""
+  identifierMode: first
+  citation: "{{surname}} {{date}}"
+  uri: "<span class='biburl'><fmt-link target='{{uri}}'>{{uri}}</fmt-link></span>"
+  reference: "{{creator}}{{role}}. {{title}}. {{edition}}. ({{series}}). {{production}}. {{date}}. {{size}}"
+  name: "{{surname}} {{givenNames}}"
+perType:
+  - type: report
+    home: true
+    short: "<span class='stddocTitle'>{{title}}</span>, {{extent}}"
+    template: "{{title}}"
+    title: "<span class='stddocTitle'>{{title}}</span>"
+  - type: report
+    fallbacks:
+      date: "n.d"
+    template: "{{creator}}. {{title}}. {{edition}}. {{production}}. {{authorizer}}. {{location}}"
+    short: "{{creator}}. <span class='stddocTitle'>{{title}}</span>. {{edition}}. {{production}}"
+    title: "<span class='stddocTitle'>{{title}}</span>"
+  - type: monograph
+    noPlace: true
+    fallbacks:
+      date: "n.d"
+    template: "{{creator}}{{role}}. {{title}}. {{edition}}. ({{series}}). {{production}}. {{date}}. {{size}}. {{location}}"
+  - type: continuing
+    template: "{{title}}. {{date}}"
+  - type: online
+    fallbacks:
+      date: "n.d"
+    template: "{{creator}}. {{title}}. {{production}}. {{date}}. {{location}}"
+  - type: webdoc
+    fallbacks:
+      date: "n.d"
+    template: "{{creator}}. {{title}}. {{production}}. {{date}}. {{location}}"
+  - type: component_part
+    noPlace: true
+    template: "{{creator}}{{role}}. {{title}}. {{componentpart}}. {{edition}}. ({{series}}). {{production}}. {{date}}. {{extent}}. {{location}}"
+  - type: serial_part
+    template: "{{creator}}{{role}}. {{title}}. {{series}}. {{date}}, {{extent}}. {{location}}"
+    series: "{{seriestitle}} ({{seriesrun}})"
+  - type: article
+    template: "{{creator}}{{role}}. {{title}}. {{series}}. {{date}}, {{extent}}"
+    series: "{{seriestitle}} ({{seriesrun}})"

data/lib/relaton/render/iso690/styles/jis-ja.yml

@@ -0,0 +1,67 @@
+# The metanorma-jis CitationStyle instance, Japanese forms
+# (relaton-render 3.0.0.pre Iso690 engine): the ISO 690 order with the
+# Latin punctuation of the en language pack.
+name: "ISO 690 (JIS, ja)"
+scheme:
+  system: name-date
+  shortFromReference: true
+  homeDocidType: []
+  nameForm:
+    initials: true
+    initialsSeparator: ""
+    initialsPeriod: true
+    surnameUpcase: false
+    subsequentSurnameUpcase: false
+    invertedAll: true
+    completenameUpcase: false
+    orgUpcase: false
+    editorsMarked: false
+  locale:
+    labels:
+      "and": ""
+      oxford_comma: ""
+      series_no: ""
+templates:
+  titleOpen: ""
+  titleClose: ""
+  identifierMode: first
+  citation: "{{surname}} {{date}}"
+  uri: "<span class='biburl'><fmt-link target='{{uri}}'>{{uri}}</fmt-link></span>"
+  reference: "{{creator}}{{role}}。 {{title}}。 {{edition}}。（{{series}}）。 {{production}}。 {{date}}。 {{size}}"
+  name: "{{surname}} {{givenNames}}"
+perType:
+  - type: report
+    home: true
+    short: "<span class='stddocTitle'>{{title}}</span>、 {{extent}}"
+    template: "{{title}}"
+    title: "<span class='stddocTitle'>{{title}}</span>"
+  - type: report
+    fallbacks:
+      date: "日付なし"
+    template: "{{creator}}。 {{title}}。 {{edition}}。 {{production}}。 {{authorizer}}。 {{location}}"
+    short: "{{creator}}。 <span class='stddocTitle'>{{title}}</span>。 {{edition}}。 {{production}}"
+    title: "<span class='stddocTitle'>{{title}}</span>"
+  - type: monograph
+    noPlace: true
+    fallbacks:
+      date: "日付なし"
+    template: "{{creator}}{{role}}。 {{title}}。 {{edition}}。（{{series}}）。 {{production}}。 {{date}}。 {{size}}。 {{location}}"
+  - type: continuing
+    template: "{{title}}。 {{date}}"
+  - type: online
+    fallbacks:
+      date: "日付なし"
+    template: "{{creator}}。 {{title}}。 {{production}}。 {{date}}。 {{location}}"
+  - type: webdoc
+    fallbacks:
+      date: "日付なし"
+    template: "{{creator}}。 {{title}}。 {{production}}。 {{date}}。 {{location}}"
+  - type: component_part
+    noPlace: true
+    template: "{{creator}}{{role}}。 {{title}}。 {{componentpart}}。 {{edition}}。（{{series}}）。 {{production}}。 {{date}}。 {{extent}}。 {{location}}"
+  - type: serial_part
+    template: "{{creator}}{{role}}。 {{title}}。 {{series}}。 {{date}}、{{extent}}。 {{location}}"
+    series: "{{seriestitle}} （{{seriesrun}}）"
+  - type: article
+    template: "{{creator}}{{role}}。 {{title}}。 {{series}}。 {{date}}、{{extent}}"
+    series: "{{seriestitle}} （{{seriesrun}}）"

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "3.0.0.pre.alpha.30".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.30
+  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
@@ -159,6 +159,8 @@ files:
 - lib/relaton/render/iso690/styles/author-date.yml
 - lib/relaton/render/iso690/styles/chicago.yml
 - lib/relaton/render/iso690/styles/ieee-sa.yml
+- lib/relaton/render/iso690/styles/jis-en.yml
+- lib/relaton/render/iso690/styles/jis-ja.yml
 - lib/relaton/render/iso690/styles/lncs.yml
 - lib/relaton/render/iso690/template.rb
 - lib/relaton/render/version.rb