relaton-render 3.0.0.pre.alpha.22 → 3.0.0.pre.alpha.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d485246fb8d04c771c257c63295000ade2b54462caaa884aa0a1aecdb22a6498
-  data.tar.gz: 8cbb2bed01af3e82d57ebc064853ead1dc0fd7215aab812b782ce5faaf59d4c3
+  metadata.gz: 1f8e1bb4347d4eab41a00189b7040c378c6eaa59631eb52fa0e62de36cce9861
+  data.tar.gz: b6c530258baf6fdf30c70c1f56d17a5c4333fc6f68b6c466e72a18e7cbd7c06d
 SHA512:
-  metadata.gz: 467f05b5d476d4eb759d2248b863eca01e5319b18ab98c95c7283921a27ba5cdaf5ac9fcf93f8b10e24c2dee08028bdeeea25a975473d6311820f46229670826
-  data.tar.gz: cd5caf02198e2d34538eab81c0cd0732b1b276bc62195352e9aee68cd61221b180a585b4a3ff9d218664b3ec6deb7dc1d7c937fe85cd02bf887b8a84162071b9
+  metadata.gz: 45ef9145e49a975775ded3f52bdea26bd429f669adf3a1130524d9b84c60555114f4301a0aac4cb4944bf1126f81b36aa622d2268958e9a6fec357c8b82d4882
+  data.tar.gz: 7d34cfe2fc402a565bb07d530db022cd9e700a6081a96a8bf271fa19193755e8b1f1eaa5deef5767514ffb8c501b801a7da5c7cd128f005ca3e659a5ca7d7ce8

data/lib/relaton/render/general.rb

@@ -79,13 +79,15 @@ module Relaton
             next
           end
           m[item.id] = {
-            id: item.id, ord: i,
             author: renderer.in_text_author(item),
-            formattedref: terminate_reference(ref, item),
+            date: renderer.disambiguated_date(item,
+                                              disambiguator:
+                                                disambiguators[item.id]),
             citation: citation_renderings(item, ref, renderer,
                                           type: type,
                                           disambiguator:
                                             disambiguators[item.id]),
+            formattedref: terminate_reference(ref, item),
           }
         end
       end
@@ -93,7 +95,7 @@ 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'/>"
+      FIRST_DELIM = '<span class="fmt-first-biblio-delim"/>'
 
       # A creator list alone (flavors' document-history name forms)
       def creator_names(item)
@@ -141,11 +143,14 @@ module Relaton
       # names the key)
       def citation_renderings(item, ref, renderer, type: "author-date",
                               disambiguator: nil)
-        short = renderer.citation(item)
-        short = if short.empty?
+        # A style declaring shortFromReference takes the reference form
+        # with the first-biblio marker (the 1.x citetemplate short)
+        short = if renderer.short_from_reference?
                   renderer.render_short(item, FIRST_DELIM)
                 else
-                  short
+                  short = renderer.citation(item)
+                  short.empty? ? renderer.render_short(item, FIRST_DELIM) :
+                    short
                 end
 
         title = renderer.title_citation(item)
@@ -154,15 +159,15 @@ module Relaton
           full: ref,
           default: item.docidentifier.first&.content.to_s,
           short: short,
-          author_date: renderer.author_date_citation(
-            item, disambiguator: disambiguator,
-          ),
+          author_date: renderer.citation(item,
+                                         disambiguator: disambiguator),
           author_date_br: renderer.bracketed_date_citation(
             item, disambiguator: disambiguator,
           ),
           author: renderer.in_text_author(item),
-          date: renderer.disambiguated_date(item, disambiguator: disambiguator),
-          reference_tag: "",
+          date: renderer.disambiguated_date(item),
+          # reference_tag: no rendering — isodoc falls back to the
+          # biblio-tag anchor (the 1.x nil)
           title: title,
           title_reference_tag: title,
         }
@@ -240,7 +245,9 @@ module Relaton
           end
           out.empty? or break
         end
-        out.map { |x| x.text.strip }
+        # esc-wrapped: isodoc's l10n skips the tags, leaving a standard
+        # identifier's punctuation verbatim (the 1.x Parse behaviour)
+        out.map { |x| "<esc>#{x.text.strip}</esc>" }
       end
 
       def facade_id_type(id)

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

@@ -48,8 +48,7 @@ module Relaton
           # 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_space}#{role_parenthesis}" : ''
+            marker = editors? && marked? ? "#{role_space}#{role_parenthesis}" : ''
             "#{join(names)}#{marker}"
           end
 

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

@@ -12,17 +12,37 @@ module Relaton
 
           def render
             groups = [numeration, page_range].reject { |g| g.empty? }
-            groups.join(", ")
+            groups.join(group_sep)
           end
 
           private
 
