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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d41488064d32008b3f44f81635f4bf8e096341adb5434eb270b440b9f7bfbe
-  data.tar.gz: 7b3b00fdadc97f66749d98f028684016a7d917977a3900c2d852a6127e4126f2
+  metadata.gz: 8cf356647bbf5280c9c9e4300c861917b428fc8d248db8a94b3c7b66916a0c01
+  data.tar.gz: 81bbe019e929ae84c4db8ca0808a10029c55dce0f61c94e072aa03c9d01127be
 SHA512:
-  metadata.gz: 1c73e86c124a5cb571305da9b9dc8ac0a35eeabadc89f2d9fa819ca95edd3bbe097356c4e5e4f2199542c94a0939338bfd3b04d6f1f3933708b266751b5b75c9
-  data.tar.gz: 539376d05813f377ca9d8fa36dff0c023e477daf4c7fb435b487a4e2da22bb98e185f65a1ff3a2e17b838e881028a8f7a3c7de1a27f7c5d7f5f616274f71c349
+  metadata.gz: 61831187b3aba40f2e3701e00b0af1d89e25f219dc735cbb1d36877a0431c0e548776b39d1b90ee8606dfdb4968962a58f61c82f83ba734b9ba4756bb02cd11e
+  data.tar.gz: 640b3659f2bd48a9b6cfb46c063f8d4ed7ecfe15fef2c7961c208875b56a9c7514a0641edcad9e3f335ba7fab91581044d832b737944c9a8c7a9cd134d77cb23

data/lib/relaton/render/general.rb

@@ -56,7 +56,11 @@ module Relaton
       def render_all(bib, type: "author-date")
         items = facade_bibitems(bib) or return nil
         items.each_with_object({}).with_index do |(item, m), i|
