csl 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c70f967fbf46ada97d0c2b3164d3fc1b843d24d6125f1c6364d2d7f408c5fa7e
-  data.tar.gz: 59d241370ed43b45a191e938ebbe20b51ed74419a503feb0c71e37d2770facd3
+  metadata.gz: e483c629270cabba02a203aba157f855f758ee6a479bd3fe609749dbbc5ca4dd
+  data.tar.gz: b12ab1cfcb7d80659cd248d490f1ed5a55c628c6c9ef007207a97046a9788c54
 SHA512:
-  metadata.gz: ee00896662db7e3f7ccdc6644f208428a392ad2a66ae09ad93bb37ac4a6366915d9f4cea1cb274526466e8a0441f6c40afdfcbf953735e2d6a744587f41f6777
-  data.tar.gz: 2807a5c96c581af1a9314d75b5b24b09e461c6fbf956b475d9bde1f8c1f7a6bc420095a9af6380ee7879129b80f6dc0ce1505dcd555dafdff7355b89e09979cc
+  metadata.gz: 3a7ab825b430ba85795216742d476bccab2bab9d38f038f383d0c496b61cd0ffdd1d4f17cd2119e87f011b99a509fd06b8a0869f7734904a8705287117867881
+  data.tar.gz: d5e3fe727078cfd20acbfd7ca3de9ae1d1dc59cd8f259cf90f69245e139f10460553ede8a96f76e7850d105e5542dea3bf78c17cce3a630b1fafa6e03fd9cae2

data/lib/csl/locale/term.rb

@@ -343,14 +343,14 @@ module CSL
 
       def singularize
         return text if textnode?
-        children.single.to_s
+        children.single&.text.to_s.strip
       end
 
       alias singular singularize
 
       def pluralize
         return text if textnode?
-        children.multiple.to_s
+        children.multiple&.text.to_s.strip
       end
 
       alias plural pluralize

data/lib/csl/locale.rb

@@ -288,6 +288,9 @@ module CSL
     # @option options ['feminine','masculine',nil] :'gender-form' (nil)
     #   which ordinals gender-form to use; falls back to the neuter
     #   ordinals (without gender-form)
+    # @option options [String] :noun the name of the term accompanied by
+    #   the ordinal (e.g., "edition" or "month-01"); the ordinal uses the
+    #   gender of the term unless a gender-form is given
     #
     # @raise [ArgumentError] if number cannot be converted to an integer
     #
@@ -297,6 +300,12 @@ module CSL
         number.respond_to?(:to_i)
 
       number = number.to_i
+
+      noun = terms.lookup(options[:noun]) if options.key?(:noun)
+      if noun&.gendered? && !options.key?(:'gender-form')
+        options = options.merge(:'gender-form' => noun.gender)
+      end
+
       ordinal = terms.ordinalize number, options
 
       return number.to_s if ordinal.nil?

data/lib/csl/style/bibliography.rb

@@ -25,6 +25,10 @@ module CSL
         children[:sort].sort_keys
       end
 
+      def second_field_align?
+        attribute?(:'second-field-align')
+      end
+
       def substitute_subsequent_authors?
         attribute?(:'subsequent-author-substitute')
       end

data/lib/csl/style/date.rb

@@ -64,6 +64,49 @@ module CSL
       def has_overrides?
         localized? && has_parts?
       end
+
+      # Localized dates use the date parts of the locale's date in the
+      # same form, filtered by the date-parts attribute; the date parts of
+      # this date override their attributes, except for the affixes.
+      #
+      # @param locale [CSL::Locale]
+      # @raise [CSL::Error] if the locale has no date in the same form
+      # @return [Array<CSL::Style::DatePart, CSL::Locale::DatePart>]
+      #   the date parts to use
+      def parts_for(locale)
+        return parts unless localized?
+
+        filter = parts_filter
+
+        localized_date_for(locale).parts
+          .select { |part| filter.include?(part.name) }
+          .map { |part| override(part) }
+      end
+
+      # @param locale [CSL::Locale]
+      # @raise [CSL::Error] if the locale has no date in the same form
+      # @return [String] the delimiter to use
+      def delimiter_for(locale)
+        localized? ? localized_date_for(locale).delimiter : delimiter
+      end
+
+      private
+
+      def localized_date_for(locale)
+        locale.each_date.detect { |date| date.form == form } or
+          raise Error, "no localized date for form #{form} found"
+      end
+
+      # @return [CSL::Locale::DatePart] the part or a copy
+      #   with the attributes of the matching date part
+      def override(part)
+        override = parts.detect { |p| p.name == part.name }
+        return part if override.nil?
+
+        copy = part.deep_copy
+        copy.merge! override.attributes.to_hash.except(:prefix, :suffix)
+        copy
+      end
     end
 
     class DatePart < Node

data/lib/csl/style/names.rb

@@ -181,8 +181,11 @@ module CSL
         self
       end
 
+      # @param names [#to_i, Enumerable] the list of names (or its length)
+      # @return [Boolean] whether or not the delimiter will be inserted
+      #   before et-al
       def delimiter_precedes_et_al?(names)
-        names = names.length if names.respond_to?(:length)
+        count = names.respond_to?(:length) ? names.length : names.to_i
 
         case
         when delimiter_never_precedes_et_al?
@@ -190,9 +193,9 @@ module CSL
         when delimiter_always_precedes_et_al?
           true
         when delimiter_precedes_et_al_after_inverted_name?
-          name_as_sort_order_at?(names.to_i)
+          inverted_at?(names, count)
         else
-          names.to_i > 1
+          count > 1
         end
       end
 
@@ -253,7 +256,7 @@ module CSL
       # @return [Boolean] whether or not the delimiter will be inserted between
       #   the penultimate and the last name
       def delimiter_precedes_last?(names)
-        names = names.length if names.respond_to?(:length)
+        count = names.respond_to?(:length) ? names.length : names.to_i
 
         case
         when !attribute?(:and)
@@ -263,14 +266,9 @@ module CSL
         when delimiter_always_precedes_last?
           true
         when delimiter_precedes_last_after_inverted_name?
-          if name_as_sort_order?
-            all_names_as_sort_order? || names.to_i == 2
-          else
-            false
-          end
-
+          inverted_at?(names, count - 1)
         else
-          names.to_i > 2
+          count > 2
         end
       end
 
@@ -342,6 +340,21 @@ module CSL
       def connector=(c)
         attributes[:and] = c
       end
+
+      private
+
+      # @param names [#to_i, Enumerable] the list of names (or its length)
+      # @param position [Integer] the position of the name (starting at 1)
+      # @return [Boolean] whether or not the name at the position is
+      #   inverted; names which are not invertible (e.g., literal names)
+      #   never are
+      def inverted_at?(names, position)
+        return false unless name_as_sort_order_at?(position)
+        return true unless names.is_a?(Enumerable)
+
+        name = names.to_a[position - 1]
+        !name.respond_to?(:invertible?) || name.invertible?
+      end
     end
 
     class NamePart < Node

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.5.0'.freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Sylvester Keil
 bindir: bin
 cert_chain: []
-date: 2026-10-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -112,7 +112,7 @@ description: |
   an open XML-based language to describe the formatting of citations
   and bibliographies.
 email:
-- http://sylvester.keil.or.at
+- sylvester@keil.or.at
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -159,7 +159,10 @@ files:
 homepage: https://github.com/inukshuk/csl-ruby
 licenses:
 - BSD-2-Clause
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/inukshuk/csl-ruby
+  bug_tracker_uri: https://github.com/inukshuk/csl-ruby/issues
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib