csl 1.0.0.pre12 → 1.0.0.pre13

data/AGPL

@@ -631,7 +631,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     CSL-Ruby. A Ruby CSL parser and library.
 		Copyright 2012 President and Fellows of Harvard College.
-		Copyright 2009-2012 Sylvester Keil. All rights reserved.
+		Copyright 2009-2013 Sylvester Keil. All rights reserved.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as published by

data/BSDL

@@ -1,7 +1,7 @@
 CSL-Ruby. A Ruby CSL parser and library.
 
 Copyright 2012 President and Fellows of Harvard College.
-Copyright 2009-2012 Sylvester Keil. All rights reserved.
+Copyright 2009-2013 Sylvester Keil. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/README.md

@@ -45,7 +45,7 @@ Copyright
 ---------
 Copyright 2012 President and Fellows of Harvard College.
 
-Copyright 2009-2012 Sylvester Keil. All rights reserved.
+Copyright 2009-2013 Sylvester Keil. All rights reserved.
 
 License
 -------

data/features/locales/ordinalize.feature

@@ -66,11 +66,9 @@ Feature: Converting numbers to ordinals using CSL locales
       <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0.1" xml:lang="en">
         <terms>
           <term name="ordinal">th</term>
-          
           <term name="ordinal-01">st</term>
           <term name="ordinal-02">nd</term>
           <term name="ordinal-03">rd</term>
-          
           <term name="ordinal-11">th</term>
           <term name="ordinal-12">th</term>
           <term name="ordinal-13">th</term>
@@ -97,9 +95,9 @@ Feature: Converting numbers to ordinals using CSL locales
       | 112    |       |           |          |
       | 113    |       |           |          |
       | -102   |       |           |          |
-      # | 1      |       | masculine |          |
-      # | 2      |       | feminine  |          |
-      # | 3      |       |           | plural   |
+      | 1      |       | masculine |          |
+      | 2      |       | feminine  |          |
+      | 3      |       |           | plural   |
     Then the ordinals should be:
       | ordinal |
       | 0th     |
@@ -120,9 +118,9 @@ Feature: Converting numbers to ordinals using CSL locales
       | 112th   |
       | 113th   |
       | -102nd  |
-      # | 1st     |
-      # | 2nd     |
-      # | 3rd     |
+      | 1st     |
+      | 2nd     |
+      | 3rd     |
 
   @v1.0.1 @locale @ordinals @i18n @gender @lang-de
   Scenario: Gendered German CSL 1.0.1 locales
@@ -196,7 +194,6 @@ Feature: Converting numbers to ordinals using CSL locales
             <single>e</single>
             <multiple>es</multiple>
           </term>
-
           <term name="ordinal-01" match="whole-number">
             <single>re</single>
             <multiple>res</multiple>
@@ -268,24 +265,23 @@ Feature: Converting numbers to ordinals using CSL locales
           
           <term name="ordinal-00" match="whole-number">de</term>
           
-          <term name="ordinal-02" match="2-digits">de</term>
-          <term name="ordinal-03" match="2-digits">de</term>
-          <term name="ordinal-04" match="2-digits">de</term>
-          <term name="ordinal-05" match="2-digits">de</term>
-          <term name="ordinal-06" match="2-digits">de</term>
-          <term name="ordinal-07" match="2-digits">de</term>
-          <term name="ordinal-09" match="2-digits">de</term>
-
-          <term name="ordinal-10" match="2-digits">de</term>
-          <term name="ordinal-11" match="2-digits">de</term>
-          <term name="ordinal-12" match="2-digits">de</term>
-          <term name="ordinal-13" match="2-digits">de</term>
-          <term name="ordinal-14" match="2-digits">de</term>
-          <term name="ordinal-15" match="2-digits">de</term>
-          <term name="ordinal-16" match="2-digits">de</term>
-          <term name="ordinal-17" match="2-digits">de</term>
-          <term name="ordinal-18" match="2-digits">de</term>
-          <term name="ordinal-19" match="2-digits">de</term>
+          <term name="ordinal-02" match="last-two-digits">de</term>
+          <term name="ordinal-03" match="last-two-digits">de</term>
+          <term name="ordinal-04" match="last-two-digits">de</term>
+          <term name="ordinal-05" match="last-two-digits">de</term>
+          <term name="ordinal-06" match="last-two-digits">de</term>
+          <term name="ordinal-07" match="last-two-digits">de</term>
+          <term name="ordinal-09" match="last-two-digits">de</term>
+          <term name="ordinal-10">de</term>
+          <term name="ordinal-11">de</term>
+          <term name="ordinal-12">de</term>
+          <term name="ordinal-13">de</term>
+          <term name="ordinal-14">de</term>
+          <term name="ordinal-15">de</term>
+          <term name="ordinal-16">de</term>
+          <term name="ordinal-17">de</term>
+          <term name="ordinal-18">de</term>
+          <term name="ordinal-19">de</term>
         </terms>
       </locale>
       """
@@ -375,24 +371,23 @@ Feature: Converting numbers to ordinals using CSL locales
         <terms>
           <term name="ordinal">ste</term>
 
-          <term name="ordinal-02" match="2-digits">de</term>
-          <term name="ordinal-03" match="2-digits">de</term>
-          <term name="ordinal-04" match="2-digits">de</term>
-          <term name="ordinal-05" match="2-digits">de</term>
-          <term name="ordinal-06" match="2-digits">de</term>
-          <term name="ordinal-07" match="2-digits">de</term>
-          <term name="ordinal-09" match="2-digits">de</term>
-
-          <term name="ordinal-10" match="2-digits">de</term>
-          <term name="ordinal-11" match="2-digits">de</term>
-          <term name="ordinal-12" match="2-digits">de</term>
-          <term name="ordinal-13" match="2-digits">de</term>
-          <term name="ordinal-14" match="2-digits">de</term>
-          <term name="ordinal-15" match="2-digits">de</term>
-          <term name="ordinal-16" match="2-digits">de</term>
-          <term name="ordinal-17" match="2-digits">de</term>
-          <term name="ordinal-18" match="2-digits">de</term>
-          <term name="ordinal-19" match="2-digits">de</term>
+          <term name="ordinal-02" match="last-two-digits">de</term>
+          <term name="ordinal-03" match="last-two-digits">de</term>
+          <term name="ordinal-04" match="last-two-digits">de</term>
+          <term name="ordinal-05" match="last-two-digits">de</term>
+          <term name="ordinal-06" match="last-two-digits">de</term>
+          <term name="ordinal-07" match="last-two-digits">de</term>
+          <term name="ordinal-09" match="last-two-digits">de</term>
+          <term name="ordinal-10">de</term>
+          <term name="ordinal-11">de</term>
+          <term name="ordinal-12">de</term>
+          <term name="ordinal-13">de</term>
+          <term name="ordinal-14">de</term>
+          <term name="ordinal-15">de</term>
+          <term name="ordinal-16">de</term>
+          <term name="ordinal-17">de</term>
+          <term name="ordinal-18">de</term>
+          <term name="ordinal-19">de</term>
         </terms>
       </locale>
       """
@@ -641,171 +636,3 @@ Feature: Converting numbers to ordinals using CSL locales
       | 21º     |
       | 21º     |
       | 1001º   |
-
-#   @v1.0.1 @locale @ordinals @i18n @gender @lang-sv
-#   Scenario: Gendered Swedish CSL 1.0.1 locales
-#     Given the locale:
-#       """
-#       <?xml version="1.0" encoding="utf-8"?>
-#       <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0.1" xml:lang="sv">
-#         <terms>
-#           <term name="ordinal-00">:e</term>
-#
-#           <term name="ordinal-01">:a</term>
-#           <term name="ordinal-01" gender-form="masculine">:e</term>
-#           <term name="ordinal-01" gender-form="feminine">:a</term>
-#
-#           <term name="ordinal-02">:a</term>
-#           <term name="ordinal-02" gender-form="masculine">:e</term>
-#           <term name="ordinal-02" gender-form="feminine">:a</term>
-#
-#           <term name="ordinal-11">:e</term>
-#           <term name="ordinal-11" gender-form="feminine">:e</term>
-#           <term name="ordinal-12">:e</term>
-#           <term name="ordinal-12" gender-form="feminine">:e</term>
-#
-#           <term name="ordinal-21">:e</term>
-#           <term name="ordinal-21" gender-form="feminine">:e</term>
-#           <term name="ordinal-22">:e</term>
-#           <term name="ordinal-22" gender-form="feminine">:e</term>
-#
-#           <term name="ordinal-31">:e</term>
-#           <term name="ordinal-32">:e</term>
-#
-#           <term name="ordinal-41">:e</term>
-#           <term name="ordinal-42">:e</term>
-#
-#           <term name="ordinal-51">:e</term>
-#           <term name="ordinal-52">:e</term>
-#
-#           <term name="ordinal-61">:e</term>
-#           <term name="ordinal-62">:e</term>
-#
-#           <term name="ordinal-71">:e</term>
-#           <term name="ordinal-72">:e</term>
-#
-#           <term name="ordinal-81">:e</term>
-#           <term name="ordinal-82">:e</term>
-#
-#           <term name="ordinal-91">:e</term>
-#           <term name="ordinal-92">:e</term>
-#         </terms>
-#       </locale>
-#       """
-#     When I ordinalize these numbers:
-#       | num   | form  | gender    | number   |
-#       | 0     |       |           |          |
-#       | 1     |       |           |          |
-#       | 2     |       |           |          |
-#       | 3     |       |           |          |
-#       | 4     |       |           |          |
-#       | 5     |       |           |          |
-#       | 6     |       |           |          |
-#       | 7     |       |           |          |
-#       | 8     |       |           |          |
-#       | 9     |       |           |          |
-#       | 10    |       |           |          |
-#       | 1     |       | feminine  |          |
-#       | 1     |       | masculine |          |
-#       | 2     |       | feminine  |          |
-#       | 2     |       | masculine |          |
-#       | 23    |       |           |          |
-#       | 999   |       |           |          |
-#       | 11    |       |           |          |
-#       | 11    |       | feminine  |          |
-#       | 11    |       | masculine |          |
-#       | 21    |       |           |          |
-# #      | 101   |       |           |          |
-# #      | 1001  |       | feminine  |          |
-# #      | 301   |       |           |          |
-#       | 21    |       | masculine | singular |
-#       | 21    |       | masculine | plural   |
-# #      | 1001  |       | masculine |          |
-#     Then the ordinals should be:
-#       | ordinal |
-#       | 0:e     |
-#       | 1:a     |
-#       | 2:a     |
-#       | 3:e     |
-#       | 4:e     |
-#       | 5:e     |
-#       | 6:e     |
-#       | 7:e     |
-#       | 8:e     |
-#       | 9:e     |
-#       | 10:e    |
-#       | 1:a     |
-#       | 1:e     |
-#       | 2:a     |
-#       | 2:e     |
-#       | 23:e    |
-#       | 999:e   |
-#       | 11:e    |
-#       | 11:e    |
-#       | 11:e    |
-#       | 21:e    |
-# #      | 101:e   |
-# #      | 1001:e  |
-# #      | 301:e   |
-#       | 21:e    |
-#       | 21:e    |
-# #      | 1001:e  |
-
-  # @v1.0.1 @locale @ordinals @i18n @gender @lang-pl
-  # Scenario: Gendered Polish CSL 1.0.1 locales
-  #   Given the locale:
-  #     """
-  #     <?xml version="1.0" encoding="utf-8"?>
-  #     <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0.1" xml:lang="pl">
-  #       <terms>
-  #         <term name="ordinal-00">:e</term>
-  #
-  #       </terms>
-  #     </locale>
-  #     """
-  #   When I ordinalize these numbers:
-  #     | num   | form  | gender    | number   |
-  #     | 0     |       |           |          |
-  #     | 1     |       |           |          |
-  #     | 2     |       |           |          |
-  #     | 3     |       |           |          |
-  #     | 4     |       |           |          |
-  #     | 5     |       |           |          |
-  #     | 6     |       |           |          |
-  #     | 7     |       |           |          |
-  #     | 8     |       |           |          |
-  #     | 9     |       |           |          |
-  #     | 10    |       |           |          |
-  #     | 1     |       | feminine  |          |
-  #     | 1     |       | masculine |          |
-  #     | 2     |       | feminine  |          |
-  #     | 2     |       | masculine |          |
-  #     | 23    |       |           |          |
-  #     | 999   |       |           |          |
-  #     | 11    |       |           |          |
-  #     | 11    |       | feminine  |          |
-  #     | 11    |       | masculine |          |
-  #     | 21    |       |           |          |
-    # Then the ordinals should be:
-    #   | ordinal |
-    #   | 0:e     |
-    #   | 1:a     |
-    #   | 2:a     |
-    #   | 3:e     |
-    #   | 4:e     |
-    #   | 5:e     |
-    #   | 6:e     |
-    #   | 7:e     |
-    #   | 8:e     |
-    #   | 9:e     |
-    #   | 10:e    |
-    #   | 1:a     |
-    #   | 1:e     |
-    #   | 2:a     |
-    #   | 2:e     |
-    #   | 23:e    |
-    #   | 999:e   |
-    #   | 11:e    |
-    #   | 11:e    |
-    #   | 11:e    |
-    #   | 21:e    |

data/features/step_definitions/locale_steps.rb

@@ -7,7 +7,7 @@ When /^I load the locale from the string$/ do |string|
 end
 
 When /^I ordinalize the number (\d+)(?: using the (long) form(?: and (feminine|masculine) gender))?$/ do |num, form, gender|
-  @ordinal = @locale.ordinalize(num, :form => form, :gender => gender)
+  @ordinal = @locale.ordinalize(num, :form => form, :'gender-form' => gender)
 end
 
 Then /^the ordinal should (?:be|equal) "([^"]*)"$/ do |ord|
@@ -17,7 +17,7 @@ end
 When /^I ordinalize these numbers:?$/ do |table|
   @ordinals = table.rows.map do |row|
     num, form, gender, number = *row