-          ref = @renderer.render(item)
+          ref = begin
+            @renderer.render(item)
+          rescue ::Relaton::Render::Unrenderable
+            next
+          end
           m[item.id] = {
             id: item.id, ord: i, formattedref: ref,
             citation: {

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

@@ -8,10 +8,11 @@ module Relaton
       # predicate, #render the element's formatting method. Punctuation
       # between elements belongs to the kind/style, not the element.
       class Element
-        def initialize(model, style:, i18n:)
+        def initialize(model, style:, i18n:, kind: nil)
           @model = model
           @style = style
           @i18n = i18n
+          @kind = kind
         end
 
         def present?
@@ -28,6 +29,14 @@ module Relaton
           value&.content.to_s
         end
 
+        # Localizable values scoped to the render language: the variants
+        # declared in that language, or all of them when none matches
+        def titles_in_lang(values)
+          titles = Array(values)
+          in_lang = titles.select { |t| Array(t.language).include?(@i18n.lang) }
+          in_lang.empty? ? titles : in_lang
+        end
+
         def contributors(role)
           Array(@model.contributor).select { |c| has_role?(c, role) }
         end
@@ -37,6 +46,56 @@ module Relaton
             r.is_a?(String) ? r == role : r.type == role
           end
         end
+
+        def org_name(contributor)
+          name = Array(contributor.organization&.name)
+            .map { |n| localized(n).upcase }.join(", ")
+          abbrev = localized(contributor.organization&.abbreviation)
+          return name if name.empty? || abbrev.empty?
+
+          "#{name} (#{abbrev})"
+        end
+
+        def item_kind
+          @kind || Kinds.kind_for(@model.type)
+        end
+
+        def person_completename(person)
+          localized(person.name&.completename)
+        end
+
+        def person_surname(person)
+          localized(person.name&.surname)
+        end
+
+        def person_given(person)
+          parts = Array(person.name&.forename).map do |f|
+            content = localized(f)
+            next content unless content.empty?
+            next "#{f.initial}." if f.initial.to_s.length == 1
+
+            ""
+          end.reject(&:empty?)
+          return localized(person.name&.formatted_initials) if parts.empty?
+          return parts.map { |p| "#{p[0]}." }.join(" ") if initials?
+
+          parts.join(" ")
+        end
+
+        def initials?
+          @style.scheme.name_form.initials
+        end
+
+        def join_names(names)
+          case names.size
+          when 0 then ""
+          when 1 then names.first
+          when 2 then names.join(" #{@i18n.label('and')} ")
+          else
+            "#{names[0..-2].join(', ')}#{@i18n.label('oxford_comma')} " \
+            "#{@i18n.label('and')} #{names.last}"
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "date"
+
+module Relaton
+  module Render
+    module Iso690
+      module Elements
+        # Date of access (ISO 690 clause 7.12): "[viewed: September 3,
+        # 2019]" for online resources consulted.
+        class Access < Element
+          def present?
+            !date_text.empty?
+          end
+
+          def render
+            "[#{@i18n.label('viewed')}: #{date_text}]"
+          end
+
+          private
+
+          def date_text
+            d = Array(@model.date).find { |x| x.type == "accessed" } or return ""
+            value = (d.at || d.from || d.to).to_s
+            parts = value.split("-")
+            case parts.size
+            when 3
+              date = ::Date.parse(value)
+              "#{month(date.month)} #{date.day}, #{date.year}"
+            when 2
+              "#{month(parts[1].to_i)} #{parts[0]}"
+            else
+              value
+            end
+          end
+
+          def month(num)
+            @i18n.label("month_#{num}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,44 +4,91 @@ module Relaton
   module Render
     module Iso690
       module Elements
-        # Component part within a host (ISO 690 clause 7.4): "In: host
-        # title, edition of host". Host data comes from the typed
-        # partOf relation.
+        # Component part within a host (ISO 690 clause 7.4): host title
+        # (emphasised), host editors, host edition, host place and
+        # publisher. Host data comes from the typed partOf/includedIn
+        # relation.
         class ComponentPart < Element
+          HOST_RELATION_TYPES = %w[partOf includedIn].freeze
+
           def present?
-            !host_title.empty?
+            !host_title_text.empty?
           end
 
           def render
-            "#{@i18n.label('in')} " \
-              "#{@style.templates.title_open}#{host_title}" \
-              "#{@style.templates.title_close}" \
-              "#{host_edition}"
+            "#{lead}#{host_title}#{host_editors}#{host_edition}" \
+              "#{host_production}"
           end
 
           private
 
+          def lead
+            label = @i18n.label("in")
+            label.empty? ? "" : "#{label} "
+          end
+
           def relation
-            Array(@model.relation).find { |r| r.type == "partOf" }
+            Array(@model.relation).find do |r|
+              HOST_RELATION_TYPES.include?(r.type)
+            end
           end
 
           def host
             relation&.bibitem
           end
 
-          def host_title
+          def host_title_text
             return localized(relation&.description) if host.nil?
 
-            Array(host.title).map { |t| localized(t) }.join(" ").strip
+            titles_in_lang(host.title).map { |t| localized(t) }
+              .join(" ").strip
+          end
+
+          def host_title
+            return "" if host_title_text.empty?
+
+            "#{@style.templates.title_open}#{host_title_text}" \
+              "#{@style.templates.title_close}"
+          end
+
+          def host_editors
+            eds = Array(host&.contributor).select { |c| has_role?(c, "editor") }
+            names = eds.each_with_index
+              .map { |c, i| host_person_name(c, first: i.zero?) }
+              .reject(&:empty?)
+            return "" if names.empty?
+
+            " (#{@i18n.label(eds.one? ? 'ed' : 'eds')} #{join_names(names)})"
+          end
+
+          # ISO 690 clause 7.2 host editors: the first name inverted
+          # (surname, initials), subsequent names in direct order, all in
+          # mixed case
+          def host_person_name(contributor, first:)
+            person = contributor.person or return ""
+
+            surname = person_surname(person)
+            given = person_given(person)
+            if first
+              [surname, given].reject(&:empty?).join(", ")
+            else
+              [given, surname].reject(&:empty?).join(" ")
+            end
           end
 
           def host_edition
             return "" if host.nil?
 
-            edition = Edition.new(host, style: @style, i18n: @i18n)
-            return "" unless edition.present?
+            edition = Edition.new(host, style: @style, i18n: @i18n,
+                                  kind: item_kind)
+            edition.present? ? ". #{edition.render}" : ""
+          end
+
+          def host_production
+            return "" if host.nil?
 
-            ". #{edition.render}"
+            production = Production.new(host, style: @style, i18n: @i18n)
+            production.present? ? ". #{production.render}" : ""
           end
         end
       end

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

@@ -15,7 +15,32 @@ module Relaton
           end
 
           def render
-            "#{join(names)}#{role_suffix}"
+            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}) "
+              else
+                "#{period(join(names))} "
+              end
+            else
+              marker = editors? && creators.size > 1 ? " (#{role_word})" : ''
+              "#{join(names)}#{marker}"
+            end
+          end
+
+          def role_placement
+            @style.scheme.name_form.role_placement || "glue"
+          end
+
+          def period(text)
+            text.end_with?(".") ? text : "#{text}."
+          end
+
+          def role_word
+            @i18n.label(creators.one? ? "ed" : "eds")
           end
 
           # In-text (name-and-date) form: the principal creator only
@@ -55,11 +80,19 @@ module Relaton
 
           def format(contributor, first:)
             person = contributor.person or return org_name(contributor)
-            name = completename(person) ||
+            name = completename_name(person, first: first) ||
               personal_name(person, first: first)
             name.empty? ? org_name(contributor) : name
           end
 
+          def completename_name(person, first:)
+            complete = completename(person) or return nil
+            return complete unless name_form.completename_upcase
+
+            first ? @style.render_name(surname: complete, given: "") :
+              complete.upcase
+          end
+
           def personal_name(person, first:)
             surname = surname(person).to_s
             given = given_names(person)
@@ -75,21 +108,7 @@ module Relaton
           end
 
           def join(names)
-            case names.size
-            when 0 then ""
-            when 1 then names.first
-            when 2 then names.join(" #{@i18n.label('and')} ")
-            else
-              "#{names[0..-2].join(', ')}#{@i18n.label('oxford_comma')} " \
-              "#{@i18n.label('and')} #{names.last}"
-            end
-          end
-
-          def role_suffix
-            return "" unless editors?
-
-            suffix = creators.one? ? @i18n.label("ed") : @i18n.label("eds")
-            " (#{suffix})"
+            join_names(names)
           end
 
           def editors?
@@ -97,30 +116,21 @@ module Relaton
           end
 
           def completename(person)
-            value = localized(person.name&.completename)
+            value = person_completename(person)
             value.empty? ? nil : value
           end
 
           def surname(person)
-            value = localized(person.name&.surname)
+            value = person_surname(person)
             value.empty? ? nil : value
           end
 
           def given_names(person)
-            names = Array(person.name&.forename).map { |f| localized(f) }
-              .reject(&:empty?)
-            return names.map { |n| "#{n[0]}." }.join(" ") if name_form.initials
-
-            names.join(" ")
+            person_given(person)
           end
 
           def org_name(contributor)
-            name = Array(contributor.organization&.name)
-              .map { |n| localized(n).upcase }.join(", ")
-            abbrev = localized(contributor.organization&.abbreviation)
-            return name if name.empty? || abbrev.empty?
-
-            "#{name} (#{abbrev})"
+            super
           end
         end
       end

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

@@ -8,17 +8,33 @@ module Relaton
         # edition through Edition#number (falling back to its content).
         class Edition < Element
           def present?
-            !number.zero?
+            !raw.to_s.empty?
           end
 
           def render
+            return "#{@i18n.label('version')} #{raw}" unless word_edition?
+
+            word = @i18n.label("edition_#{number}")
+            return word unless word == "edition_#{number}"
+
             "#{ordinalize(number)} #{@i18n.label('edition')}"
           end
 
           private
 
+          # Worded editions are document editions; online resources
+          # carry numbered builds rendered as versions
+          def word_edition?
+            number.positive? &&
+              %w[monograph component_part serial_part]
+                .include?(item_kind)
+          end
+
+          def raw
+            (@model.edition&.number || @model.edition&.content).to_s
+          end
+
           def number
-            raw = @model.edition&.number || @model.edition&.content
             Integer(raw)
           rescue ArgumentError, TypeError
             0

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Relaton
+  module Render
+    module Iso690
+      module Elements
+        # Extent of the item (ISO 690 clause 7.11): page localities.
+        class Extent < Element
+          def present?
+            !render.empty?
+          end
+
+          def render
+            groups = [numeration, page_range].reject { |g| g.empty? }
+            groups.join(", ")
+          end
+
+          private
+
+          def numeration
+            %w[volume issue].filter_map do |type|
+              loc = localities.find { |l| l.type == type }
+              next if loc.nil? || loc.reference_from.to_s.empty?
+
+              "#{@i18n.label(type)} #{loc.reference_from}"
+            end.join(" ")
+          end
+
+          def page_range
+            loc = localities.find { |l| l.type == "page" } or return ""
+            from = loc.reference_from.to_s
+            to = loc.reference_to.to_s
+            if to.empty? || to == from
+              "#{@i18n.label('page')} #{from}"
+            else
+              "#{@i18n.label('pages')} " \
+                "#{from}#{@i18n.label('date_range')}#{to}"
+            end
+          end
+
+          def localities
+            Array(@model.extent).flat_map do |e|
+              Array(e.locality) +
+                Array(e.locality_stack).flat_map { |s| Array(s.locality) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,13 +12,28 @@ module Relaton
           end
 
           def render
-            "#{@i18n.label('available_from')} #{uri}"
+            text = if (form = @style.templates.uri) && !form.empty?
+                     ::Relaton::Render::Iso690::Template.new(form).evaluate(
+                       "uri" => Template::Field[!uri.empty?, uri],
+                     )
+                   else
+                     uri
+                   end
+
+            "#{@i18n.label('available_from')} #{text}".strip
           end
 
           private
 
           def uri
-            Array(@model.accesslocation).reject(&:empty?).first.to_s
+            from_accesslocation =
+              Array(@model.accesslocation).map(&:to_s).reject(&:empty?)
+            unless from_accesslocation.empty?
+              return from_accesslocation.first.to_s
+            end
+
+            Array(@model.source).map { |u| u.content.to_s }
+              .reject(&:empty?).first.to_s
           end
         end
       end

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

@@ -12,13 +12,18 @@ module Relaton
           end
 
           def render
-            "[#{medium}]"
+            medium
           end
 
           private
 
           def medium
-            localized(@model.medium)
+            genre = @model.medium&.genre.to_s
+            return genre.sub(/^\w/) { |c| c.upcase } unless genre.empty?
+
+            key = "medium_#{@model.type}"
+            label = @i18n.label(key)
+            label == key ? "" : label
           end
         end
       end

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

@@ -20,8 +20,16 @@ module Relaton
           private
 
           def places
-            Array(@model.place).map { |p| p.city.to_s }
-              .reject { |c| c.strip.empty? }
+            Array(@model.place).map do |p|
+              structured = [p.city.to_s, p.region.map(&:content),
+                            p.country.map(&:content)]
+                .flatten.reject { |c| c.strip.empty? }
+              if structured.empty? && !p.formatted_place.to_s.empty?
+                next p.formatted_place.to_s
+              end
+
+              structured.join(", ")
+            end.reject(&:empty?)
           end
 
           def publishers

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

@@ -21,7 +21,8 @@ module Relaton
 
           def publication_date
             Array(@model.date).find(&:published) ||
-              Array(@model.date).find { |d| d.type.nil? }
+              Array(@model.date).find { |d| d.type.nil? } ||
+              Array(@model.date).find { |d| d.type == "created" }
           end
 
           def publication_date_value

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

@@ -11,6 +11,15 @@ module Relaton
           end
 
           def render
+            if (form = series_form) && !form.empty?
+              return ::Relaton::Render::Iso690::Template.new(form).evaluate(
+                "seriestitle" => Template::Field[!series_title.empty?,
+                                                 series_title],
+                "seriesnumber" => Template::Field[!number.empty?, number],
+                "seriesrun" => Template::Field[!run.empty?, run],
+              )
+            end
+
             base = "#{@style.templates.title_open}#{series_title}" \
                    "#{@style.templates.title_close}"
             if number.empty?
@@ -27,12 +36,25 @@ module Relaton
           end
 
           def series_title
-            Array(series&.title).map { |t| localized(t) }.join(" ").strip
+            titles_in_lang(series&.title).map { |t| localized(t) }
+              .join(" ").strip
           end
 
           def number
             series&.number.to_s
           end
+
+          def run
+            series&.run.to_s
+          end
+
+          # The style's series form for this item's resource kind, falling
+          # back to the style-wide form
+          def series_form
+            variant = @style.per_type
+              .find { |t| t.type == Kinds.kind_for(@model.type) }
+            variant&.series || @style.templates.series
+          end
         end
       end
     end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Relaton
+  module Render
+    module Iso690
+      module Elements
+        # Physical size (ISO 690 clause 7.5, area): the model's typed
+        # values render as "N unit" through the language pack; untyped
+        # values pass through as written.
+        class Size < Element
+          def present?
+            !values.empty?
+          end
+
+          def render
+            values.map { |v| render_value(v) }.join(", ")
+          end
+
+          private
+
+          def values
+            Array(@model.size&.value)
+          end
+
+          def render_value(value)
+            content = value.is_a?(String) ? value : value.content.to_s
+            return content if content.empty? || value.is_a?(String)
+
+            type = value.is_a?(Hash) ? value[:type] : value.type
+            unit = type && @i18n.label("size_#{type}")
+            unit.nil? || unit == "size_#{type}" ? content : "#{content} #{unit}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Relaton
+  module Render
+    module Iso690
+      module Elements
+        # Issuing body or status of a standard (ISO 690 clause 8.9): the
+        # publisher or authorizer organization, falling back to the
+        # capitalized status stage.
+        class Stddoc < Element
+          def present?
+            !body.empty?
+          end
+
+          def render
+            body
+          end
+
+          private
+
+          def body
+            orgs = %w[publisher authorizer].flat_map { |role|
+              contributors(role).map { |c| org_plain(c) }
+            }.reject(&:empty?)
+            return orgs.join("; ") unless orgs.empty?
+
+            stage = @model.status&.stage&.content.to_s
+            stage.empty? ? "" : stage.sub(/^\w/) { |c| c.upcase }
+          end
+
+          # Issuing bodies render in mixed case, unlike creator organs
+          def org_plain(contributor)
+            Array(contributor.organization&.name)
+              .map { |n| localized(n) }.join(", ")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,16 +12,35 @@ module Relaton
           end
 
           def render
-            "#{@style.templates.title_open}#{main_title}" \
+            text = main_title
+            return text if analytic?
+            if (form = @style.title_form_for(Kinds.kind_for(@model.type)))
+              text = ::Relaton::Render::Iso690::Template.new(form).evaluate(
+                "title" => Template::Field[!text.empty?, text],
+              )
+            end
+
+            "#{@style.templates.title_open}#{text}" \
               "#{@style.templates.title_close}"
           end
 
           private
 
+          # ISO 690: analytic titles are not emphasised; the host or
+          # serial carries the emphasis
+          def analytic?
+            %w[component_part serial_part]
+              .include?(Kinds.kind_for(@model.type))
+          end
+
+          # A typed main title wins; an untyped title is main by
+          # default, but yields to a typed one
           def main_title
-            t = Array(@model.title).find { |x| (x.type || "main") == "main" } ||
-              Array(@model.title).first
-            localized(t)
+            titles = Array(@model.title)
+            mains = titles.select { |x| x.type == "main" }
+            mains = titles.select { |x| x.type.nil? } if mains.empty?
+            mains = titles if mains.empty?
+            localized(titles_in_lang(mains).first)
           end
         end
       end

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

@@ -16,6 +16,10 @@ module Relaton
         autoload :Location, "relaton/render/iso690/elements/location"
         autoload :Numeration, "relaton/render/iso690/elements/numeration"
         autoload :ComponentPart, "relaton/render/iso690/elements/component_part"
+        autoload :Size, "relaton/render/iso690/elements/size"
+        autoload :Extent, "relaton/render/iso690/elements/extent"
+        autoload :Access, "relaton/render/iso690/elements/access"
+        autoload :Stddoc, "relaton/render/iso690/elements/stddoc"
 
         CLASSES = {
           creator: Creator,
@@ -29,6 +33,10 @@ module Relaton
           location: Location,
           numeration: Numeration,
           component_part: ComponentPart,
+          size: Size,
+          extent: Extent,
+          access: Access,
+          stddoc: Stddoc,
         }.freeze
 
         def self.build(name, model, style:, i18n:)

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

@@ -10,7 +10,8 @@ module Relaton
       class Fields
         ELEMENT_SLOTS = %i[
           creator title edition medium series production
-          date numeration component_part identifier location
+          date numeration component_part identifier location size
+          extent access stddoc
         ].freeze
 
         def initialize(model, style:, i18n:, disambiguator: nil)
@@ -34,7 +35,18 @@ module Relaton
         def element_field(slot)
           element = Elements.build(slot, @model, style: @style, i18n: @i18n)
           text = element.render.to_s
-          Template::Field[element.present? && !text.empty?, text]
+          if element.present? && !text.empty?
+            return Template::Field[true, text]
+          end
+
+          fallback = @style.fallback_for(item_kind, slot)
+          return Template::Field[true, fallback] if fallback
+
+          Template::Field[false, ""]
+        end
+
+        def item_kind
+          Kinds.kind_for(@model.type)
         end
 
         def name_fields

data/lib/relaton/render/iso690/i18n/en.yml

@@ -1,6 +1,28 @@
 lang: en
 labels:
   edition: "ed"
+  size_volume: "vol."
+  size_page: "pp."
+  page: "p."
+  pages: "pp."
+  volume: "vol."
+  issue: "no."
+  version: "Version"
+  medium_website: "[website]"
+  viewed: "viewed"
+  month_1: "January"
+  month_2: "February"
+  month_3: "March"
+  month_4: "April"
+  month_5: "May"
+  month_6: "June"
+  month_7: "July"
+  month_8: "August"
+  month_9: "September"
+  month_10: "October"
+  month_11: "November"
+  month_12: "December"
+
   series_no: "no."
   report_no: "Report no."
   available_from: "Available from:"

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

@@ -16,15 +16,19 @@ module Relaton
           "MRN" => ->(content) { content },
         }.freeze
 
+        # Flavor-registered kinds, consulted before the built-ins; the
+        # registry is process-wide by design
+        OVERRIDES = {}
+
         class << self
           def register(type, kind)
-            KINDS[type] = kind
+            OVERRIDES[type] = kind
             kind
           end
 
           def render(docidentifier)
             content = docidentifier.content.to_s
-            kind = KINDS[docidentifier.type]
+            kind = OVERRIDES[docidentifier.type] || KINDS[docidentifier.type]
             kind ? kind.call(content) : content
           end
         end

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

@@ -26,8 +26,12 @@ module Relaton
           "inbook" => "component_part",
           "incollection" => "component_part",
           "inproceedings" => "component_part",
-          "website" => "online",
-          "webresource" => "online",
+          "article" => "serial_part",
+          "software" => "online",
+          "unpublished" => "online",
+          "dataset" => "online",
+          "website" => "webdoc",
+          "webresource" => "webdoc",
           "webpage" => "online",
           "online" => "online",
         }.freeze

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

