relaton-render 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 582bd299999942dc5919461f4bde4d4ea90418708be1cda926903aa05659baa2
-  data.tar.gz: 5c8f8e6346a911b28bca037a9f6f931dd997d562400a615b9bbfd9f66a653848
+  metadata.gz: f0f0cf15017a8c117f7a8fde7567564f61138760cfeb89b506e5c2848ff6899d
+  data.tar.gz: 2d5bdd64aeb924e67b2c4f823e60033a1a51018542deb4596f32533038919e00
 SHA512:
-  metadata.gz: d5994cb6fbfac2a14e0ad9e34c5acd3f33b12e2f983ac2e9de2d34cf8392b8e5e11fa1802eb5bc21dce0b545d1ac2d36b9a50a75e6344b962c207dba31a923cb
-  data.tar.gz: 6363973667df0ba2751b7d87dd6abd7d3f4f733cdb1cbac6c6543ea0cd79befea3cfb5003ae6b50753132c2aebf826f846e0fc12e0985aa84163a88e91c92874
+  metadata.gz: 2f05f38566cf4f94bad2152db2cb2c71c0d2f2a63939c7bac0039fbaa0e21314aba6288640ec9a7c1248b6548342ba21ccff47e0b360902055ed1f026f52eabc
+  data.tar.gz: e787ce6357bfd515b9d7a975027f798ec027fa2845a6495ea53c0c2032abb8e90f7881736bf1f0c947cf30e0b82e5aeb259ba9f9f20877823828cc6c3d987277

data/README.adoc

@@ -256,12 +256,31 @@ For example:
 
 In the case of `more`, the `(name)[1]` entries are repeated for all additional authors above 2 and before the final author.
 
+The behaviour of _et al._ can be specified as follows:
+
+* `etal_count`: the number of authors to trigger _et al._ in bibliographic rendering
+* `etal_display`: how many authors to show if using _et al._ in bibliography (by default, same as `etal_count`)
+
+So the Chicago Manual of Style behaviour:
+
+____
+For more than ten authors (not shown here), list the first seven in the reference list, followed by et al.
+____
+
+is realised with etal_count = 10, etal_display = 7
+
 [[authorcitetemplate]]
 === Author citation templates
 
 The `authorcitetemplate` is a subclass of the name template, configured for rendering author names for author-date citations.
 That means that it typically selects only surnames for rendering.
 
+
+The behaviour of _et al._ in author-date citations can be specified as follows:
+
+* `etal_count`: the number of authors to trigger _et al._ in bibliographic rendering
+* `etal_display`: how many authors to show if using _et al._ in bibliography (by default, same as `etal_count`)
+
 [[seriestemplate]]
 === Series template
 

data/lib/relaton/render/parse/parse_contributors.rb

@@ -1,14 +1,19 @@
 module Relaton
   module Render
     class Parse
+      def content(node)
+        node.nil? and return node
+        node.content.strip
+      end
+
       def extract_orgname(org)
-        org.name&.first&.content
+        content(org.name&.first)
       end
 
       def extract_personname(person)
         surname = person.name.surname || person.name.completename
         given, middle, initials = given_and_middle_name(person)
-        { surname: surname.content,
+        { surname: content(surname),
           given: given,
           middle: middle,
           initials: initials }
@@ -16,9 +21,9 @@ module Relaton
 
       def given_and_middle_name(person)
         forenames = person.name.forename.map do |x|
-          x.content.empty? ? "#{x.initial}." : x.content
+          x.content.empty? ? "#{x.initial}." : content(x)
         end
-        initials = person.name.initials&.content&.sub(/(.)\.?$/, "\\1.")
+        initials = content(person.name.initials)&.sub(/(.)\.?$/, "\\1.")
           &.split /(?<=\.) /
         initials ||= person.name.forename.map(&:initial)
           .compact.map { |x| x.sub(/(.)\.?$/, "\\1.") }
@@ -29,13 +34,13 @@ module Relaton
 
       def forenames_parse(person)
         person.name.forename.map do |x|
-          x.content.empty? ? "#{x.initial}." : x.content
+          x.content.empty? ? "#{x.initial}." : content(x)
         end
       end
 
       # de S. => one initial, M.-J. => one initial
       def initials_parse(person)
-        i = person.name.initials&.content or
+        i = content(person.name.initials) or
           return person.name.forename.map(&:initial)
               .compact.map { |x| x.sub(/(.)\.?$/, "\\1.") }
 
@@ -136,8 +141,8 @@ module Relaton
         host and x ||= pick_contributor(host, "publisher")
         x.nil? and return nil
         x.map do |c|
-          c.entity.abbreviation&.content ||
-            c.entity.name.first&.content
+          content(c.entity.abbreviation) ||
+            content(c.entity.name.first)
         end
       end
 

data/lib/relaton/render/parse/parse_extract.rb

@@ -13,7 +13,7 @@ module Relaton
         t.empty? and t = doc.title
         t1 = t.select { |x| x.type == "main" }
         t1.empty? and t1 = t
-        t1.first&.title&.content
+        content(t1.first&.title)
       end
 
       def medium(doc, host)
@@ -33,7 +33,7 @@ module Relaton
       end
 
       def edition(doc, host)
-        doc.edition&.content || host&.edition&.content
+        content(doc.edition || host&.edition)
       end
 
       def edition_num(doc, host)
@@ -65,17 +65,19 @@ module Relaton
         return nil if series.nil?
 
         series.title.respond_to?(:titles) && !series.title.titles.empty? and
-          return series.title.titles.first.title.content
-        series.title.respond_to?(:title) and return series.title.title&.content
-        series.title.respond_to?(:formattedref) and series.formattedref.content
+          return content(series.title.titles.first.title)
+        series.title.respond_to?(:title) and
+          return content(series.title.title)
+        series.title.respond_to?(:formattedref) and
+          content(series.formattedref)
       end
 
       def series_formatted(series, _doc)
-        series.formattedref&.content
+        content(series.formattedref)
       end
 
       def series_abbr(series, _doc)
-        series.abbreviation&.content
+        content(series.abbreviation)
       end
 
       def series_num(series, _doc)
@@ -122,7 +124,7 @@ module Relaton
         uri ||= doc.link.detect { |u| !u.type&.casecmp("doi")&.zero? }
         return nil unless uri
 
-        uri.content.to_s
+        uri.content.to_s.strip
       end
 
       def uri_type_select(doc, type)
@@ -201,7 +203,7 @@ module Relaton
       def localized_string_or_text(str)
         case str
         when RelatonBib::LocalizedString
-          str.content
+          content(str)
         when String
           str
         end

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

@@ -31,7 +31,7 @@ module Relaton
 
         # denote start and end of field,
         # so that we can detect empty fields in postprocessing
-        #FIELD_DELIM = "\u0018".freeze
+        # FIELD_DELIM = "\u0018".freeze
         FIELD_DELIM = "%%".freeze
 
         # escape < >
@@ -49,6 +49,11 @@ module Relaton
         end
 
         def template_process(template)
+          template.is_a?(String) or return template
+          ::Liquid::Template.parse(add_field_delim_to_template(template))
+        end
+
+        def add_field_delim_to_template(template)
           t = template.split(/(\{\{|\}\})/).each_slice(4).map do |a|
             unless !a[2] || punct_field?(a[2]&.strip)
               a[1] = "#{FIELD_DELIM}{{"
@@ -56,9 +61,8 @@ module Relaton
             end
             a.join
           end.join.gsub(/\t/, " ")
-          t1 = t.gsub(/\}\}#{FIELD_DELIM}\|/o, "}}#{FIELD_DELIM}\t")
+          t.gsub(/\}\}#{FIELD_DELIM}\|/o, "}}#{FIELD_DELIM}\t")
             .gsub(/\|#{FIELD_DELIM}\{\{/o, "\t#{FIELD_DELIM}{{")
-          ::Liquid::Template.parse(t1)
         end
 
         def render(hash)
@@ -130,7 +134,9 @@ module Relaton
       class Name < General
         def initialize(opt = {})
           @etal_count = opt[:template]["etal_count"]
+          @etal_display = opt[:template]["etal_display"] || @etal_count
           opt[:template].delete("etal_count")
+          opt[:template].delete("etal_display")
           super
         end
 
@@ -147,8 +153,9 @@ module Relaton
 
         def template_select_etal(names)
           if @etal_count && names[:surname].size >= @etal_count
-            @template[:etal]
-          else expand_nametemplate(@template_raw[:more], names[:surname].size)
+            expand_nametemplate(@template_raw[:etal], @etal_display)
+          else
+            expand_nametemplate(@template_raw[:more], names[:surname].size)
           end
         end
 
@@ -156,29 +163,41 @@ module Relaton
         # ...[0], ...[1], ...[2]
         def expand_nametemplate(template, size)
           t = nametemplate_split(template)
+
           mid = (1..size - 2).each_with_object([]) do |i, m|
             m << t[1].gsub(/\[1\]/, "[#{i}]")
           end
-          template_process(t[0] + mid.join + t[2].gsub(/\[2\]/,
-                                                       "[#{size - 1}]"))
+          t[1] = mid.join
+          t[2].gsub!(/\[\d+\]/, "[#{size - 1}]")
+          template_process(combine_nametemplate(t, size))
+        end
+
+        def combine_nametemplate(parts, size)
+          case size
+          when 1 then parts[0] + parts[3]
+          when 2 then parts[0] + parts[2] + parts[3]
+          else parts.join
+          end
         end
 
         def nametemplate_split(template)
           curr = 0
           prec = ""
           t = template.split(/(\{[{%].+?[}%]\})/)
-            .each_with_object(["", "", ""]) do |n, m|
+            .each_with_object([""]) do |n, m|
             m, curr, prec = nametemplate_split1(n, m, curr, prec)
 
             m
           end
-          t[-1] += prec
-          t
+          [t[0], t[1], t[-1], prec]
         end
 
         def nametemplate_split1(elem, acc, curr, prec)
           if match = /\{[{%].+?\[(\d)\]/.match(elem)
-            curr += 1 if match[1].to_i > curr
+            if match[1].to_i > curr
+              curr += 1
+              acc[curr] ||= ""
+            end
             acc[curr] += prec
             prec = ""
             acc[curr] += elem

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.5.5".freeze
+    VERSION = "0.5.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2022-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler