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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e80ae8de229852d85ba4eabcd093152e140c9252f07c301fb6091c03694eac8
-  data.tar.gz: c378a86333710cabdcd00fd085a43e74a924c47e0b5df3d37eb830b56697ecf8
+  metadata.gz: 130abe631c4e5e01c887a4d88f8a3e5e4abe827fe4da626e68e235469244ce57
+  data.tar.gz: 0c1d7af7c8d722dbbde937f0bd1a964e6f57839d4ca4a0247026475be0d89f3c
 SHA512:
-  metadata.gz: 51b3ee0d7f8486e221ad0ea3fc0a69b8ae43a8f18056aa7357e77a362ea9c414c71ae724f241c8c12cc76ee29d34a906788a0b1abf82e1bf5a740d1c8dd5cada
-  data.tar.gz: 5d99388b322ae77613713554f9d6a0a7effb284a31267dda00427fbedf122a1c8d3abc990eceef6de27350b3394b6c710d433311bb025614c7c9db11adfb7e5d
+  metadata.gz: b2860c94b466b5118b1d1d2aebdb13cb157e8233fbc7cb36d9a457e6b01fa6ba1f05cbd0915f9ddbfbd9d68a4c0d695a1c19e7f14248e54b5eb18d070f15cbff
+  data.tar.gz: 58b4bba53de91a41bf07170a1f58fa410d1e3f58b54f4eeed8f8f49b83a647be30342483e9ebeedfcd012383ae0d6d25077c492b8e699bca5705bab476ef8702

data/lib/relaton/render/general.rb

@@ -55,9 +55,10 @@ module Relaton
       # presentation_function/refs.rb).
       def render_all(bib, type: "author-date")
         items = facade_bibitems(bib) or return nil
+        disambiguators = date_disambiguators(items)
         items.each_with_object({}).with_index do |(item, m), i|
           ref = begin
-            @renderer.render(item)
+            @renderer.render(item, disambiguator: disambiguators[item.id])
           rescue ::Relaton::Render::Unrenderable
             next
           end
@@ -82,6 +83,31 @@ module Relaton
       # render_all feeds the bibliography list: a reference not ending
       # in the biblio terminator takes one (the 1.x render1 behaviour;
       # single-item render stays verbatim)
+      # The batch disambiguation suffixes ("2022a"): items sharing a
+      # principal-creator surname and a date take alphabetical
+      # suffixes in bibliography order (the 1.x
+      # disambig_author_date_citations)
+      def date_disambiguators(items)
+        keys = items.filter_map do |item|
+          begin
+            [item.id, @renderer.author_key(item),
+             @renderer.citation(item)]
+          rescue ::Relaton::Render::Unrenderable
+            nil
+          end
+        end
+        groups = keys.group_by { |_, author, cite| [author, cite] }
+        suffixes = {}
+        groups.each_value do |group|
+          next if group.size < 2
+
+          group.each_with_index do |(id, _author, _cite), i|
+            suffixes[id] = ("a".ord + i).chr
+          end
+        end
+        suffixes
+      end
+
       # The bibliography terminator; flavors override to suppress it
       # (1.x use_terminator?), receiving the item it terminates
       def terminate_reference(ref, _item = nil)

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

@@ -59,18 +59,27 @@ module Relaton
           end
 
           def marked?
-            creators.size > 1 || name_form.lone_editor_marked
+            name_form.editors_marked &&
+              (creators.size > 1 || name_form.lone_editor_marked)
           end
 
           def role_word
             @i18n.label(creators.one? ? "ed" : "eds")
           end
 
-          # In-text (name-and-date) form: the principal creator only
+          # In-text (name-and-date) form: the principal creator only;
+          # at the style's et-al threshold the cite truncates
+          # ("Aluffi <em>et al.</em>")
           def in_text
             principal = creators.first or return ""
             person = principal.person or return org_name(principal)
