relaton-render 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4af2a199386cc0a95ba9f02a2ba08f5ba146783acfc3c8eb0fb420e50c29bc70
-  data.tar.gz: b6d8e184fd3cd9709bfb3836613a38d43f0959d26f8c9f23316df31633870252
+  metadata.gz: ffb9cdf17ba3f47947a747bd8867ea9e7c47a98d458756ec947ee4423dc6b303
+  data.tar.gz: d3a34c0f04cdb456517403b16fa3055ceb5e78162a44570e05ed5da16163c6ea
 SHA512:
-  metadata.gz: 7edf0a562d388abfb02883976c40155d7c92aeb9563f06d16ee1fda8da0c63ad88094af034562a61fa0aa1ebf798842d04c8f357cc62eb64cd370ef94db8d1ca
-  data.tar.gz: 41e86886b6d865301f98b86d1aa95c8cb9ced5da5db42c3cd2bc35697242b9fb0f007e1bd1ee5a1531230a13a162c70e4371ed060abbd12aa53c03eb0b23dff7
+  metadata.gz: 4a2aa5ae8d17b38ad0e79e575b9852127886a93ceafa5003ed1fc36d0bfb28e5a51733059b0a4c68256acdf62f3f1fd95195e68cf1e2b8d050fd753b6230f1a4
+  data.tar.gz: 5bd29bd5368dc53408da0888cb11734a580041288132a0a73b1e93206849b527df5ee7bbb771734274be9d2927f098f9dea798bcdadd1c7d52ae2f909e52f1d7

data/README.adoc

@@ -35,8 +35,7 @@ The parameters are:
 `journaltemplate`:: template for rendering journals in article citations
 `extenttemplate`:: templates for rendering extents
 `sizetemplate`:: templates for rendering sizes
-`edition_number`:: override formatting of edition number
-`edition`:: override formatting of edition 
+`edition_ordinal`:: override formatting of edition with ordinal
 `date`:: default date format (from Twitter CLDR)
 
 == Configuration

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -8,8 +8,10 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal"]
-edition: "الطبعة؜ %؜"
+ordinal_keys: []
+OrdinalRules: digits-ordinal
+edition_ordinal: "الطبعة؜ %Ordinal"
+edition: الطبعة؜ ؜
 draft: "مشروع؜ %؜"
 editor:
   sg: محرر
@@ -28,4 +30,7 @@ size:
   volume:
     sg: "المجلد %"
     pl: "المجلدين %"
+inflection:
+  الطبعة؜:
+    gender: f
 

data/lib/isodoc-yaml/i18n-de.yaml

@@ -9,7 +9,9 @@ date:
   day_month_year: to_long_s
   date_time: to_long_s
 draft: "Entwurf %"
-edition: "% Aufl."
+edition_ordinal: "% Aufl."
+ordinal_keys: []
+edition: Auflage
 editor:
   sg: Hrsg.
   pl: Hrsg.
@@ -27,3 +29,7 @@ size:
   volume:
     sg: "% Bd."
     pl: "% Bde."
+inflection:
+  Auflage:
+    gender: f
+

data/lib/isodoc-yaml/i18n-en.yaml

@@ -8,8 +8,10 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal"]
-edition: "% edition"
+ordinal_keys: []
+OrdinalRules: digits-ordinal
+edition: edition
+edition_ordinal: "%Ordinal edition"
 draft: "draft %"
 editor:
   sg: ed.

data/lib/isodoc-yaml/i18n-es.yaml

@@ -8,8 +8,12 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal-feminine"]
-edition: "% ed."
+ordinal_keys: [gender]
+OrdinalRules: 
+  m: digits-ordinal-masculine
+  f: digits-ordinal-feminine
+edition_ordinal: "%Ordinal ed."
+edition: edición
 draft: "borrador %"
 editor:
   sg: ed.
@@ -28,3 +32,7 @@ size:
   volume:
     sg: "% vol."
     pl: "% vols."
