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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1765d54a70d5e79ba48d03c848135bad61bfb6f27e439cb142e869054e06b181
-  data.tar.gz: 9d8636b1838f06a8d119ad2052e7c7b7c47f81f6e9d176ca414fb76b1cbc0698
+  metadata.gz: 22dc4e39ee6744154270c700e9b80ff7e72e90929b19275e1705b4f0ab898d6b
+  data.tar.gz: 7f3482bab07cbcc5034ed2e282854caa0d87bcfae05a1185558ab1ec787cff78
 SHA512:
-  metadata.gz: d4907031dd0d8e1180b3e25221000d58498d5bd18468bf743d372fc84ca79d878518f3b4c966d7faa7dfb3b36c4c5a61fef82d5c508295e3167dfb9cb722485a
-  data.tar.gz: 832213c7c17a9b58dee06a8953c75f30a41b23e568a3ff936cf32d4167a69b69eebe74d9bfbd31b0e7cd22ac3964da999aeb05f2bbd7e30b86473d656b458067
+  metadata.gz: 7349c542f2a79dfb2328d9a285ec36feaebfbba45307314dd7524b00e5c7a464c4fe21ff9f12204d9c3e5ca9e739dfd781a0d6fb4c3d43bde70e2c57b6e4c121
+  data.tar.gz: 0c6c6dca299f1870afa8c38b752b4206185441a6315cf7cab2d6ab141b71fc6a4cd4f1e740001556166cab2282db9f8da975c3163fe2f08c1e97c1998e388599

data/lib/relaton/render/general.rb

@@ -62,7 +62,8 @@ module Relaton
             next
           end
           m[item.id] = {
-            id: item.id, ord: i, formattedref: ref,
+            id: item.id, ord: i,
+            formattedref: terminate_reference(ref),
             citation: citation_renderings(item, ref),
           }
         end
@@ -71,9 +72,24 @@ module Relaton
       # 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)
+      FIRST_DELIM = "<span class='fmt-first-biblio-delim'/>"
+
+      # 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)
+      def terminate_reference(ref)
+        return ref if ref.empty? || ref.rstrip.end_with?(".")
+
+        "#{ref}."
+      end
+
       def citation_renderings(item, ref)
         short = @renderer.citation(item)
-        short = ref if short.empty?
+        short = if short.empty?
+                  @renderer.render_short(item, FIRST_DELIM)
+                else
+                  short
+                end
 
         {
           full: ref,

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

@@ -8,11 +8,12 @@ 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:, kind: nil)
+        def initialize(model, style:, i18n:, kind: nil, short: false)
           @model = model
           @style = style
           @i18n = i18n
           @kind = kind
+          @short = short
         end
 
         def present?

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

@@ -15,6 +15,8 @@ module Relaton
           end
 
           def render
+            return plain_render if @short
+
             joined = if (form = @style.templates.creators) && !form.empty?
                        ::Relaton::Render::Iso690::Template.new(form).evaluate(
                          "names" => Template::Field[true, join(names)],
@@ -38,6 +40,14 @@ module Relaton
             end
           end
 
+          # The short cite splits after the creators: they render as a
+          # plain join, without the wrap and sentence period (1.x
+          # short-cite templates carried no wrap)
+          def plain_render
+            marker = editors? && creators.size > 1 ? " (#{role_word})" : ''
+            "#{join(names)}#{marker}"
+          end
+
           def role_placement
             @style.scheme.name_form.role_placement || "glue"
           end

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

@@ -12,7 +12,8 @@ module Relaton
           end
 
           def render
-            text = if (form = @style.templates.uri) && !form.empty?
+            form = uri_form
+            text = if form && !form.empty?
                      ::Relaton::Render::Iso690::Template.new(form).evaluate(
                        "uri" => Template::Field[!uri.empty?, uri],
                      )
@@ -20,11 +21,25 @@ module Relaton
                      uri
                    end
 
-            "#{@i18n.label('available_from')} #{text}".strip
+            label = @short ? "" : "#{@i18n.label('available_from')} "
+            "#{label}#{text}".strip
           end
 
           private
 
+          # The short cite renders the bare uri (1.x short templates),
+          # the reference the declared form
+          def uri_form
+            if @short
+              short_form = @style.templates.uri_short
+              return :bare if short_form.empty?
+
+              return short_form
+            end
+
+            @style.templates.uri
+          end
+
           def uri
             from_accesslocation =
               Array(@model.accesslocation).map(&:to_s).reject(&:empty?)
@@ -32,8 +47,13 @@ module Relaton
               return from_accesslocation.first.to_s
             end
 
-            Array(@model.source).map { |u| u.content.to_s }
-              .reject(&:empty?).first.to_s
+            uris = Array(@model.source).reject do |u|
+              u.content.to_s.strip.empty?
+            end
+            # the citation uri outranks the rest (1.x uri extraction)
+            preferred = uris.find { |u| u.type == "citation" } ||
+              uris.find { |u| u.type == "attachment" } || uris.first
+            preferred&.content.to_s
           end
         end
       end

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

@@ -14,7 +14,8 @@ module Relaton
           def render
             text = main_title
             return text if analytic?
-            if (form = @style.title_form_for(Kinds.kind_for(@model.type)))
+            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],
               )

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

@@ -39,8 +39,9 @@ module Relaton
           stddoc: Stddoc,
         }.freeze
 
-        def self.build(name, model, style:, i18n:)
-          CLASSES.fetch(name).new(model, style: style, i18n: i18n)
+        def self.build(name, model, style:, i18n:, short: false)
+          CLASSES.fetch(name).new(model, style: style, i18n: i18n,
+                                  short: short)
         end
       end
     end

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

@@ -14,11 +14,13 @@ module Relaton
           extent access stddoc
         ].freeze
 
-        def initialize(model, style:, i18n:, disambiguator: nil)
+        def initialize(model, style:, i18n:, disambiguator: nil,
+                       short: false)
           @model = model
           @style = style
           @i18n = i18n
           @disambiguator = disambiguator.to_s
+          @short = short
         end
 
         def to_h
@@ -33,7 +35,8 @@ module Relaton
         private
 
         def element_field(slot)
-          element = Elements.build(slot, @model, style: @style, i18n: @i18n)
+          element = Elements.build(slot, @model, style: @style,
+                                   i18n: @i18n, short: @short)
           text = element.render.to_s
           if element.present? && !text.empty?
             return Template::Field[true, text]

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

@@ -52,6 +52,19 @@ module Relaton
           Array(model.docidentifier).any? { |d| types.include?(d.type) }
         end
 
+        # The short cite: the reference with the first-biblio marker
+        def render_short(model, delim)
+          kind = Kinds.kind_for(model.type)
+          template = @style.type_template_for(kind)&.short ||
+            @style.template_for(kind, home: home_docid?(model))
+          Template.new(template).evaluate_short(
+            Fields.new(model, style: @style, i18n: @i18n, short: true).to_h,
+            delim,
+          )
+        rescue ::Relaton::Render::Unrenderable
+          ""
+        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/template_map.rb

@@ -16,6 +16,7 @@ module Relaton
           attribute :series, :string, default: ""
           attribute :uri, :string, default: ""
           attribute :creators, :string, default: ""
+          attribute :uri_short, :string, default: ""
 
           key_value do
             map "titleOpen", to: :title_open
@@ -26,6 +27,7 @@ module Relaton
           map "series", to: :series
           map "uri", to: :uri
           map "creators", to: :creators
+          map "uriShort", to: :uri_short
           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: -> { {} }
+          # The short-cite template for this kind; absent falls back to
+          # the reference template in short mode
+          attribute :short, :string
           # Render the style's no_place label when the publisher has no
           # place (the book-family templates of some flavors)
           attribute :no_place, :boolean
@@ -24,6 +27,7 @@ module Relaton
             map "title", to: :title
             map "home", to: :home
             map "fallbacks", to: :fallbacks
+            map "short", to: :short
             map "noPlace", to: :no_place
           end
         end

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

@@ -22,6 +22,34 @@ module Relaton
           scan(source.to_s)
         end
 
+        # The short cite renders the reference with the first-biblio
+        # marker appended to its first component: isodoc's styled
+        # references (eref2linkshort) split there (the 1.x
+        # fmt-first-biblio-delim)
+        def evaluate_short(fields, delim)
+          rendered = @slots.filter_map do |(name, head, tail)|
+            field = fields[normalise(name)] or next
+            next unless field.present?
+
+            [head, field.text, tail]
+          end
+          return "" if rendered.empty?
+
+          parts = rendered.each_with_index.map do |(head, text, tail), i|
+            if i.zero?
+              # the split marker precedes the component's trailing
+              # punctuation (1.x ret[0] += delim, then join), with the
+              # join's separating space
+              "#{head}#{text}#{delim} #{tail}"
+            elsif i == rendered.size - 1
+              "#{head}#{text}"
+            else
+              "#{head}#{text}#{tail}"
+            end
+          end
+          terminate(parts.join).rstrip
+        end
+
         def evaluate(fields)
           rendered = @slots.filter_map do |(name, head, tail)|
             field = fields[normalise(name)] or next

data/lib/relaton/render/version.rb

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