relaton-render 3.0.0.pre.alpha.5 → 3.0.0.pre.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf356647bbf5280c9c9e4300c861917b428fc8d248db8a94b3c7b66916a0c01
-  data.tar.gz: 81bbe019e929ae84c4db8ca0808a10029c55dce0f61c94e072aa03c9d01127be
+  metadata.gz: 6e6e4911053aee3915882fcee48c182f8bf0d1ca2c879e7201bb0d19cfd48e4b
+  data.tar.gz: 60b845d08886130df02eaef46bfe5811996f208aaab13093fb660221f5f50799
 SHA512:
-  metadata.gz: 61831187b3aba40f2e3701e00b0af1d89e25f219dc735cbb1d36877a0431c0e548776b39d1b90ee8606dfdb4968962a58f61c82f83ba734b9ba4756bb02cd11e
-  data.tar.gz: 640b3659f2bd48a9b6cfb46c063f8d4ed7ecfe15fef2c7961c208875b56a9c7514a0641edcad9e3f335ba7fab91581044d832b737944c9a8c7a9cd134d77cb23
+  metadata.gz: 855419eacf8dc6f71a4c9eaef6b23341328bee50a1a59b0c2138d62420b3295d59176a83d3cac5c52a0c2cb989558ebced170badaf8732f04449fb5a5047cc6d
+  data.tar.gz: 38ace39e42d57252a8eb994cc4ec4a82ea56a5bd6476025db679b6b4a42c6c676b77908d6d076f06442e30768bb406104e284daed8e85dd73dfbb8f7c66aa7fc

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

@@ -76,12 +76,20 @@ module Relaton
 
             ""
           end.reject(&:empty?)
-          return localized(person.name&.formatted_initials) if parts.empty?
-          return parts.map { |p| "#{p[0]}." }.join(" ") if initials?
+          sep = @style.scheme.name_form.initials_separator.to_s
+          return reinitials(localized(person.name&.formatted_initials),
+                            sep) if parts.empty?
+          return parts.map { |p| "#{p[0]}." }.join(sep) if initials?
 
           parts.join(" ")
         end
 
+        # Declared initials are a list in string form; rejoin them with
+        # the style's separator
+        def reinitials(raw, sep)
+          raw.split(/\s+/).reject(&:empty?).join(sep)
+        end
+
         def initials?
           @style.scheme.name_form.initials
         end

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

@@ -69,7 +69,9 @@ module Relaton
 
             surname = person_surname(person)
             given = person_given(person)
-            if first
+            if @style.scheme.name_form.inverted_all
+              @style.render_name(surname: surname, given: given)
+            elsif first
               [surname, given].reject(&:empty?).join(", ")
             else
               [given, surname].reject(&:empty?).join(" ")

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

@@ -15,19 +15,26 @@ module Relaton
           end
 
           def render
+            joined = if (form = @style.templates.creators) && !form.empty?
+                       ::Relaton::Render::Iso690::Template.new(form).evaluate(
+                         "names" => Template::Field[true, join(names)],
+                       )
+                     else
+                       join(names)
+                     end
             case role_placement
             when "afterPeriod"
               # the in-slot trailing space separates the (eds.) marker
               # from the next element, which follows directly in the
               # template; a lone editor is unmarked
               if editors? && creators.size > 1
-                "#{period(join(names))} (#{role_word}) "
+                "#{period(joined)} (#{role_word}) "
               else
-                "#{period(join(names))} "
+                "#{period(joined)} "
               end
             else
               marker = editors? && creators.size > 1 ? " (#{role_word})" : ''
-              "#{join(names)}#{marker}"
+              "#{joined}#{marker}"
             end
           end
 
@@ -96,7 +103,7 @@ module Relaton
           def personal_name(person, first:)
             surname = surname(person).to_s
             given = given_names(person)
-            if first && !name_form.given_name_first
+            if (first || name_form.inverted_all) && !name_form.given_name_first
               @style.render_name(surname: surname, given: given)
             else
               [given, surname.upcase].reject(&:empty?).join(" ")
@@ -108,9 +115,21 @@ module Relaton
           end
 
           def join(names)