@@ -8,8 +8,6 @@ module Relaton
       # the template evaluator to the field resolver. No XML, no
       # intermediate hashes.
       class Renderer
-        class Unrenderable < StandardError; end
-
         DEFAULT_STYLE = "author-date"
 
         class << self
@@ -33,14 +31,23 @@ module Relaton
         end
 
         def render(model)
-          out = Template.new(@style.template_for(Kinds.kind_for(model.type))).evaluate(
+          kind = Kinds.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).to_h,
           )
-          raise Unrenderable, "no renderable elements" if out.strip.empty?
+          raise ::Relaton::Render::Unrenderable,
+                "no renderable elements" if out.strip.empty?
 
           out
         end
 
+        def home_docid?(model)
+          type = @style.scheme.home_docid_type
+          !type.nil? && !type.empty? &&
+            Array(model.docidentifier).any? { |d| d.type == type }
+        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/locale.rb

@@ -14,6 +14,9 @@ module Relaton
           attribute :in_str, :string
           attribute :at, :string
           attribute :available_at, :string
+          # Arbitrary label overrides (edition words, join punctuation,
+          # size units): merged over the language pack verbatim.
+          attribute :labels, :hash, default: -> { {} }
 
           key_value do
             map "and", to: :conj
@@ -23,6 +26,7 @@ module Relaton
             map "in", to: :in_str
             map "at", to: :at
             map "availableAt", to: :available_at
+            map "labels", to: :labels
           end
 
           LABEL_FOR = {
@@ -32,10 +36,11 @@ module Relaton
           }.freeze
 
           def label_map
-            LABEL_FOR.filter_map do |attr, label|
+            base = LABEL_FOR.filter_map do |attr, label|
               value = public_send(attr)
               [label, value] unless value.nil?
             end.to_h
+            base.merge(labels || {})
           end
         end
       end

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

@@ -9,10 +9,20 @@ module Relaton
         class NameForm < Lutaml::Model::Serializable
           attribute :initials, :boolean, default: -> { false }
           attribute :given_name_first, :boolean, default: -> { false }
+          # Where an all-editor creator list's role marker sits relative
+          # to the name's terminating period: "glue" renders
+          # "NAME (eds.)." (the name-date default), "afterPeriod"
+          # renders "NAME. (eds.)" (ISO 690 clause-flavour).
+          attribute :role_placement, :string, default: "glue"
+          # A completename is rendered, not decomposed; styles that
+          # upcase inverted names may declare the completename treatment
+          attribute :completename_upcase, :boolean, default: -> { false }
 
           key_value do
             map "initials", to: :initials
             map "givenNameFirst", to: :given_name_first
+            map "rolePlacement", to: :role_placement
+            map "completenameUpcase", to: :completename_upcase
           end
         end
       end

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

@@ -10,11 +10,13 @@ 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
 
           key_value do
             map "system", to: :system
             map "nameForm", to: :name_form
             map "locale", to: :locale
+            map "homeDocidType", to: :home_docid_type
           end
         end
       end

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

@@ -13,6 +13,8 @@ module Relaton
           attribute :citation, :string, default: "{{surname}}, {{date}}"
           attribute :reference, :string
           attribute :name, :string, default: "{{surname}}, {{givenNames}}"
+          attribute :series, :string, default: ""
+          attribute :uri, :string, default: ""
 
           key_value do
             map "titleOpen", to: :title_open
@@ -20,6 +22,8 @@ module Relaton
             map "citation", to: :citation
             map "reference", to: :reference
             map "name", to: :name
+          map "series", to: :series
+          map "uri", to: :uri
           end
         end
       end

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

@@ -9,10 +9,18 @@ module Relaton
         class TypeTemplate < Lutaml::Model::Serializable
           attribute :type, :string
           attribute :template, :string
+          attribute :series, :string
+          attribute :title, :string
+          attribute :home, :boolean
+          attribute :fallbacks, :hash, default: -> { {} }
 
           key_value do
             map "type", to: :type
             map "template", to: :template
+            map "series", to: :series
+            map "title", to: :title
+            map "home", to: :home
+            map "fallbacks", to: :fallbacks
           end
         end
       end

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