+inflection:
+  edición:
+    gender: f
+

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -8,8 +8,14 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal-feminine"]
-edition: "% édition"
+ordinal_keys: [gender,number]
+OrdinalRules:
+  m.sg: digits-ordinal-masculine
+  f.sg: digits-ordinal-feminine
+  m.pl: digits-ordinal-masculine-plural
+  f.pl: digits-ordinal-feminine-plural
+edition_ordinal: "%Ordinal édition"
+edition: édition
 draft: "brouillon %"
 editor:
   sg: éd.
@@ -28,3 +34,7 @@ size:
   volume:
     sg: "% vol."
     pl: "% vol."
+inflection:
+  édition:
+    gender: f
+

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -8,8 +8,16 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["SpelloutRules", "spellout-ordinal-neuter"]
-edition: "% издание"
+ordinal_keys: [gender,number]
+SpelloutRules:
+  m.sg: spellout-ordinal-masculine
+  f.sg: spellout-ordinal-feminine
+  n.sg: spellout-ordinal-neuter
+  m.pl: spellout-ordinal-plural
+  f.pl: spellout-ordinal-plural
+  n.pl: spellout-ordinal-plural
+edition_ordinal: "%Spellout издание"
+edition: издание
 draft: "проект %"
 editor:
   sg: изд.
@@ -28,4 +36,7 @@ size:
   volume:
     sg: "% т."
     pl: "% тт."
+inflection:  
+  издание:
+    gender: n
 

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -8,8 +8,10 @@ date:
   month_year: yMMMM
   day_month_year: to_long_s
   date_time: to_long_s
-edition_number: ["OrdinalRules", "digits-ordinal"]
-edition: "第%版"
+ordinal_keys: []
+OrdinalRules: digits-ordinal
+edition_ordinal: "第%Ordinal版"
+edition: 版
 draft: "草案%"
 editor:
   sg: 编辑

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

@@ -98,10 +98,20 @@ module Relaton
       def editionformat(edn)
         return edn unless /^\d+$/.match?(edn)
 
-        num = edn
-        @r.edition_number and num = edn.to_i.localize(tw_cldr_lang)
-          .to_rbnf_s(*@r.edition_number)
-        @r.edition.sub(/%/, num)
+        num = edition_translate1(edn.to_i)
+        @r.edition_ordinal.sub(/%(Spellout|Ordinal)?/, num)
+      end
+
+      def edition_translate1(num)
+        ruleset = case @r.i18n.edition_ordinal
+                  when /%Spellout/ then "SpelloutRules"
+                  when /%Ordinal/ then "OrdinalRules"
+                  else "Digit"
+                  end
+        ruleset == "Digit" and return num.to_s
+        ed = HTMLEntities.new.decode(@r.i18n.edition)
+        @r.i18n.inflect_ordinal(num, @r.i18n.inflection&.dig(ed) || {},
+                                ruleset)
       end
 
       def draftformat(num, _hash)

data/lib/relaton/render/general/render.rb

@@ -10,7 +10,7 @@ module Relaton
     class General
       attr_reader :template, :journaltemplate, :seriestemplate, :nametemplate,
                   :extenttemplate, :sizetemplate, :lang, :script, :i18n,
-                  :edition, :edition_number, :date
+                  :edition, :edition_ordinal, :date
 
       def initialize(opt = {})
         options = read_config.merge(Utils::string_keys(opt))
@@ -53,7 +53,7 @@ module Relaton
         @lang = opt["language"]
         @script = opt["script"]
         @i18n = i18n_klass(opt["language"], opt["script"])
-        @edition_number = opt["edition_number"] || @i18n.edition_number
+        @edition_ordinal = opt["edition_ordinal"] || @i18n.edition_ordinal
         @edition = opt["edition"] || @i18n.edition
         @date = opt["date"] || @i18n.date
       end

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.3.3".freeze
+    VERSION = "0.3.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler