bibtex-ruby 1.3.6 → 1.3.7

data/lib/bibtex/name_parser.rb

@@ -11,7 +11,7 @@ require 'strscan'
 module BibTeX
   class NameParser < Racc::Parser
 
-module_eval(<<'...end names.y/module_eval...', 'names.y', 80)
+module_eval(<<'...end names.y/module_eval...', 'names.y', 78)
   
   def initialize(options = {})
     self.options.merge!(options)
@@ -134,48 +134,54 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 80)
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -13,   -28,   -10,   -13,   -30,    24,   -13,   -28,   -29,   -13,
-   -30,   -28,    19,    -9,   -29,    36,    14,   -28,   -11,    22,
-    35,    23,    22,    20,    23,    11,    18,    12,    33,    32,
-    34,    22,    35,    23,    22,    26,    23,    33,    32,    34,
-    33,    32,    34,    11,     7,    12,    11,     7,    12,    13 ]
+   -15,   -27,   -15,   -29,    27,   -28,   -15,   -27,   -27,   -29,
+   -15,   -28,    36,    24,   -27,    34,    33,    35,    21,    19,
+    22,    10,    16,    11,    34,    33,    35,    34,    33,    35,
+    10,     8,    11,    21,    28,    22,    34,    33,    35,    34,
+    33,    35,    10,     8,    11,    21,    19,    22,    38,    23,
+    13,    12 ]
 
 racc_action_check = [
-    20,    18,    20,    26,    12,    13,    20,    18,    11,    26,
-    12,     7,     6,     7,    11,    29,     2,     7,    21,    21,
-    21,    21,     8,     8,     8,     5,     5,     5,    31,    31,
-    31,    27,    27,    27,    16,    16,    16,    36,    36,    36,
-    19,    19,    19,     0,     0,     0,    14,    14,    14,     1 ]
+    19,    16,    19,    11,    18,    10,    19,    16,     8,    11,
+     8,    10,    26,    12,     8,    32,    32,    32,     6,     6,
+     6,     5,     5,     5,    36,    36,    36,    27,    27,    27,
+    13,    13,    13,    20,    20,    20,    38,    38,    38,    23,
+    23,    23,     0,     0,     0,    15,    15,    15,    30,     7,
+     2,     1 ]
 
 racc_action_pointer = [
-    40,    49,    10,   nil,   nil,    22,    10,    11,    19,   nil,
-   nil,     8,     4,     5,    43,   nil,    31,   nil,     1,    37,
-     0,    16,   nil,   nil,   nil,   nil,     3,    28,   nil,    13,
-   nil,    25,   nil,   nil,   nil,   nil,    34,   nil,   nil ]
+    39,    51,    44,   nil,   nil,    18,    15,    47,     8,   nil,
+     5,     3,    13,    27,   nil,    42,     1,   nil,     2,     0,
+    30,   nil,   nil,    36,   nil,   nil,    10,    24,   nil,   nil,
+    46,   nil,    12,   nil,   nil,   nil,    21,   nil,    33,   nil,
+   nil,   nil ]
 
 racc_action_default = [
-    -1,   -31,    -2,    -3,    -5,    -8,   -31,   -21,   -31,   -12,
-   -17,   -19,   -20,   -31,   -31,    -6,   -31,   -18,   -21,   -26,
-   -23,   -14,   -19,   -20,    39,    -4,   -23,   -14,    -7,   -15,
-   -24,   -27,   -28,   -29,   -30,   -22,   -26,   -25,   -16 ]
+    -1,   -30,    -2,    -3,    -5,   -16,   -30,   -30,   -12,   -19,
+   -21,   -22,   -30,   -30,    -6,   -30,   -12,   -20,    -8,   -13,
+   -16,   -21,   -22,   -25,    42,    -4,    -7,   -25,   -14,    -9,
+   -17,   -23,   -26,   -27,   -28,   -29,   -25,   -10,   -25,   -24,
+   -11,   -18 ]
 
 racc_goto_table = [
-    17,    29,    30,     3,    21,    28,    16,    15,     2,     1,
-   nil,   nil,    27,   nil,    37,   nil,    17,    25,    38,    30,
-   nil,   nil,    17 ]
+     4,    17,     3,    20,    29,    14,    15,     2,    37,    18,
+    41,     1,    20,     4,   nil,    25,    17,    40,    26,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    39 ]
 
 racc_goto_check = [
-    11,    10,     9,     3,     5,     7,     8,     4,     2,     1,
-   nil,   nil,     5,   nil,     9,   nil,    11,     3,    10,     9,
-   nil,   nil,    11 ]
+     4,    10,     3,     5,     8,     4,     6,     2,     8,     7,
+     9,     1,     5,     4,   nil,     3,    10,     8,     7,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     4 ]
 
 racc_goto_pointer = [
-   nil,     9,     8,     3,     2,    -4,   nil,   -14,     1,   -17,
-   -18,    -5,   nil ]
+   nil,    11,     7,     2,     0,    -3,     1,     3,   -19,   -28,
+    -4,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,     4,     5,     6,   nil,     8,     9,
-   nil,    10,    31 ]
+   nil,   nil,   nil,   nil,    31,     5,     6,     7,   nil,    30,
+     9,    32 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -186,33 +192,32 @@ racc_reduce_table = [
   1, 11, :_reduce_5,
   2, 11, :_reduce_6,
   3, 11, :_reduce_7,
-  1, 14, :_reduce_8,
-  1, 14, :_reduce_9,
-  2, 14, :_reduce_10,
-  2, 14, :_reduce_11,
-  1, 12, :_reduce_12,
-  2, 12, :_reduce_13,
-  2, 12, :_reduce_14,
+  2, 11, :_reduce_8,
+  3, 11, :_reduce_9,
+  4, 11, :_reduce_10,
+  5, 11, :_reduce_11,
+  1, 14, :_reduce_12,
+  2, 14, :_reduce_13,
+  3, 14, :_reduce_14,
   1, 15, :_reduce_15,
-  3, 15, :_reduce_16,
-  1, 13, :_reduce_17,
-  2, 13, :_reduce_18,
-  1, 19, :_reduce_19,
-  1, 19, :_reduce_20,
-  1, 16, :_reduce_21,
-  3, 16, :_reduce_22,
-  2, 16, :_reduce_23,
-  1, 20, :_reduce_24,
-  2, 20, :_reduce_25,
-  0, 18, :_reduce_26,
-  1, 18, :_reduce_27,
-  1, 17, :_reduce_28,
-  1, 17, :_reduce_29,
-  1, 17, :_reduce_30 ]
-
-racc_reduce_n = 31
-
-racc_shift_n = 39
+  1, 15, :_reduce_16,
+  1, 16, :_reduce_17,
+  3, 16, :_reduce_18,
+  1, 13, :_reduce_19,
+  2, 13, :_reduce_20,
+  1, 18, :_reduce_21,
+  1, 18, :_reduce_22,
+  1, 19, :_reduce_23,
+  2, 19, :_reduce_24,
+  0, 17, :_reduce_25,
+  1, 17, :_reduce_26,
+  1, 12, :_reduce_27,
+  1, 12, :_reduce_28,
+  1, 12, :_reduce_29 ]
+
+racc_reduce_n = 30
+
+racc_shift_n = 42
 
 racc_token_table = {
   false => 0,
@@ -257,12 +262,11 @@ Racc_token_to_s_table = [
   "result",
   "names",
   "name",
-  "last",
+  "word",
   "u_words",
-  "sort",
-  "first",
   "von",
-  "word",
+  "last",
+  "first",
   "opt_words",
   "u_word",
   "words" ]
@@ -303,154 +307,154 @@ module_eval(<<'.,.,', 'names.y', 35)
 
 module_eval(<<'.,.,', 'names.y', 37)
   def _reduce_5(val, _values, result)
-     result = Name.new(:von => val[0][0], :last => val[0][1]) 
+     result = Name.new(:last => val[0]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'names.y', 38)
   def _reduce_6(val, _values, result)
-     result = Name.new(:first => val[0], :von => val[1][0], :last => val[1][1]) 
+     result = Name.new(:first => val[0], :last => val[1]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'names.y', 39)
   def _reduce_7(val, _values, result)
-     result = Name.new(:von => val[0][0], :last => val[0][1], :jr => val[2][0], :first => val[2][1]) 
+     result = Name.new(:first => val[0], :von => val[1], :last => val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 41)
+module_eval(<<'.,.,', 'names.y', 40)
   def _reduce_8(val, _values, result)
-     result = [nil,val[0]]
+     result = Name.new(:von => val[0], :last => val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 42)
+module_eval(<<'.,.,', 'names.y', 41)
   def _reduce_9(val, _values, result)
-     result = [nil,val[0]]
+     result = Name.new(:last => val[0], :jr => val[2][0], :first => val[2][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 43)
+module_eval(<<'.,.,', 'names.y', 42)
   def _reduce_10(val, _values, result)
-     result = [val[0],val[1]]
+     result = Name.new(:von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 44)
+module_eval(<<'.,.,', 'names.y', 43)
   def _reduce_11(val, _values, result)
-     result = [val[0],val[1]]
+     result = Name.new(:von => val[0,2].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 46)
+module_eval(<<'.,.,', 'names.y', 45)
   def _reduce_12(val, _values, result)
-     result = [nil,val[0]]
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 47)
+module_eval(<<'.,.,', 'names.y', 46)
   def _reduce_13(val, _values, result)
-     result = [val[0],val[1]]
+     result = val.join(' ') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 48)
+module_eval(<<'.,.,', 'names.y', 47)
   def _reduce_14(val, _values, result)
-     result = [val[0],val[1]]
+     result = val.join(' ') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 50)
+module_eval(<<'.,.,', 'names.y', 49)
   def _reduce_15(val, _values, result)
-     result = [nil,val[0]] 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 51)
+module_eval(<<'.,.,', 'names.y', 50)
   def _reduce_16(val, _values, result)
-     result = [val[0],val[2]] 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 53)
+module_eval(<<'.,.,', 'names.y', 52)
   def _reduce_17(val, _values, result)
-     result = val[0] 
+     result = [nil,val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 54)
+module_eval(<<'.,.,', 'names.y', 53)
   def _reduce_18(val, _values, result)
-     result = val[0,2].join(' ') 
+     result = [val[0],val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 56)
+module_eval(<<'.,.,', 'names.y', 55)
   def _reduce_19(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 57)
+module_eval(<<'.,.,', 'names.y', 56)
   def _reduce_20(val, _values, result)
-     result = val[0] 
+     result = val[0,2].join(' ') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 59)
+module_eval(<<'.,.,', 'names.y', 58)
   def _reduce_21(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 60)
+module_eval(<<'.,.,', 'names.y', 59)
   def _reduce_22(val, _values, result)
-     result = val[0,3].join(' ') 
+     result = val[0] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'names.y', 61)
   def _reduce_23(val, _values, result)
-     result = val[0,2].join(' ') 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 63)
+module_eval(<<'.,.,', 'names.y', 62)
   def _reduce_24(val, _values, result)
-     result = val[0] 
+     result = val[0,2].join(' ') 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'names.y', 64)
   def _reduce_25(val, _values, result)
-     result = val[0,2].join(' ') 
+     result = nil 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 66)
+module_eval(<<'.,.,', 'names.y', 65)
   def _reduce_26(val, _values, result)
-     result = nil 
+     result = val[0] 
     result
   end
 .,.,
@@ -462,27 +466,20 @@ module_eval(<<'.,.,', 'names.y', 67)
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 69)
+module_eval(<<'.,.,', 'names.y', 68)
   def _reduce_28(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 70)
+module_eval(<<'.,.,', 'names.y', 69)
   def _reduce_29(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 71)
-  def _reduce_30(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
-
 def _reduce_none(val, _values, result)
   val[0]
 end

data/lib/bibtex/names.rb

@@ -154,7 +154,7 @@ module BibTeX
       hash['family'] = family unless family.nil?
       hash['given'] = given unless given.nil?
       hash['suffix'] = suffix unless suffix.nil?
-      hash['dropping-particle'] = prefix unless prefix.nil?
+      hash[options[:particle] || 'dropping-particle'] = prefix unless prefix.nil?
       hash
     end
     

data/lib/bibtex/names.y

@@ -35,18 +35,20 @@ rule
   names : name                       { result = [val[0]] }
         | names AND name             { result << val[2] }
   
-  name : last                        { result = Name.new(:von => val[0][0], :last => val[0][1]) }
-       | u_words last                { result = Name.new(:first => val[0], :von => val[1][0], :last => val[1][1]) }
-       | sort COMMA first            { result = Name.new(:von => val[0][0], :last => val[0][1], :jr => val[2][0], :first => val[2][1]) }
-  
-  sort : u_words                     { result = [nil,val[0]]}
-       | LWORD                       { result = [nil,val[0]]}
-       | von LWORD                   { result = [val[0],val[1]]}
-       | von u_words                 { result = [val[0],val[1]]}
-  
-  last : word                        { result = [nil,val[0]]}
-       | von LWORD                   { result = [val[0],val[1]]}
-       | von u_words                 { result = [val[0],val[1]]}
+	name : word                          { result = Name.new(:last => val[0]) }
+       | u_words word                  { result = Name.new(:first => val[0], :last => val[1]) }
+       | u_words von last              { result = Name.new(:first => val[0], :von => val[1], :last => val[2]) }
+       | von last                      { result = Name.new(:von => val[0], :last => val[1]) }
+       | last COMMA first              { result = Name.new(:last => val[0], :jr => val[2][0], :first => val[2][1]) }
+       | von last COMMA first          { result = Name.new(:von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1]) }
+       | u_words von last COMMA first  { result = Name.new(:von => val[0,2].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1]) }
+
+  von : LWORD                        { result = val[0] }
+      | von LWORD                    { result = val.join(' ') }
+      | von u_words LWORD            { result = val.join(' ') }
+
+	last : LWORD                       { result = val[0] }
+	     | u_words                     { result = val[0] }
   
   first : opt_words                  { result = [nil,val[0]] }
         | opt_words COMMA opt_words  { result = [val[0],val[2]] }
