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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf356647bbf5280c9c9e4300c861917b428fc8d248db8a94b3c7b66916a0c01
-  data.tar.gz: 81bbe019e929ae84c4db8ca0808a10029c55dce0f61c94e072aa03c9d01127be
+  metadata.gz: 1765d54a70d5e79ba48d03c848135bad61bfb6f27e439cb142e869054e06b181
+  data.tar.gz: 9d8636b1838f06a8d119ad2052e7c7b7c47f81f6e9d176ca414fb76b1cbc0698
 SHA512:
-  metadata.gz: 61831187b3aba40f2e3701e00b0af1d89e25f219dc735cbb1d36877a0431c0e548776b39d1b90ee8606dfdb4968962a58f61c82f83ba734b9ba4756bb02cd11e
-  data.tar.gz: 640b3659f2bd48a9b6cfb46c063f8d4ed7ecfe15fef2c7961c208875b56a9c7514a0641edcad9e3f335ba7fab91581044d832b737944c9a8c7a9cd134d77cb23
+  metadata.gz: d4907031dd0d8e1180b3e25221000d58498d5bd18468bf743d372fc84ca79d878518f3b4c966d7faa7dfb3b36c4c5a61fef82d5c508295e3167dfb9cb722485a
+  data.tar.gz: 832213c7c17a9b58dee06a8953c75f30a41b23e568a3ff936cf32d4167a69b69eebe74d9bfbd31b0e7cd22ac3964da999aeb05f2bbd7e30b86473d656b458067

data/lib/relaton/render/general.rb

@@ -63,15 +63,25 @@ module Relaton
           end
           m[item.id] = {
             id: item.id, ord: i, formattedref: ref,
-            citation: {
-              full: ref,
-              default: item.docidentifier.first&.content.to_s,
-              short: @renderer.citation(item),
-            },
+            citation: citation_renderings(item, ref),
           }
         end
       end
 
+      # isodoc's styled citations consume these keys: the default is the
+      # authoritative identifier; the short cite is the style's citation,
+      # falling back to the reference rendering (the 1.x short-cite)
+      def citation_renderings(item, ref)
+        short = @renderer.citation(item)
+        short = ref if short.empty?
+
+        {
+          full: ref,
+          default: item.docidentifier.first&.content.to_s,
+          short: short,
+        }
+      end
+
       # isodoc's pref_ref_code_parse reads
       # data[:authoritative_identifier] to build biblio-tag identifiers
       # (presentation_function/docid.rb). Returns [data, self] as the

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

@@ -48,8 +48,12 @@ module Relaton
         end
 
         def org_name(contributor)
+          shown = ->(n) do
+            text = localized(n)
+            @style.scheme.name_form.org_upcase ? text.upcase : text
+          end
           name = Array(contributor.organization&.name)
-            .map { |n| localized(n).upcase }.join(", ")
+            .map(&shown).join(", ")
           abbrev = localized(contributor.organization&.abbreviation)
           return name if name.empty? || abbrev.empty?
 
@@ -76,26 +80,46 @@ 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
 
         def join_names(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
+
           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')} " \
+            "#{names[0..-2].join(', ')}#{oxford} " \
             "#{@i18n.label('and')} #{names.last}"
           end
         end
+
+        # Serial list style: the oxford comma appears at every gap of a
+        # name list, including between two names
+        def serial_list?
+          @style.scheme.name_form.list_style == "serial"
+        end
       end
     end
   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(" ")

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

@@ -9,14 +9,30 @@ module Relaton
         # organization contributors.
         class Production < Element
           def present?
-            !places.empty? || !publishers.empty?
+            !places.empty? || !publishers.empty? || no_place_declared?
           end
 
           def render
+            return no_place_production if places.empty? && no_place_declared?
+
             [places.join("; "), publishers.join("; ")]
               .reject(&:empty?).join(@i18n.punct_fetch("production_sep", ": "))
           end
 
+          # The no-place placeholder keeps the production separator even
+          # when no publisher follows ("n.p.: n.d.")
+          def no_place_production
+            label = @i18n.label("no_place")
+            return "" if label.empty? || label == "no_place"
+
+            pubs = publishers.join("; ")
+            pubs.empty? ? "#{label}:" : "#{label}: #{pubs}"
+          end
+
+          def no_place_declared?
+            @style.type_template_for(item_kind)&.no_place == true
+          end
+
           private
 
           def places

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

@@ -25,8 +25,11 @@ module Relaton
         def initialize(style: DEFAULT_STYLE, lang: "en", script: "Latn",
                        labels: {})
           @style = Style.load(style)
-          @i18n = I18n.load(lang).overlay!(@style.scheme.locale)
+          @i18n = I18n.load(lang)
           @i18n.overlay_hash!(labels) unless labels.empty?
+          # The style instance is the citation-style authority: its
+          # declared strings win over the caller's generic i18n hash
+          @i18n.overlay!(@style.scheme.locale)
           @script = script
         end
 
@@ -43,9 +46,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,31 @@ 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: ""
+          # Organization names take the inverted form's casing; small-cap
+          # styles keep the declared case
+          attribute :org_upcase, :boolean, default: -> { true }
+          # 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 "orgUpcase", to: :org_upcase
+            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/type_template.rb

@@ -13,6 +13,9 @@ module Relaton
           attribute :title, :string
           attribute :home, :boolean
           attribute :fallbacks, :hash, default: -> { {} }
+          # Render the style's no_place label when the publisher has no
+          # place (the book-family templates of some flavors)
+          attribute :no_place, :boolean
 
           key_value do
             map "type", to: :type
@@ -21,6 +24,7 @@ module Relaton
             map "title", to: :title
             map "home", to: :home
             map "fallbacks", to: :fallbacks
+            map "noPlace", to: :no_place
           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/iso690/template.rb

@@ -57,6 +57,9 @@ module Relaton
         end
 
         def terminate(body)
+          # An element ending in a colon carries its own separator: the
+          # following sentence period collapses (1.x punctuation cleanup)
+          body = body.gsub(/:\s*\.\s*/, ": ")
           return body if @terminator.strip.empty?
           return body if body.rstrip.end_with?(@terminator.strip)
 

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.7".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.7
 platform: ruby
 authors:
 - Ribose Inc.