relaton-render 3.0.0.pre.alpha.11 → 3.0.0.pre.alpha.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0b28a1996c4db280d4b0f1f976c91c2dc99926b60839df65e76407df0a491f2
-  data.tar.gz: 675de3d7b9821c9838a63730bff1d49f39e6595213d2b9476c6875ed5b76f024
+  metadata.gz: 6940d659b738ee1c15dc46b7ee7be2bfb3f3bf322fd6cb8ae5fe70e19a2ab7ce
+  data.tar.gz: 060007b9cd392e9bf4b84cac3961aa8f0881849e74195c4ca6eb3f5f6dcf64f6
 SHA512:
-  metadata.gz: 8a6d75a746549935b322e7437692938d3a126692de6e074053f1768b97b7a4da3c6ce33e8fb5b182f89f92b388c5bcb54bda1d18a38e429c533e72f0cc03b92b
-  data.tar.gz: 0cbb4c77dc482860c76834d3dff1f418ab8726dfd84477e5787d06c9b11df4dff139e22019cf2d6b525d980ae6d907207075d315143afc8f472d2828df634116
+  metadata.gz: 4a989f5e702e6e27afbad1fab8dc59c7bd092355eab5dbfb1cedf0b99c2373e71c99c3ed418e033f6638f00addcf68d983006213206a4200b7ef6e45c9907682
+  data.tar.gz: 56ac7f18bd13de8324a8ac118d68c7c9d98b6b3eb49b455a32cbca194802097b2e5123e725427ff84d16fd8fe1bd4fe952de7e90c610bf27e39cd94d105a76c2

data/lib/relaton/render/general.rb

@@ -63,7 +63,7 @@ module Relaton
           end
           m[item.id] = {
             id: item.id, ord: i,
-            formattedref: terminate_reference(ref),
+            formattedref: terminate_reference(ref, item),
             citation: citation_renderings(item, ref),
           }
         end
@@ -82,7 +82,9 @@ 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)
-      def terminate_reference(ref)
+      # The bibliography terminator; flavors override to suppress it
+      # (1.x use_terminator?), receiving the item it terminates
+      def terminate_reference(ref, _item = nil)
         return ref if ref.empty? || ref.rstrip.end_with?(".")
 
         "#{ref}."

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

@@ -62,7 +62,7 @@ module Relaton
         end
 
         def item_kind
-          @kind || Kinds.kind_for(@model.type)
+          @kind || @style.kind_for(@model.type)
         end
 
         def person_completename(person)

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

@@ -13,8 +13,6 @@ module Relaton
             !render.nil?
           end
 
-          # The bare date; the style's dateForm wraps it in the
-          # dategroup slot (Fields#dategroup_field)
           def render
             range || year&.to_s
           end

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

@@ -98,7 +98,7 @@ module Relaton
         end
 
         def item_kind
-          Kinds.kind_for(@model.type)
+          @style.kind_for(@model.type)
         end
 
         def name_fields

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

@@ -38,6 +38,12 @@ module Relaton
 
         DEFAULT_KIND = "report"
 
+        class << self
+          def mapped?(type)
+            TO_KIND.key?(type.to_s)
+          end
+        end
+
         def self.kind_for(type)
           TO_KIND.fetch(type.to_s, DEFAULT_KIND)
         end

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

@@ -35,7 +35,7 @@ module Relaton
         end
 
         def render(model)
-          kind = Kinds.kind_for(model.type)
+          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,
@@ -62,7 +62,7 @@ module Relaton
 
         # The short cite: the reference with the first-biblio marker
         def render_short(model, delim)