@@ -41,10 +41,29 @@ module Relaton
         end
 
         # Per-type template selection is a data lookup; unmatched types
-        # fall back to the general reference template.
-        def template_for(type)
-          per_type.find { |t| t.type == type.to_s }&.template ||
-            templates.reference
+        # fall back to the general reference template. When a kind has
+        # home-flagged variants, the split is resolved by whether the item
+        # carries the scheme's home document identifier.
+        def template_for(type, home: nil)
+          candidates = per_type.select { |t| t.type == type.to_s }
+          if candidates.size > 1 && !home.nil?
+            candidates = candidates.select { |t| (t.home || false) == home }
+          end
+          candidates.first&.template || templates.reference
+        end
+
+        def type_template_for(type)
+          per_type.find { |t| t.type == type.to_s }
+        end
+
+        # The absent-slot replacement text declared for a type, when any
+        def fallback_for(type, slot)
+          type_template_for(type)&.fallbacks&.[](slot.to_s)
+        end
+
+        def title_form_for(type)
+          per_type.lazy.select { |t| t.type == type.to_s }
+            .find { |t| t.title && !t.title.empty? }&.title
         end
 
         # First-creator name form: the style's declared name template with

data/lib/relaton/render/version.rb

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

data/lib/relaton-render.rb

@@ -5,6 +5,10 @@ require "relaton/render/iso690"
 
 module Relaton
   module Render
+    # A bibliographic item whose style template resolves to nothing: the
+    # single-item API raises, the batch API skips
+    class Unrenderable < StandardError; end
+
     # Deprecated 1.x engine leaves, restored so flavor gems that still
     # subclass them load against this line. Superseded by the Iso690
     # engine; removed when the flavors have migrated to CitationStyle

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.3
+  version: 3.0.0.pre.alpha.5
 platform: ruby
 authors:
 - Ribose Inc.
@@ -120,9 +120,11 @@ files:
 - lib/relaton/render/iso690.rb
 - lib/relaton/render/iso690/element.rb
 - lib/relaton/render/iso690/elements.rb
+- lib/relaton/render/iso690/elements/access.rb
 - lib/relaton/render/iso690/elements/component_part.rb
 - lib/relaton/render/iso690/elements/creator.rb
 - lib/relaton/render/iso690/elements/edition.rb
+- lib/relaton/render/iso690/elements/extent.rb
 - lib/relaton/render/iso690/elements/identifier.rb
 - lib/relaton/render/iso690/elements/location.rb
 - lib/relaton/render/iso690/elements/medium.rb
@@ -130,6 +132,8 @@ files:
 - lib/relaton/render/iso690/elements/production.rb
 - lib/relaton/render/iso690/elements/pub_date.rb
 - lib/relaton/render/iso690/elements/series.rb
+- lib/relaton/render/iso690/elements/size.rb
+- lib/relaton/render/iso690/elements/stddoc.rb
 - lib/relaton/render/iso690/elements/title.rb
 - lib/relaton/render/iso690/fields.rb
 - lib/relaton/render/iso690/i18n.rb