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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6e4911053aee3915882fcee48c182f8bf0d1ca2c879e7201bb0d19cfd48e4b
-  data.tar.gz: 60b845d08886130df02eaef46bfe5811996f208aaab13093fb660221f5f50799
+  metadata.gz: 1765d54a70d5e79ba48d03c848135bad61bfb6f27e439cb142e869054e06b181
+  data.tar.gz: 9d8636b1838f06a8d119ad2052e7c7b7c47f81f6e9d176ca414fb76b1cbc0698
 SHA512:
-  metadata.gz: 855419eacf8dc6f71a4c9eaef6b23341328bee50a1a59b0c2138d62420b3295d59176a83d3cac5c52a0c2cb989558ebced170badaf8732f04449fb5a5047cc6d
-  data.tar.gz: 38ace39e42d57252a8eb994cc4ec4a82ea56a5bd6476025db679b6b4a42c6c676b77908d6d076f06442e30768bb406104e284daed8e85dd73dfbb8f7c66aa7fc
+  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?
 
@@ -95,15 +99,27 @@ module Relaton
         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/creator.rb

@@ -115,21 +115,9 @@ module Relaton
           end
 
           def join(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
-
             join_names(names)
           end
 
-          # Serial list style: every gap takes the serial form, even
-          # between two names
-          def serial_list?
-            @style.scheme.name_form.list_style == "serial"
-          end
-
           def editors?
             !creators.empty? && creators.all? { |c| has_role?(c, "editor") }
           end

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

@@ -9,19 +9,28 @@ module Relaton
         # organization contributors.
         class Production < Element
           def present?
-            !places.empty? || !publishers.empty?
+            !places.empty? || !publishers.empty? || no_place_declared?
           end
 
           def render
-            [place_text, publishers.join("; ")]
+            return no_place_production if places.empty? && no_place_declared?
+
+            [places.join("; "), publishers.join("; ")]
               .reject(&:empty?).join(@i18n.punct_fetch("production_sep", ": "))
           end
 
-          def place_text
-            return places.join("; ") unless places.empty?
-
+          # 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")
-            label == "no_place" ? "" : label
+            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

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
 

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

@@ -23,6 +23,9 @@ module Relaton
           # "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 }
@@ -36,6 +39,7 @@ module Relaton
             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

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/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.6".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.6
+  version: 3.0.0.pre.alpha.7
 platform: ruby
 authors:
 - Ribose Inc.