-          kind = Kinds.kind_for(model.type)
+          kind = @style.kind_for(model.type)
           template = @style.type_template_for(kind)&.short ||
             @style.template_for(kind, home: home_docid?(model))
           Template.new(template).evaluate_short(

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

@@ -11,12 +11,14 @@ module Relaton
           attribute :name_form, NameForm, default: -> { NameForm.new }
           attribute :locale, Locale, default: -> { Locale.new }
           attribute :home_docid_type, :string, collection: true
+          attribute :default_kind, :string, default: ""
 
           key_value do
             map "system", to: :system
             map "nameForm", to: :name_form
             map "locale", to: :locale
             map "homeDocidType", to: :home_docid_type
+            map "defaultKind", to: :default_kind
           end
         end
       end

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

@@ -17,7 +17,6 @@ module Relaton
           attribute :uri, :string, default: ""
           attribute :creators, :string, default: ""
           attribute :uri_short, :string, default: ""
-          attribute :date_form, :string, default: ""
           # "first": cite only the first identifier (1.x
           # authoritative_identifier|first styles)
           attribute :identifier_mode, :string, default: "all"
@@ -32,7 +31,6 @@ module Relaton
           map "uri", to: :uri
           map "creators", to: :creators
           map "uriShort", to: :uri_short
-          map "dateForm", to: :date_form
           map "identifierMode", to: :identifier_mode
           end
         end

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

@@ -40,6 +40,16 @@ module Relaton
           [SortRule.new(attribute: "creator"), SortRule.new(attribute: "date")]
         end
 
+        # The ISO 690 kind of an item: the vocabulary's mapping, or
+        # the style's declared kind for types the vocabulary does not
+        # map (a flavor whose untyped items are not reports)
+        def kind_for(type)
+          return Kinds.kind_for(type) if Kinds.mapped?(type)
+
+          declared = scheme.default_kind.to_s
+          declared.empty? ? Kinds.kind_for(type) : declared
+        end
+
         # Per-type template selection is a data lookup; unmatched types
         # fall back to the general reference template. When a kind has
         # home-flagged variants, the split is resolved by whether the item

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

@@ -17,7 +17,7 @@ module Relaton
         Field = Struct.new(:present?, :text)
 
         def initialize(source)
-          @slots = []
+          @chunks = []
           @terminator = ""
           scan(source.to_s)
         end
@@ -27,41 +27,56 @@ module Relaton
         # 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?
+          present = present_indices(fields)
+          return "" if present.empty?
 
-            [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
+          out = +""
+          first_seen = false
+          @chunks.each_with_index do |(kind, value), i|
+            text =
+              case kind
+              when :slot
+                field = fields[normalise(value)]
+                next unless field&.present?
+
+                first_seen ? field.text : "#{field.text}#{delim} "
+              else
+                # the split marker precedes the component's trailing
+                # punctuation (1.x ret[0] += delim, then join), with
+                # the join's separating space
+                next unless bridged?(i, present)
+
+                value
+              end
+            first_seen = true if @chunks[i].first == :slot
+            out << text unless text.nil?
           end
-          terminate(parts.join).rstrip
+          terminate(out).rstrip
         end
 
+        # 1.x segment-join semantics: present elements joined with the
+        # template's separators — a literal renders only when it
+        # separates (a run of absent elements between) two present
+        # elements; leading and trailing literals drop with the
+        # elements they would have attached to
         def evaluate(fields)
-          rendered = @slots.filter_map do |(name, head, tail)|
-            field = fields[normalise(name)] or next
-            next unless field.present?
+          present = present_indices(fields)
+          return "" if present.empty?
 
-            [head, field.text, tail]
+          out = +"".dup
+          @chunks.each_with_index do |(kind, value), i|
+            if kind == :slot
+              field = fields[normalise(value)]
+              out << field.text if field&.present?
+            elsif bridged?(i, present) ||
+                  (value.include?("<") && present.any? { |j| j < i })
+              # markup attaches to the element it closes
+              out << value
+            elsif close_pending_paren?(out, value)
+              out << value
+            end
           end
-          return "" if rendered.empty?
-
-          terminate(rendered.each_with_index.map do |(head, text, tail), i|
-            i == rendered.size - 1 ? "#{head}#{text}" : "#{head}#{text}#{tail}"
-          end.join).rstrip
+          terminate(out).rstrip
         end
 
         private
@@ -69,37 +84,74 @@ module Relaton
         def scan(source)
           rest = source
           while (slot = SLOT.match(rest))
-            head = @slots.empty? ? rest[0...slot.begin(0)] : ""
-            @slots << [slot[1], head, ""]
+            @chunks << [:text, rest[0...slot.begin(0)]] if
+              slot.begin(0).positive?
+            @chunks << [:slot, slot[1]]
             rest = rest[slot.end(0)..]
-            following = SLOT.match(rest)
-            boundary = following ? following.begin(0) : rest.length
-            literal = rest[0...boundary]
-            if following
-              @slots.last[2] = literal
-            else
-              @terminator = literal
-            end
-            rest = rest[boundary..]
+          end
+          @terminator = rest
+        end
+
+        def present_indices(fields)
+          @chunks.each_index.select do |i|
+            kind, value = @chunks[i]
+            next false unless kind == :slot
+
+            field = fields[normalise(value)]
+            !field.nil? && field.present?
           end
         end
 
+        # A literal bridges two present elements when at least one
+        # present element stands on each side of it; a leading literal
+        # (no slot precedes it) attaches to the first slot, emitting
+        # only when that slot is present
+        def bridged?(index, present)
+          first_slot = @chunks.index { |(kind, _)| kind == :slot }
+          return present.include?(first_slot) if index < first_slot
+
+          present.any? { |i| i < index } && present.any? { |i| i > index }
+        end
+
+        # A template's paired literal ("({{production}})") closes even
+        # when nothing follows the present element it wraps
+        def close_pending_paren?(out, value)
+          value.start_with?(")") && out.count("(") > out.count(")")
+        end
+
         def terminate(body)
-          # 1.x punctuation cleanup: an element ending in a colon
-          # carries its own separator (the following sentence period
-          # collapses); a sentence period followed by a spaced comma
-          # or another period collapses into one (", 2013" over
-          # ". , 2013"; "n.d.." into "n.d.") — an initials period
-          # before a comma ("P.,") stands; spaces collapse before a
-          # comma
+          # 1.x punctuation cleanup: a sentence period before a spaced
+          # comma yields to the comma (", 2013" over ". , 2013"; an
+          # initials period before a comma ("P.,") stands, being
+          # unspaced), and stacked separators around absent elements
+          # collapse into one (". : ." into ". "); an empty pair left
+          # by an absent element drops
           body = body.gsub(/:\s*\.\s*/, ": ")
           body = body.gsub(/\.\s+,/, ",")
-          body = body.gsub(/\.\s*\./, ".")
+          body = body.gsub(/(?:[.,:;]\s+)+[.,:;]/, ". ")
+          body = body.gsub(/\.\s*\./, ". ")
+          body = body.gsub(/:\s*\.\s*/, ": ")
+          body = body.gsub(/\(\s*\)/, "")
           body = body.gsub(/ +/, " ").gsub(" ,", ",")
-          return body if @terminator.strip.empty?
-          return body if body.rstrip.end_with?(@terminator.strip)
+          terminator = unbalanced_close(body, @terminator)
+          return body if terminator.strip.empty?
+          if terminator !~ /[<\w]/ && body.rstrip.end_with?(terminator.strip)
+            return body
+          end
+
+          "#{body}#{terminator}"
+        end
+
+        # The terminator's closing parens stand only when the body
+        # opened them (their "(" died with an absent element)
+        def unbalanced_close(body, terminator)
+          return terminator unless terminator.start_with?(")")
+
+          open = body.count("(") - body.count(")")
+          return terminator.sub(/\A\)+/) { |closes| closes[0, open] } if
+            open.positive?
 
-          "#{body}#{@terminator}"
+          terminator.sub(/\A\)+/, "")
         end
 
         def normalise(slot)

data/lib/relaton/render/version.rb

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