relaton-render 3.0.0.pre.alpha.15 → 3.0.0.pre.alpha.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 130abe631c4e5e01c887a4d88f8a3e5e4abe827fe4da626e68e235469244ce57
-  data.tar.gz: 0c1d7af7c8d722dbbde937f0bd1a964e6f57839d4ca4a0247026475be0d89f3c
+  metadata.gz: 27e7e4b11e894ed7e6b848e0f4273dcb7db37ee2a32cc568b0b3b0b8424e2b1c
+  data.tar.gz: dd172b22c08947cf84fbb59d2526f4b95c6eb3db8a4c5a70ac16a403b64b67e5
 SHA512:
-  metadata.gz: b2860c94b466b5118b1d1d2aebdb13cb157e8233fbc7cb36d9a457e6b01fa6ba1f05cbd0915f9ddbfbd9d68a4c0d695a1c19e7f14248e54b5eb18d070f15cbff
-  data.tar.gz: 58b4bba53de91a41bf07170a1f58fa410d1e3f58b54f4eeed8f8f49b83a647be30342483e9ebeedfcd012383ae0d6d25077c492b8e699bca5705bab476ef8702
+  metadata.gz: a5b8e6ac52e30a6e4f2250272c6c0ff09adcb83c26f147947b8df761e76e9492f45c2c6d3a3e37c8764c217a14a4e40af679c910f8c97266135309bc2fb7ddc5
+  data.tar.gz: 87fe7ab71691b69d007e00c9d18bd55bf53680a93df98d77d8cc7d938e2603df26d6498a052c3fcbff3d599241dfd131a769ce284374a30e99e322717dc0ce80

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(
@@ -73,7 +75,9 @@ module Relaton
           def in_text
             principal = creators.first or return ""
             person = principal.person or return org_name(principal)
-            name = completename(person) || surname(person)&.upcase || ""
+            raw = surname(person).to_s
+            surname = name_form.surname_upcase ? raw.upcase : raw
+            name = completename(person) || surname || ""
             etal? ? "#{name} <em>et al.</em>" : name
           end
 
@@ -129,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/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],
-              )
+              # 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}" \

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.15".freeze
+    VERSION = "3.0.0.pre.alpha.17".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.15
+  version: 3.0.0.pre.alpha.17
 platform: ruby
 authors:
 - Ribose Inc.