-            completename(person) || surname(person)&.upcase || ""
+            name = completename(person) || surname(person)&.upcase || ""
+            etal? ? "#{name} <em>et al.</em>" : name
+          end
+
+          def etal?
+            count = name_form.etal_count
+            count.positive? && creators.size >= count
           end
 
           # The principal creator's given names, as the name form declares
@@ -141,7 +150,11 @@ module Relaton
             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(" ")
+              # the direct form initializes per the style's initials
+              # knob ("S. Payne" over "Sam Payne")
+              shown = name_form.subsequent_surname_upcase ? surname.upcase :
+                        surname
+              [person_given(person), shown].reject(&:empty?).join(" ")
             end
           end
 

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

@@ -62,7 +62,9 @@ module Relaton
             preferred = uris.find { |u| u.type == "citation" } ||
               uris.find { |u| u.type == "attachment" } ||
               uris.find { |u| u.type == "src" } || uris.first
-            preferred&.content.to_s
+            # the uri lands inside a markup attribute: escape it
+            require "cgi"
+            CGI.escapeHTML(preferred&.content.to_s)
           end
         end
       end

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

@@ -31,12 +31,21 @@ module Relaton
             table[key] = element_field(slot)
           end
           table["dategroup"] = dategroup_field
+          table["disambiguateddate"] = disambiguated_date_field(table["date"])
           unless table["dategroup"].present?
             table["dategroup"] = fallback_field(:dategroup)
           end
           table.merge(name_fields)
         end
 
+        # The date carrying the batch disambiguation suffix ("2022a"):
+        # identity when the caller passes none
+        def disambiguated_date_field(date)
+          return date if @disambiguator.empty? || !date.present?
+
+          Template::Field[true, "#{date.text}#{@disambiguator}"]
+        end
+
         def fallback_field(slot)
           fallback = @style.fallback_for(item_kind, slot)
           fallback ? Template::Field[true, fallback] :

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

@@ -34,11 +34,12 @@ module Relaton
           @script = script
         end
 
-        def render(model)
+        def render(model, disambiguator: nil)
           kind = @style.kind_for(model.type)
           template = @style.template_for(kind, home: home_docid?(model))
           out = Template.new(template).evaluate(
             Fields.new(model, style: @style, i18n: @i18n,
+                       disambiguator: disambiguator,
                        elements: @elements).to_h,
           )
           raise ::Relaton::Render::Unrenderable,
@@ -74,6 +75,14 @@ module Relaton
           ""
         end
 
+        # The in-text author key (the principal creator's surname, as
+        # the citation renders it): the batch disambiguation groups by
+        # it
+        def author_key(model)
+          Fields.new(model, style: @style, i18n: @i18n,
+                     elements: @elements).to_h["surname"].text
+        end
+
         # In-text form: SURNAME, year + disambiguator (name-and-date)
         def citation(model, disambiguator: nil)
           Template.new(@style.templates.citation).evaluate(

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

@@ -38,6 +38,15 @@ module Relaton
           attribute :surname_upcase, :boolean, default: -> { true }
           # Initials are a list; this separates them ("J. K." vs "J.K.")
           attribute :initials_separator, :string, default: " "
+          # The direct-order surname casing after the first creator:
+          # 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)
+          attribute :etal_count, :integer, default: 0
+          # Editor lists carry the role marker ("(Eds.)")
+          attribute :editors_marked, :boolean, default: -> { true }
 
           key_value do
             map "initials", to: :initials
@@ -52,6 +61,9 @@ module Relaton
             map "initialsPeriod", to: :initials_period
             map "surnameUpcase", to: :surname_upcase
             map "initialsSeparator", to: :initials_separator
+            map "subsequentSurnameUpcase", to: :subsequent_surname_upcase
+            map "etalCount", to: :etal_count
+            map "editorsMarked", to: :editors_marked
           end
         end
       end

data/lib/relaton/render/version.rb

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