+            oxford = @i18n.label("oxford_comma")
+            if serial_list? && names.size > 1 && !oxford.empty?
+              return "#{names[0..-2].join(', ')}#{oxford} " \
+                "#{@i18n.label('and')} #{names.last}"
+            end
+
             join_names(names)
           end
 
+          # Serial list style: every gap takes the serial form, even
+          # between two names
+          def serial_list?
+            @style.scheme.name_form.list_style == "serial"
+          end
+
           def editors?
             !creators.empty? && creators.all? { |c| has_role?(c, "editor") }
           end

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

@@ -13,10 +13,17 @@ module Relaton
           end
 
           def render
-            [places.join("; "), publishers.join("; ")]
+            [place_text, publishers.join("; ")]
               .reject(&:empty?).join(@i18n.punct_fetch("production_sep", ": "))
           end
 
+          def place_text
+            return places.join("; ") unless places.empty?
+
+            label = @i18n.label("no_place")
+            label == "no_place" ? "" : label
+          end
+
           private
 
           def places

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

@@ -43,9 +43,10 @@ module Relaton
         end
 
         def home_docid?(model)
-          type = @style.scheme.home_docid_type
-          !type.nil? && !type.empty? &&
-            Array(model.docidentifier).any? { |d| d.type == type }
+          types = Array(@style.scheme.home_docid_type)
+          return false if types.empty?
+
+          Array(model.docidentifier).any? { |d| types.include?(d.type) }
         end
 
         # In-text form: SURNAME, year + disambiguator (name-and-date)

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

@@ -17,12 +17,27 @@ module Relaton
           # A completename is rendered, not decomposed; styles that
           # upcase inverted names may declare the completename treatment
           attribute :completename_upcase, :boolean, default: -> { false }
+          # Every personal name takes the inverted form (surname first),
+          # not just the principal creator
+          attribute :inverted_all, :boolean, default: -> { false }
+          # "serial": the oxford comma appears at every gap of the
+          # creator list, including between two names
+          attribute :list_style, :string, default: ""
+          # The inverted form's surname casing: the name-date convention
+          # upcases; small-cap styles keep the declared case
+          attribute :surname_upcase, :boolean, default: -> { true }
+          # Initials are a list; this separates them ("J. K." vs "J.K.")
+          attribute :initials_separator, :string, default: " "
 
           key_value do
             map "initials", to: :initials
             map "givenNameFirst", to: :given_name_first
             map "rolePlacement", to: :role_placement
             map "completenameUpcase", to: :completename_upcase
+            map "invertedAll", to: :inverted_all
+            map "listStyle", to: :list_style
+            map "surnameUpcase", to: :surname_upcase
+            map "initialsSeparator", to: :initials_separator
           end
         end
       end

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

@@ -10,7 +10,7 @@ module Relaton
           attribute :system, :string, default: "name-date"
           attribute :name_form, NameForm, default: -> { NameForm.new }
           attribute :locale, Locale, default: -> { Locale.new }
-          attribute :home_docid_type, :string
+          attribute :home_docid_type, :string, collection: true
 
           key_value do
             map "system", to: :system

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

@@ -15,6 +15,7 @@ module Relaton
           attribute :name, :string, default: "{{surname}}, {{givenNames}}"
           attribute :series, :string, default: ""
           attribute :uri, :string, default: ""
+          attribute :creators, :string, default: ""
 
           key_value do
             map "titleOpen", to: :title_open
@@ -24,6 +25,7 @@ module Relaton
             map "name", to: :name
           map "series", to: :series
           map "uri", to: :uri
+          map "creators", to: :creators
           end
         end
       end

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

@@ -69,8 +69,9 @@ module Relaton
         # First-creator name form: the style's declared name template with
         # the surname upcased, per the name-and-date convention.
         def render_name(surname:, given:)
+          shown = scheme.name_form.surname_upcase ? surname.upcase : surname
           Template.new(templates.name).evaluate(
-            "surname" => Template::Field[!surname.empty?, surname.upcase],
+            "surname" => Template::Field[!shown.empty?, shown],
             "givennames" => Template::Field[!given.empty?, given],
           )
         end

data/lib/relaton/render/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.5
+  version: 3.0.0.pre.alpha.6
 platform: ruby
 authors:
 - Ribose Inc.