@@ -57,10 +59,6 @@ rule
   u_word : UWORD                     { result = val[0] }
          | PWORD                     { result = val[0] }
 
-  von : LWORD                        { result = val[0] }
-      | von u_words LWORD            { result = val[0,3].join(' ') }
-      | von LWORD                    { result = val[0,2].join(' ') }
-    
   words : word                       { result = val[0] }
         | words word                 { result = val[0,2].join(' ') }
 

data/lib/bibtex/version.rb

@@ -18,6 +18,6 @@
 
 module BibTeX
   module Version
-    STRING = '1.3.6'.freeze
+    STRING = '1.3.7'.freeze
   end
 end

data/test/bibtex/test_entry.rb

@@ -73,6 +73,25 @@ module BibTeX
         assert_equal 'Melville', e['author'][0]['family']
       end
     end
+
+    context 'citeproc export' do
+      setup do
+        @entry = Entry.new do |e|
+          e.type = :book
+          e.key = :key
+          e.author = 'van Beethoven, Ludwig'
+          e.parse_names
+        end
+      end
+      
+      should 'use dropping-particle by default' do
+        assert_equal 'van', @entry.to_citeproc['author'][0]['dropping-particle']
+      end
+      
+      should 'accept option to use non-dropping-particle' do
+        assert_equal 'van', @entry.to_citeproc(:particle => 'non-dropping-particle')['author'][0]['non-dropping-particle']
+      end
+    end
     
     def test_simple
       bib = BibTeX::Bibliography.open(Test.fixtures(:entry), :debug => false)