+          # An extent label is a template over its value: "vol. %" in
+          # the Latin pack, "巻%" / "%頁" in the CJK packs
+          def unit(type, value)
+            label = @i18n.label(type)
+            return "#{label} #{value}" unless label.include?("%")
+
+            label.sub("%", value)
+          end
+
+          def cjk?(label)
+            label.match?(/\p{Han}|\p{Hiragana}|\p{Katakana}/)
+          end
+
+          def group_sep
+            sep = @i18n.label("extent_group_separator")
+            return sep unless sep == "extent_group_separator"
+
+            cjk?(@i18n.label("page")) ? "、 " : ", "
+          end
+
           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}"
+              unit(type, loc.reference_from)
             end.join(" ")
           end
 
@@ -31,10 +51,10 @@ module Relaton
             from = loc.reference_from.to_s
             to = loc.reference_to.to_s
             if to.empty? || to == from
-              "#{@i18n.label('page')} #{from}"
+              unit("page", from)
             else
-              "#{@i18n.label('pages')} " \
-                "#{from}#{@i18n.label('date_range')}#{to}"
+              range = "#{from}#{@i18n.label('date_range')}#{to}"
+              unit("pages", range)
             end
           end
 

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

@@ -57,7 +57,8 @@ module Relaton
             return "" if label.empty? || label == "no_place"
 
             pubs = publishers.join("; ")
-            pubs.empty? ? "#{label}:" : "#{label}: #{pubs}"
+            pubs.empty? ? "#{label}#{production_sep}".rstrip :
+              "#{label}#{production_sep}#{pubs}"
           end
 
           def no_place_declared?

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

@@ -25,7 +25,11 @@ module Relaton
             if number.empty?
               base
             else
-              "#{base}, #{@i18n.label('series_no')} #{number}"
+              # an empty series_no label joins on the space alone (the
+              # CJK form: "Series 472")
+              label = @i18n.label("series_no")
+              label.empty? ? "#{base} #{number}" :
+                "#{base}, #{label} #{number}"
             end
           end
 

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

@@ -13,10 +13,11 @@ labels:
   ordinal_word_10: "Tenth"
   size_volume: "vol."
   size_page: "pp."
-  page: "p."
-  pages: "pp."
-  volume: "vol."
-  issue: "no."
+  page: "p. %"
+  pages: "pp. %"
+  volume: "vol. %"
+  issue: "no. %"
+  no_place: "n.p."
   version: "Version"
   medium_website: "[website]"
   viewed: "viewed"

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

@@ -3,10 +3,10 @@ labels:
   edition: "版"
   size_volume: "巻"
   size_page: "頁"
-  page: "頁"
-  pages: "頁"
-  volume: "巻"
-  issue: "号"
+  page: "%頁"
+  pages: "%頁"
+  volume: "巻%"
+  issue: "%号"
   version: "版"
   viewed: "閲覧"
   series_no: "番号"
@@ -25,7 +25,7 @@ labels:
   list_separator: "、 "
   and: ""
   oxford_comma: ""
-  date_range: "–"
+  date_range: "〜"
 punct:
   size-join: ""
   marker-space: ""

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

@@ -64,7 +64,8 @@ module Relaton
         # The short cite: the reference with the first-biblio marker
         def render_short(model, delim)
           kind = @style.kind_for(model.type)
-          template = @style.type_template_for(kind)&.short ||
+          template = @style.short_template_for(kind,
+                                               home: home_docid?(model)) ||
             @style.template_for(kind, home: home_docid?(model))
           Template.new(template).evaluate_short(
             Fields.new(model, style: @style, i18n: @i18n, short: true,
@@ -93,12 +94,12 @@ module Relaton
         end
 
         # The bracketed author-date in-text capsule ("Aluffi （2022）"):
-        # the author and the date in the locale's parentheses
-        def bracketed_date_citation(model, disambiguator: nil)
+        # the author and the PLAIN date (un-disambiguated, the 1.x
+        # citetemplate's {{ date }}) in the locale's parentheses
+        def bracketed_date_citation(model, **)
           f = Fields.new(model, style: @style, i18n: @i18n,
-                         disambiguator: disambiguator,
                          elements: @elements).to_h
-          date = f["disambiguateddate"].text
+          date = f["date"].text
           return "" if date.empty?
 
           open = @i18n.punct_fetch("open-paren", "(")
@@ -114,6 +115,10 @@ module Relaton
                      elements: @elements).to_h["disambiguateddate"].text
         end
 
+        def short_from_reference?
+          @style.scheme.short_from_reference
+        end
+
         # The title citation ("{{ title }}" in the 1.x citetemplate):
         # the title element's plain form, no style markers
         def title_citation(model)

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

@@ -13,12 +13,18 @@ module Relaton
           attribute :home_docid_type, :string, collection: true
           attribute :default_kind, :string, default: ""
 
-          key_value do
+          # The renderings' short cite takes the reference form with the
+      # first-biblio marker (the 1.x citetemplate short), not the
+      # citation template
+      attribute :short_from_reference, :boolean, default: -> { false }
+
+      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
+            map "shortFromReference", to: :short_from_reference
           end
         end
       end

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

@@ -66,6 +66,17 @@ module Relaton
           per_type.find { |t| t.type == type.to_s }
         end
 
+        # The home split applies to the short cite as it does to the
+        # reference template (a home standard's short cite is not an
+        # external standard's)
+        def short_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.filter_map(&:short).first
+        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)

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

@@ -30,8 +30,18 @@ module Relaton
           present = present_indices(fields)
           return "" if present.empty?
 
+          # The split marker follows the leading run of present slots
+          # (the 1.x first SEGMENT: "{{creator}}{{role}}" splits after
+          # the role), before the first literal that follows it
+          lead_slots = []
+          @chunks.each_with_index do |(kind, _value), i|
+            break if kind != :slot || !present.include?(i)
+
+            lead_slots << i
+          end
+          split_at = lead_slots.last ? lead_slots.last + 1 : nil
+
           out = +""
-          first_seen = false
           @chunks.each_with_index do |(kind, value), i|
             text =
               case kind
@@ -39,18 +49,20 @@ module Relaton
                 field = fields[normalise(value)]
                 next unless field&.present?
 
-                first_seen ? field.text : "#{field.text}#{delim} "
+                field.text
               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
+            if split_at == i
+              out << fieldless(lead_slots, fields) if false
+              out << delim.to_s
+              split_at = nil
+            end
             out << text unless text.nil?
           end
+          out << delim.to_s if split_at == @chunks.length
           terminate(out).rstrip
         end
 
@@ -64,10 +76,44 @@ module Relaton
           return "" if present.empty?
 
           out = +"".dup
+          # Parenthetical groups balance on the template's literal
+          # parens alone: data text (a series run "(N.S.)", a host
+          # creator's closing paren) carries parens of its own that
+          # are no part of the template's group structure
+          paren_balance = 0
           @chunks.each_with_index do |(kind, value), i|
             if kind == :slot
               field = fields[normalise(value)]
               out << field.text if field&.present?
+            elsif value.to_s.match?(/\A[）)]/)
+              # Symmetric close: with no pending open the close-paren
+              # drops, and any trailing punctuation bridges normally
+              closes = value.to_s[/\A[）)]+/]
+              emitted = [paren_balance, closes.size].min
+              if emitted.positive?
+                out << closes[0, emitted] +
+                  value.to_s[closes.size..].to_s
+                paren_balance -= emitted
+              else
+                rest = value.to_s.sub(/\A[）)]+/, "")
+                # the trailing separator of a dropped group bridges as
+                # though the group were never there
+                if !rest.empty? && present.any? { |j| j > i } &&
+                   group_gap?(i, present)
+                  out << rest
+                end
+              end
+            elsif value.to_s.match?(/[（(]\z/)
+              # A literal opening a parenthetical group ("({{series}})",
+              # "。（{{series}}）") attaches its paren to the slot it
+              # opens — the pair drops with an absent element, while
+              # any leading punctuation bridges normally
+              lead, paren = value.to_s.match(/\A(.*)([（(])\z/).captures
+              out << lead if bridged_text?(i, lead, present)
+              if present.include?(i + 1)
+                out << paren
+                paren_balance += 1
+              end
             elsif bridged?(i, present) ||
                   (value.include?("<") && present.any? { |j| j < i })
               # markup attaches to the element it closes
@@ -102,6 +148,30 @@ module Relaton
           end
         end
 
+        # The texts between this close and the last present slot are
+        # all parenthetical-group parts (each dropped or partial)
+        def group_gap?(index, present)
+          left = present.select { |i| i < index }.max
+          @chunks[(left + 1)...index].all? do |(_, text)|
+            text.to_s.match?(/\A[）)]|[（(]\z/)
+          end
+        end
+
+        # The leading punctuation of a paren-opening literal bridges
+        # per the segment-join rule (a bare paren has no lead)
+        def bridged_text?(index, lead, present)
+          return true if lead.empty?
+
+          first_slot = @chunks.index { |(kind, _)| kind == :slot }
+          return present.include?(first_slot) if index < first_slot
+
+          left = present.select { |i| i < index }.max
+          left && present.any? { |i| i > index } &&
+            !@chunks[(left + 1)...index].any? do |(kind, _)|
+              kind == :text
+            end
+        end
+
         # A literal is the trailing separator of the element that
         # precedes it: it renders when that element renders and a
         # later element renders, and it is the FIRST literal of its

data/lib/relaton/render/version.rb

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