-    @csl.ordinalize(num, :form => form, :gender => gender, :number => number)
+    @csl.ordinalize(num, :form => form, :'gender-form' => gender, :number => number)
   end
 end
 

data/lib/csl.rb

@@ -25,7 +25,6 @@ require 'csl/node'
 require 'csl/info'
 
 require 'csl/locale'
-require 'csl/locale/ordinalize'
 require 'csl/locale/date'
 require 'csl/locale/term'
 require 'csl/locale/style_options'

data/lib/csl/locale.rb

@@ -202,6 +202,51 @@ module CSL
     end
     alias t translate
 
+    # Ordinalizes the passed-in number using either the ordinal or
+    # long-ordinal forms defined by the locale. If a long-ordinal form is
+    # requested but not available, the regular ordinal will be returned
+    # instead.
+    #
+    # @example
+    #   Locale.load('en').ordinalize(13)
+    #   #-> "13th"
+    #
+    #   de = Locale.load('de')
+    #   de.ordinalize(13)
+    #   #-> "13."
+    #
+    #   de.ordinalize(3, :form => :long, :gender => :feminine)
+    #   #-> "dritte"
+    #
+    # @note
+    #   For CSL 1.0 (and older) locales that do not define an "ordinal-00"
+    #   term the algorithm specified by CSL 1.0 is used; otherwise uses the
+    #   CSL 1.0.1 algorithm with improved support for languages other than
+    #   English.
+    #
+    # @param number [#to_i] the number to ordinalize
+    # @param options [Hash] formatting options
+    #
+    # @option options [:short,:long] :form (:short) which ordinals form to use
+    # @option options [:feminine,:masculine,:neutral] :gender (:neutral)
+    #   which ordinals gender-form to use
+    #
+    # @raise [ArgumentError] if number cannot be converted to an integer
+    #
+    # @return [String] the ordinal for the passed-in number
+    def ordinalize(number, options = {})
+      raise ArgumentError, "unable to ordinalize #{number}; integer expected" unless
+        number.respond_to?(:to_i)
+
+      number = number.to_i      
+      ordinal = terms.ordinalize number, options
+
+      return number.to_s if ordinal.nil?
+      return ordinal.to_s(options) if ordinal.long_ordinal?
+      
+      [number, ordinal.to_s(options)].join
+    end
+
     # @example
     #   locale.each_term { |term| block } #-> locale
     #   locale.each_term                  #-> enumerator

data/lib/csl/locale/term.rb

@@ -23,58 +23,107 @@ module CSL
 
       # @return [Term, nil] the first term that matches the query
       def lookup(name, options = {})
+        options = Term.specialize(options)
         options[:name] = name = name.to_s
 
-        # specialize search conditions
-        conditions = options.select { |k,_| Term::Attributes.keys.include?(k.to_sym) }
+        term = registry[name].detect { |t| t.match?(options) }
+        return term unless term.nil? && options.delete(:'gender-form')
 
-        term = registry[name].detect { |t| t.match?(conditions) }
-        return term unless term.nil? && conditions.delete(:'gender-form')
-
-        registry[name].detect { |t| t.match?(conditions) }
+        registry[name].detect { |t| t.match?(options) }
       end
       alias [] lookup
 
-      def ordinalize_modulo(number, divisor, options = {})
-        ordinal = ordinalize(number, options)
-        return unless ordinal && ordinal.match_modulo?(divisor)
-        ordinal
-      end
-
       def ordinalize(number, options = {})
         return unless has_ordinals?
 
-        if number == :default
-          options[:name] = 'ordinal'
+        options = Term.specialize(options)
+        number = number.to_i.abs
+
+        # try to match long-ordinals first
+        if options.delete(:form).to_s =~ /^long/i
+          ordinal = lookup_long_ordinal_for number, options
+          return ordinal unless ordinal.nil?
+        end
+
+        # select CSL 1.0 or 1.0.1 algorithm
+        algorithm = ordinalizer
+
+        ordinal = send algorithm, number, options
+        return ordinal unless ordinal.nil?
+
+        # fallback to non-gendered version
+        if options.delete(:'gender-form')
+          ordinal = send algorithm, number, options
+        end
+
+        ordinal
+      end
+
+      def ordinalizer
+        if has_legacy_ordinals?
+          :lookup_legacy_ordinals_for
         else
-          options[:name] = 'ordinal-%02d' % number
+          :lookup_ordinals_for
+        end
+      end
+
+      def lookup_long_ordinal_for(number, options = {})
+        ordinals[number].detect { |t| t.long_ordinal? && t.match?(options) }
+      end
+
+      def lookup_ordinals_for(number, options = {})
+        ordinal = lookup_ordinal_for(number, nil, options)
+        return ordinal unless ordinal.nil?
+
+        unless number < 100
+          ordinal = lookup_ordinal_for(number, 100, options)
+          return ordinal unless ordinal.nil?
         end
 
-        if options[:form].to_s =~ /^long/i
-          options.delete :form
-          options[:name][0,0] = 'long-'
+        unless number < 10
+          ordinal = lookup_ordinal_for(number, 10, options)
+          return ordinal unless ordinal.nil?
         end
 
-        ordinal = ordinals[number].detect { |t| t.match?(options) }
-        return ordinal unless ordinal.nil? && options.delete(:'gender-form')
+        default_ordinals.detect { |t| t.match?(options) }
+      end
+
+      def lookup_ordinal_for(number, divisor, options = {})
+        modulus = divisor ? (number % divisor) : number
+        ordinals[modulus].detect do |t|
+          t.short_ordinal? && t.match?(options) && t.match_modulo?(number)
+        end
+      end
 
-        ordinals[number].detect { |t| t.match?(options) }
+      def lookup_legacy_ordinals_for(number, options = {})
+        case
+        when (11..13).include?(number.abs % 100)
+          ordinals[4].detect { |t| t.match?(options) }
+        when (1..3).include?(number.abs % 10)
+          ordinals[number.abs % 10].detect { |t| t.match?(options) }
+        else
+          ordinals[4].detect { |t| t.match?(options) }
+        end
       end
 
       # @return [Boolean] whether or not regular terms are registered at this node
       def has_terms?
-        not registry.empty?
+        !registry.empty?
       end
 
       # @return [Boolean] whether or not ordinal terms are registered at this node
       def has_ordinals?
-        not ordinals.empty?
+        !ordinals.empty?
       end
 
       def has_legacy_ordinals?
         has_ordinals? && !ordinals.key?(:default)
       end
 
+      def default_ordinals
+        ordinals[:default]
+      end
+
       def drop_ordinals
         tmp = ordinals.values.flatten(1)
         ordinals.clear
@@ -128,25 +177,39 @@ module CSL
 
       def_delegators :attributes, :hash, :eql?, :name, :form, :gender
 
+      class << self
+        def specialize(options)
+          options = options.select do |k,v|
+            !v.nil? && Term::Attributes.keys.include?(k.to_sym)
+          end
+
+          options.delete :'gender-form' unless
+            options[:'gender-form'].to_s =~ /^masculine|feminine$/
+
+          options
+        end
+      end
+
       # This method returns whether or not the ordinal term matchs the
       # passed-in modulus. This is determined by the ordinal term's match
-      # attribute: a value of '2-digits' matches a divisor of 100, '1-digit'
-      # matches a divisor of 10 and 'whole-number' matches a divisor of 1.
+      # attribute: a value of 'last-two-digits' matches a modulus of 100,
+      # 'last-digit' matches a modulus of 10 and 'whole-number' matches
+      # only if the number is identical to the ordinal value.
       #
       # If the term is no ordinal term, this methods always returns false.
       #
       # @return [Boolean] whether or not the ordinal term matches the
-      #   passed-in divisor.
-      def match_modulo?(divisor)
+      #   passed-in number.
+      def match_modulo?(number)
         return false unless ordinal?
 
         case attributes.match
-        when '2-digits'
-          divisor.to_i == 100
-        when '1-digit'
-          divisor.to_i == 10
+        when 'last-two-digits'
+          ordinal == number % 100
+        when 'last-digit'
+          ordinal == number % 10
         when 'whole-number'
-          divisor.to_i == 1
+          ordinal == number
         else
           true
         end
@@ -158,13 +221,27 @@ module CSL
         /^(long-)?ordinal(-\d\d+)?$/ === attributes.name
       end
 
+      # @return [Boolean] whether or not this term is a long-ordinal term
+      def long_ordinal?
+        /^long-ordinal(-\d\d+)?$/ === attributes.name
+      end
+
+      # @return [Boolean] whether or not this term is a regular ordinal term
+      def short_ordinal?
+        /^ordinal(-\d\d+)?$/ === attributes.name
+      end
+
+      def default_ordinal?
+        attributes.name == 'ordinal'
+      end
+
       # @return [Fixnum, :default, nil]
       def ordinal
         return unless ordinal?
         return :default if attributes.name == 'ordinal'
         attributes.name[/\d+/].to_i
       end
-
+      
       def gendered?
         !attributes.gender.blank?
       end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre12'.freeze
+  VERSION = '1.0.0.pre13'.freeze
 end

data/spec/csl/locale/term_spec.rb

@@ -81,6 +81,10 @@ module CSL
 
     it { should be_neutral }
 
+    it { should_not be_ordinal }
+    it { should_not be_short_ordinal }
+    it { should_not be_long_ordinal }
+
 		it 'is not a textnode by default' do
 			subject.should_not be_textnode
 		end

data/spec/fixtures/locales/locales-de-DE.xml

@@ -22,7 +22,7 @@
     <term name="anonymous">ohne Autor</term>
     <term name="anonymous" form="short">o. A.</term>
     <term name="at">auf</term>
-    <term name="available at">available at</term>
+    <term name="available at">verfügbar unter</term>
     <term name="by">von</term>
     <term name="circa">circa</term>
     <term name="circa" form="short">ca.</term>
@@ -54,8 +54,8 @@
       <multiple>Ref.</multiple>
     </term>
     <term name="retrieved">abgerufen</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="scale">Maßstab</term>
+    <term name="version">Version</term>
 
     <!-- ANNO DOMINI; BEFORE CHRIST -->
     <term name="ad">n. Chr.</term>
@@ -190,13 +190,9 @@
     </term>
 
     <!-- LONG ROLE FORMS -->
-    <term name="author">
-      <single/>
-      <multiple/>
-    </term>
     <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
+      <single>Regisseur</single>
+      <multiple>Regisseure</multiple>
     </term>
     <term name="editor">
       <single>Herausgeber</single>
@@ -207,8 +203,8 @@
       <multiple>Herausgeber</multiple>
     </term>
     <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
+      <single>Illustrator</single>
+      <multiple>illustratoren</multiple>
     </term>
     <term name="translator">
       <single>Übersetzer</single>
@@ -220,13 +216,9 @@
     </term>
 
     <!-- SHORT ROLE FORMS -->
-    <term name="author" form="short">
-      <single/>
-      <multiple/>
-    </term>
     <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
+      <single>Reg.</single>
+      <multiple>Reg..</multiple>
     </term>
     <term name="editor" form="short">
       <single>Hrsg.</single>
@@ -237,8 +229,8 @@
       <multiple>Hrsg.</multiple>
     </term>
     <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
+      <single>Ill.</single>
+      <multiple>Ill.</multiple>
     </term>
     <term name="translator" form="short">
       <single>Übers.</single>
@@ -253,19 +245,19 @@
     <term name="director" form="verb">directed by</term>
     <term name="editor" form="verb">herausgegeben von</term>
     <term name="editorial-director" form="verb">herausgegeben von</term>
-    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="illustrator" form="verb">illustriert von</term>
     <term name="interviewer" form="verb">interviewt von</term>
     <term name="recipient" form="verb">an</term>
-    <term name="reviewed-author" form="verb">by</term>
+    <term name="reviewed-author" form="verb">von</term>
     <term name="translator" form="verb">übersetzt von</term>
     <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>
 
     <!-- SHORT VERB ROLE FORMS -->
     <term name="container-author" form="verb-short">von</term>
-    <term name="director" form="verb-short">dir.</term>
+    <term name="director" form="verb-short">Reg.</term>
     <term name="editor" form="verb-short">hg. von</term>
     <term name="editorial-director" form="verb-short">hg. von</term>
-    <term name="illustrator" form="verb-short">illus.</term>
+    <term name="illustrator" form="verb-short">illus. von</term>
     <term name="translator" form="verb-short">übers. von</term>
     <term name="editortranslator" form="verb-short">hg. &amp; übers. von</term>
 

data/spec/fixtures/locales/locales-en-GB.xml

@@ -196,10 +196,6 @@
     </term>
 
     <!-- LONG ROLE FORMS -->
-    <term name="author">
-      <single/>
-      <multiple/>
-    </term>
     <term name="director">
       <single>director</single>
       <multiple>directors</multiple>
@@ -226,10 +222,6 @@
     </term>
 
     <!-- SHORT ROLE FORMS -->
-    <term name="author" form="short">
-      <single/>
-      <multiple/>
-    </term>
     <term name="director" form="short">
       <single>dir.</single>
       <multiple>dirs.</multiple>
@@ -268,11 +260,11 @@
 
     <!-- SHORT VERB ROLE FORMS -->
     <term name="container-author" form="verb-short">by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
-    <term name="translator" form="verb-short">trans.</term>
+    <term name="director" form="verb-short">dir. by</term>
+    <term name="editor" form="verb-short">ed. by</term>
+    <term name="editorial-director" form="verb-short">ed. by</term>
+    <term name="illustrator" form="verb-short">illus. by</term>
+    <term name="translator" form="verb-short">trans. by</term>
     <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
 
     <!-- LONG MONTH FORMS -->

data/spec/fixtures/locales/locales-en-US.xml

@@ -7,7 +7,7 @@
   <style-options punctuation-in-quote="true"/>
   <date form="text">
     <date-part name="month" suffix=" "/>
-    <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
+    <date-part name="day" suffix=", "/>
     <date-part name="year"/>
   </date>
   <date form="numeric">
@@ -196,10 +196,6 @@
     </term>
 
     <!-- LONG ROLE FORMS -->
-    <term name="author">
-      <single/>
-      <multiple/>
-    </term>
     <term name="director">
       <single>director</single>
       <multiple>directors</multiple>
@@ -226,10 +222,6 @@
     </term>
 
     <!-- SHORT ROLE FORMS -->
-    <term name="author" form="short">
-      <single/>
-      <multiple/>
-    </term>
     <term name="director" form="short">
       <single>dir.</single>
       <multiple>dirs.</multiple>
@@ -268,11 +260,11 @@
 
     <!-- SHORT VERB ROLE FORMS -->
     <term name="container-author" form="verb-short">by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
-    <term name="translator" form="verb-short">trans.</term>
+    <term name="director" form="verb-short">dir. by</term>
+    <term name="editor" form="verb-short">ed. by</term>
+    <term name="editorial-director" form="verb-short">ed. by</term>
+    <term name="illustrator" form="verb-short">illus. by</term>
+    <term name="translator" form="verb-short">trans. by</term>
     <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
 
     <!-- LONG MONTH FORMS -->

data/spec/fixtures/styles/apa.csl

@@ -27,11 +27,15 @@
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2012-09-04T02:31:02+00:00</updated>
-    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+    <updated>2012-09-27T22:06:38+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
     <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
       <term name="translator" form="short">
         <single>trans.</single>
         <multiple>trans.</multiple>
@@ -41,12 +45,9 @@
   <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <names variable="editor" delimiter=", " suffix=", ">
+        <names variable="editor translator" delimiter=", " suffix=", ">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
-          <substitute>
-            <names variable="translator"/>
-          </substitute>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
         </names>
       </if>
     </choose>
@@ -54,12 +55,9 @@
   <macro name="secondary-contributors">
     <choose>
       <if type="chapter paper-conference" match="none">
-        <names variable="translator" delimiter=", " prefix=" (" suffix=")">
+        <names variable="translator editor" delimiter=", " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix=""/>
-          <substitute>
-            <names variable="editor"/>
-          </substitute>
+          <label form="short" prefix=", " text-case="title" suffix=""/>
         </names>
       </if>
     </choose>
@@ -67,7 +65,7 @@
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -136,11 +134,7 @@
                 <group delimiter=" ">
                   <text term="retrieved" text-case="capitalize-first" suffix=" "/>
                   <group>
-                    <date variable="accessed" suffix=", ">
-                      <date-part name="month" suffix=" "/>
-                      <date-part name="day" suffix=", "/>
-                      <date-part name="year"/>
-                    </date>
+                    <date variable="accessed" form="text" suffix=", "/>
                   </group>
                   <text term="from"/>
                   <text variable="URL"/>
@@ -293,7 +287,7 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short" suffix="." strip-periods="true"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
       <else>
@@ -322,11 +316,11 @@
         <group prefix=" (" suffix=")" delimiter=", ">
           <text macro="edition"/>
           <group>
-            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
             <number variable="number-of-volumes" form="numeric" prefix="1-"/>
           </group>
           <group>
-            <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
             <number variable="volume" form="numeric"/>
           </group>
           <group>
@@ -338,11 +332,7 @@
       <else-if type="legal_case">
         <group prefix=" (" suffix=")" delimiter=" ">
           <text variable="authority"/>
-          <date variable="issued" delimiter=" ">
-            <date-part name="month" form="short"/>
-            <date-part name="day" suffix=","/>
-            <date-part name="year"/>
-          </date>
+          <date variable="issued" form="text"/>
         </group>
       </else-if>
       <else-if type="bill legislation">
@@ -354,16 +344,23 @@
   </macro>
   <macro name="citation-locator">
     <group>
-      <label variable="locator" form="short"/>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" form="long" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
   <macro name="container">
     <group>
       <choose>
-	<if type="chapter paper-conference entry-encyclopedia" match="any">
-	  <text term="in" text-case="capitalize-first" suffix=" "/>
-	</if>
+        <if type="chapter paper-conference entry-encyclopedia" match="any">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+        </if>
       </choose>
       <text macro="container-contributors"/>
       <text macro="secondary-contributors"/>
@@ -382,7 +379,7 @@
               <text variable="volume"/>
               <text variable="container-title"/>
               <group delimiter=" ">
-		<!--change to label variable="section" as that becomes available -->
+                <!--change to label variable="section" as that becomes available -->
                 <text term="section" form="symbol"/>
                 <text variable="section"/>
               </group>
@@ -396,7 +393,7 @@
                 <else>
                   <text variable="number" prefix="Pub. L. No. "/>
                   <group delimiter=" ">
-		    <!--change to label variable="section" as that becomes available -->
+                    <!--change to label variable="section" as that becomes available -->
                     <text term="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
@@ -432,7 +429,7 @@
           <text macro="author"/>
           <text macro="issued"/>
           <text macro="title" prefix=" "/>
-	  <text macro="container"/>
+          <text macro="container"/>
         </group>
         <text macro="locators"/>
         <group delimiter=", " prefix=". ">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre12
+  version: 1.0.0.pre13
   prerelease: 6
 platform: ruby
 authors:
@@ -115,7 +115,6 @@ files:
 - lib/csl/loader.rb
 - lib/csl/locale.rb
 - lib/csl/locale/date.rb
-- lib/csl/locale/ordinalize.rb
 - lib/csl/locale/style_options.rb
 - lib/csl/locale/term.rb
 - lib/csl/node.rb
@@ -183,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1070711312713509519
+      hash: -2590038154395651463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/csl/locale/ordinalize.rb

@@ -1,137 +0,0 @@
-module CSL
-  class Locale
-    
-    # Ordinalizes the passed-in number using either the ordinal or
-    # long-ordinal forms defined by the locale. If a long-ordinal form is
-    # requested but not available, the regular ordinal will be returned
-    # instead.
-    #
-    # @example
-    #   Locale.load('en').ordinalize(13)
-    #   #-> "13th"
-    #
-    #   de = Locale.load('de')
-    #   de.ordinalize(13)
-    #   #-> "13."
-    #
-    #   de.ordinalize(3, :form => :long, :gender => :feminine)
-    #   #-> "dritte"
-    #
-    # @note
-    #   For CSL 1.0 (and older) locales that do not define an "ordinal-00"
-    #   term the algorithm specified by CSL 1.0 is used; otherwise uses the
-    #   CSL 1.0.1 algorithm with improved support for languages other than
-    #   English.
-    #
-    # @param number [#to_i] the number to ordinalize
-    # @param options [Hash] formatting options
-    #
-    # @option options [:short,:long] :form (:short) which ordinals form to use
-    # @option options [:feminine,:masculine,:neutral] :gender (:neutral)
-    #   which ordinals gender-form to use
-    #
-    # @raise [ArgumentError] if number cannot be converted to an integer
-    #
-    # @return [String] the ordinal for the passed-in number
-    def ordinalize(number, options = {})
-      raise ArgumentError, "unable to ordinalize #{number}; integer expected" unless
-        number.respond_to?(:to_i)
-
-      number = number.to_i
-      
-      
-
-      key = query[:name]
-
-      # Try to match long-ordinals first
-      if key.start_with?('l')
-        query[:name] = key % number.abs
-        ordinal = terms[query]
-
-        if ordinal.nil?
-          key = 'ordinal-%02d'
-        else
-          return ordinal.to_s(options)
-        end
-      end
-
-      # CSL 1.0 (legacy algorithm)      
-      return legacy_ordinalize(number) if legacy?
-
-      #
-      # CSL 1.0.1
-      #
-
-      # Calculate initial modulus
-      mod = 10 ** Math.log10([number.abs, 1].max).to_i
-
-      # Try to find direct match first
-      query.merge! :name => key % number.abs
-      ordinal = terms[query]
-
-      # Try to match modulus of number, dividing mod by 10 at each
-      # iteration until a match is found
-      while ordinal.nil? && mod > 1
-        query.merge! :name => key % (number.abs % mod)        
-        ordinal = terms.lookup_modulo(query, mod)
-
-        mod = mod / 10
-      end
-
-      # If we have not found a match at this point, we try to match
-      # the default ordinal instead
-      if ordinal.nil?
-        query[:name] = 'ordinal'
-        ordinal = terms[query]
-        
-        if ordinal.nil? && query.key?(:'gender-form')
-          query.delete(:'gender-form')
-          ordinal = terms[query]
-        end
-      end
-      
-      if ordinal.nil?
-        number.to_s
-      else
-        [number, ordinal.to_s(options)].join
-      end
-    end
-    
-    private
-    
-    def normalize_gender_options(options)
-      gender = (options[:'gender-form'] || options[:gender]).to_s
-      unless gender.empty? || gender =~ /^n/i
-        q[:'gender-form'] = (gender =~ /^m/i) ? 'masculine' : 'feminine'
-      end
-    end
-
-    def normalize_plural_options(options)
-    end
-    
-    def ordinalize_options_for(options)
-      q = { :name => 'ordinal-%02d' }
-
-      unless options.nil?
-        if options.key?(:form) && options[:form].to_s =~ /^long(-ordinal)?$/i
-          q[:name] = 'long-ordinal-%02d'
-        end
-
-      end
-
-      q
-    end
-
-    def legacy_ordinalize(number)
-      case
-      when (11..13).include?(number.abs % 100)
-        [number, terms['ordinal-04']].join
-      when (1..3).include?(number.abs % 10)
-        [number, terms['ordinal-%02d' % (number.abs % 10)]].join
-      else
-        [number, terms['ordinal-04']].join
-      end
-    end
-    
-  end
-end