relaton-render 3.0.0.pre.alpha.16 → 3.0.0.pre.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2995f665c72a516f48c64efc96d91f181fc66a124f651ece94a6292b73966137
-  data.tar.gz: f68d3c0d77a988f385224c61115b3781ae4cbcc07039032765926febdd183d35
+  metadata.gz: 366d6cbb3430291c42f1c8b836002276120a5f0f8abfc9d3d7a1591b9818d9b9
+  data.tar.gz: 3e785f025a4d72001ba9e496321c78826b8a689b21a71419f76d59c5ae596ec0
 SHA512:
-  metadata.gz: f43e71f852f568dd4ecaad1efe6218468a617f5ee95a432946d9d18ef46213f9c31b0a40422450c17dd99ebe22e5c033b64c90fd3c9476145864adc18e688e8c
-  data.tar.gz: bde9c9431fb2075badb1246797442f9c074764380be6d4f933fff4ea791aa119a047a1dc290feae291d26b3e553b66cf863bb8d0c202e2ac53cc86e4038a57c3
+  metadata.gz: 659c808e1247309ee2255bd7932aa55d0b43a95996812af583d454225066a5f0e12829b96765da631c370c6baebb9baf9be067655e87e3c9000a8b737b582859
+  data.tar.gz: d920c054fdaf325061155b411a5dc9834f8970c900e658b3d0b5d37d655e1ff8541cc360c3872f8fb8dcac26c6eb2de3428862817eaaba243a118f1ba80ae12a

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

@@ -17,7 +17,9 @@ module Relaton
           def render
             return plain_render if @short
 
-            joined = if creators.empty?
+            joined = if (truncated = truncated_creators)
+                       truncated
+                     elsif creators.empty?
                        fallback_name
                      elsif (form = @style.templates.creators) && !form.empty?
                        ::Relaton::Render::Iso690::Template.new(form).evaluate(
@@ -131,6 +133,22 @@ module Relaton
             end
           end
 
+          # The style's et-al truncation ("Aluffi, P., D. Anderson,
+          # M. Hering <em>et al.</em>"): at etalCount creators, the
+          # first etalDisplay names cite, comma-joined without the
+          # terminal and-join
+          def truncated_creators
+            count = name_form.etal_count
+            display = name_form.etal_display
+            return nil if count <= 0 || display <= 0 ||
+              creators.size < count
+
+            creators.first(display).each_with_index
+              .map do |contributor, index|
+              format(contributor, first: index.zero?)
+            end.join(", ") + " <em>et al.</em>"
+          end
+
           def format(contributor, first:)
             person = contributor.person or return org_name(contributor)
             name = completename_name(person, first: first) ||

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

@@ -52,7 +52,7 @@ module Relaton
           # back to the style-wide form
           def series_form
             variant = @style.per_type
-              .find { |t| t.type == Kinds.kind_for(@model.type) }
+              .find { |t| t.type == @style.kind_for(@model.type) }
             variant&.series || @style.templates.series
           end
         end

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

@@ -13,12 +13,12 @@ module Relaton
 
           def render
             text = main_title
-            return text if analytic?
+            return text if analytic? && @short
             if !@short &&
-               (form = @style.title_form_for(Kinds.kind_for(@model.type)))
-              text = ::Relaton::Render::Iso690::Template.new(form).evaluate(
-                "title" => Template::Field[!text.empty?, text],
-              )
+               (form = @style.title_form_for(@style.kind_for(@model.type)))
+              # the kind's own form carries the whole emphasis
+              return ::Relaton::Render::Iso690::Template.new(form)
+                .evaluate("title" => Template::Field[!text.empty?, text])
             end
 
             "#{@style.templates.title_open}#{text}" \
@@ -31,7 +31,7 @@ module Relaton
           # serial carries the emphasis
           def analytic?
             %w[component_part serial_part]
-              .include?(Kinds.kind_for(@model.type))
+              .include?(@style.kind_for(@model.type))
           end
 
           # A typed main title wins; an untyped title is main by

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

@@ -61,6 +61,9 @@ module Relaton
               fallback_warn(code)
               path = File.join(__dir__, "i18n", "en.yml")
               raise ArgumentError, "no i18n declarations for language #{code}" unless File.file?(path)
+              # The pack supplies the labels; the requested language still
+              # governs localization (bilingual titles select by it)
+              return from_yaml(File.read(path)).tap { |i| i.lang = code }
             end
 
             from_yaml(File.read(path))

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

@@ -75,6 +75,13 @@ module Relaton
           ""
         end
 
+        # The in-text creator with its et-al truncation: the
+        # author-date tag's author part
+        def in_text_author(model)
+          Elements.build(:creator, model, style: @style, i18n: @i18n,
+                         elements: @elements).in_text
+        end
+
         # The in-text author key (the principal creator's surname, as
         # the citation renders it): the batch disambiguation groups by
         # it

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

@@ -42,9 +42,10 @@ module Relaton
           # the name-date convention upcases
           attribute :subsequent_surname_upcase, :boolean,
                     default: -> { true }
-          # At this many creators the in-text cite truncates to the
-          # first surname with "et al." (0 disables)
+          # At this many creators the creator list truncates to the
+          # first etalDisplay names with "et al." (0 disables)
           attribute :etal_count, :integer, default: 0
+          attribute :etal_display, :integer, default: 0
           # Editor lists carry the role marker ("(Eds.)")
           attribute :editors_marked, :boolean, default: -> { true }
 
@@ -63,6 +64,7 @@ module Relaton
             map "initialsSeparator", to: :initials_separator
             map "subsequentSurnameUpcase", to: :subsequent_surname_upcase
             map "etalCount", to: :etal_count
+            map "etalDisplay", to: :etal_display
             map "editorsMarked", to: :editors_marked
           end
         end

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "3.0.0.pre.alpha.16".freeze
+    VERSION = "3.0.0.pre.alpha.18".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.16
+  version: 3.0.0.pre.alpha.18
 platform: ruby
 authors:
 - Ribose Inc.