bibtex-ruby 4.0.16 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6763b2b25cc0a95b714e3878ce24cd2fccdab8de
-  data.tar.gz: d2118d74180e0cddb911a4e8e5f4e34292462098
+  metadata.gz: 8783657ade7bf716dc5e8e8efc22cc953e65ceca
+  data.tar.gz: 27870297854e15bb45f12055bcc7a09be62eba11
 SHA512:
-  metadata.gz: 07cc756523db9c07be8262b955705e2fe95a136694be08c076393c8607da9a3df67afde0828421dcc06bc20e93b4a38e6713d44d746d8c4a66cfd9022e5791a6
-  data.tar.gz: e6fa9083cadcfbc7e2f1c919e18385b8f061c6e2576a9307066bf591fd4fee7ab34816766eada8de9e8c59f67b5245de025f3ea0720ff98e23ae3f2812940d50
+  metadata.gz: f43096cd39d610a93af92eba33c2e61f4c4e869cb95b83d6477dc980d74e380b0b3fadf126647691d731d653457db36974c03c88afc74b236d7d5204016a14bd
+  data.tar.gz: dc0570d2c762ab894efcd3700cf730c5a6fde3dc43dfca13ec9eb0915c435e26ce926e3950a7f81c9cb5eb92d7079bae7a9f2f2c4b7e64fe43da91bd10f7c835

data/features/names.feature

@@ -84,4 +84,3 @@ Feature: BibTeX Names
     | {Barnes and} {Noble, Inc.}        | {Barnes and}            |                | {Noble, Inc.}                  |     |
     | {Barnes} {and} {Noble,} {Inc.}    | {Barnes} {and} {Noble,} |                | {Inc.}                         |     |
     | Charles Louis Xavier Joseph de la Vallee Poussin | Charles Louis Xavier Joseph | de la | Vallee Poussin       |     |
-

data/lib/bibtex/name_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.11
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -11,19 +11,20 @@ require 'strscan'
 module BibTeX
   class NameParser < Racc::Parser
 
-module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
+module_eval(<<'...end names.y/module_eval...', 'names.y', 116)
 
   @patterns = {
     :and => /,?\s+and\s+/io,
     :space => /\s+/o,
     :comma => /,/o,
-    :lower => /[[:lower:]][^\s\{\}\d\\,]*/o,
-    :upper => /[[:upper:]][^\s\{\}\d\\,]*/uo,
-    :symbols => /(\d|\\.)+/o,
+    :lower => /[[:lower:]][[:lower:][:upper:]]*/uo,
+    :upper => /[[:upper:]][[:lower:][:upper:].]*/uo,
+    :other => /[^\s,\{\}\\[:upper:][:lower:]]+/uo,
     :lbrace => /\{/o,
     :rbrace => /\}/o,
-    :period => /./o,
-    :braces => /[\{\}]/o
+    :braces => /[\{\}]/o,
+    :escape => /\\./o,
+    :last_first => /[\p{Han}\p{Hiragana}\p{Katakana}\p{Hangul}]/uo
   }
 
   class << self
@@ -55,7 +56,8 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
   def scan(input)
     @src = StringScanner.new(input)
     @brace_level = 0
-    @stack = []
+    @last_and = 0
+    @stack = [[:ANDFL,'(^start)']]
     @word = [:PWORD,'']
     do_scan
   end
@@ -67,9 +69,10 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
       case
       when @src.scan(NameParser.patterns[:and])
         push_word
-        @stack.push([:AND,@src.matched])
+        @last_and = @stack.length
+        @stack.push([:ANDFL,@src.matched])
 
-      when @src.scan(NameParser.patterns[:space])
+      when @src.skip(NameParser.patterns[:space])
         push_word
 
       when @src.scan(NameParser.patterns[:comma])
@@ -84,7 +87,8 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
         is_uppercase
         @word[1] << @src.matched
 
-      when @src.scan(NameParser.patterns[:symbols])
+      when @src.scan(NameParser.patterns[:other])
+        check_name_order
         @word[1] << @src.matched
 
       when @src.scan(NameParser.patterns[:lbrace])
@@ -94,8 +98,11 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
       when @src.scan(NameParser.patterns[:rbrace])
         error_unbalanced
 
-      when @src.scan(NameParser.patterns[:period])
+      when @src.scan(NameParser.patterns[:escape])
         @word[1] << @src.matched
+
+      else
+        error_invalid
       end
     end
 
@@ -118,6 +125,11 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
     @word[0] = :UWORD if @word[0] == :PWORD
   end
 
+  def check_name_order
+    return if RUBY_VERSION < '1.9'
+    @stack[@last_and][0] = :ANDLF if @stack[@last_and][0] != :ANDLF && @src.matched =~ NameParser.patterns[:last_first]
+  end
+
   def scan_literal
     @brace_level = 1
 
@@ -146,95 +158,120 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
     BibTeX.log.warn("NameParser: unbalanced braces at position #{@src.pos}; brace level #{@brace_level}.")
   end
 
+  def error_invalid
+    @stack.push [:ERROR,@src.getch]
+    BibTeX.log.warn("NameParser: invalid character at position #{@src.pos}; brace level #{@brace_level}.")
+  end
+
 # -*- racc -*-
 ...end names.y/module_eval...
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -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 ]
+   -37,     6,   -25,   -38,    26,   -39,   -37,   -37,    34,   -38,
+   -38,   -39,   -39,   -22,    42,   -25,   -37,     4,     5,   -22,
+   -22,   -24,   -37,   -37,   -22,    42,   -25,   -24,   -24,   -24,
+   -22,   -22,    16,    14,    17,   -24,   -24,   -26,    24,    40,
+    25,   -26,    24,    51,    25,    24,    23,    25,    16,    29,
+    17,    24,    32,    25,    24,    37,    25,    24,    32,    25,
+   -20,   -20,   -20,    24,    43,    25,    49,    48,    50,    24,
+    37,    25,    49,    48,    50,    49,    48,    50,    49,    48,
+    50,    49,    48,    50,     4,     5,    54,    56,    54 ]
 
 racc_action_check = [
-    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 ]
+    14,     1,    14,    16,     6,    17,    14,    14,    13,    16,
+    16,    17,    17,    23,    31,    23,    29,     0,     0,    23,
+    23,    40,    29,    29,    37,    36,    37,    40,    40,    51,
+    37,    37,     4,     4,     4,    51,    51,    21,    21,    21,
+    21,    38,    38,    38,    38,     5,     5,     5,    10,    10,
+    10,    11,    11,    11,    20,    20,    20,    28,    28,    28,
+    32,    32,    32,    33,    33,    33,    34,    34,    34,    39,
+    39,    39,    42,    42,    42,    47,    47,    47,    54,    54,
+    54,    56,    56,    56,     2,     2,    41,    45,    53 ]
 
 racc_action_pointer = [
-    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 ]
+    11,     1,    78,   nil,    29,    42,     4,   nil,   nil,   nil,
+    45,    48,   nil,     6,     0,   nil,     3,     5,   nil,   nil,
+    51,    35,   nil,    13,   nil,   nil,   nil,   nil,    54,    16,
+   nil,    12,    57,    60,    63,   nil,    23,    24,    39,    66,
+    21,    84,    69,   nil,   nil,    85,   nil,    72,   nil,   nil,
+   nil,    29,   nil,    86,    75,   nil,    78,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -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 ]
+    -1,   -40,    -2,    -3,   -40,   -40,   -40,    -4,    -5,    -7,
+   -26,   -40,   -11,   -40,   -19,   -29,   -31,   -32,    -6,   -12,
+   -40,   -23,   -15,   -19,   -31,   -32,    60,    -8,   -40,   -19,
+   -30,   -10,   -25,   -26,   -35,   -13,   -40,   -20,   -23,   -40,
+   -19,    -9,   -35,   -21,   -16,   -27,   -33,   -36,   -37,   -38,
+   -39,   -21,   -14,   -40,   -35,   -17,   -35,   -34,   -18,   -28 ]
 
 racc_goto_table = [
-     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 ]
+     9,    10,    21,    19,    31,    30,    27,    44,    11,    20,
+     3,     1,     7,    36,    28,    55,    30,    38,    35,    12,
+    22,    41,     2,     8,    18,    39,    59,    58,    30,   nil,
+   nil,   nil,    53,    30,   nil,   nil,    38,    52,   nil,   nil,
+   nil,   nil,   nil,    57 ]
 
 racc_goto_check = [
-     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 ]
+     6,     7,     7,    11,     9,    14,     6,    12,     8,     8,
+     3,     1,     3,     9,     8,    12,    14,     7,    11,    10,
+    10,     9,     2,     4,     5,     8,    13,    12,    14,   nil,
+   nil,   nil,     9,    14,   nil,   nil,     7,    11,   nil,   nil,
+   nil,   nil,   nil,     6 ]
 
 racc_goto_pointer = [
-   nil,    11,     7,     2,     0,    -3,     1,     3,   -19,   -28,
-    -4,   nil ]
+   nil,    11,    22,    10,    19,    19,    -4,    -3,     4,    -7,
+    15,    -2,   -27,   -30,    -5,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,    31,     5,     6,     7,   nil,    30,
-     9,    32 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    46,    33,   nil,    13,
+   nil,   nil,   nil,    45,    15,    47 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  0, 9, :_reduce_1,
-  1, 9, :_reduce_none,
-  1, 10, :_reduce_3,
-  3, 10, :_reduce_4,
-  1, 11, :_reduce_5,
-  2, 11, :_reduce_6,
-  3, 11, :_reduce_7,
-  2, 11, :_reduce_8,
-  3, 11, :_reduce_9,
-  4, 11, :_reduce_10,
-  5, 11, :_reduce_11,
-  1, 14, :_reduce_none,
+  0, 10, :_reduce_1,
+  1, 10, :_reduce_none,
+  1, 11, :_reduce_3,
+  2, 11, :_reduce_4,
+  2, 12, :_reduce_5,
+  2, 12, :_reduce_6,
+  1, 13, :_reduce_7,
+  2, 13, :_reduce_8,
+  3, 13, :_reduce_9,
+  2, 13, :_reduce_10,
+  1, 13, :_reduce_none,
+  1, 14, :_reduce_12,
   2, 14, :_reduce_13,
   3, 14, :_reduce_14,
+  1, 14, :_reduce_none,
+  3, 19, :_reduce_16,
+  4, 19, :_reduce_17,
+  5, 19, :_reduce_18,
+  1, 17, :_reduce_none,
+  2, 17, :_reduce_20,
+  3, 17, :_reduce_21,
+  1, 20, :_reduce_22,
+  1, 20, :_reduce_23,
+  2, 20, :_reduce_24,
+  1, 18, :_reduce_none,
+  1, 18, :_reduce_26,
+  1, 21, :_reduce_27,
+  3, 21, :_reduce_28,
+  1, 16, :_reduce_29,
+  2, 16, :_reduce_30,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 24, :_reduce_none,
+  2, 24, :_reduce_34,
+  0, 22, :_reduce_none,
+  1, 22, :_reduce_none,
   1, 15, :_reduce_none,
   1, 15, :_reduce_none,
-  1, 16, :_reduce_17,
-  3, 16, :_reduce_18,
-  1, 13, :_reduce_none,
-  2, 13, :_reduce_20,
-  1, 18, :_reduce_none,
-  1, 18, :_reduce_none,
-  1, 19, :_reduce_none,
-  2, 19, :_reduce_24,
-  0, 17, :_reduce_none,
-  1, 17, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none,
-  1, 12, :_reduce_none ]
+  1, 15, :_reduce_none ]
 
-racc_reduce_n = 30
+racc_reduce_n = 40
 
-racc_shift_n = 42
+racc_shift_n = 60
 
 racc_token_table = {
   false => 0,
@@ -243,10 +280,11 @@ racc_token_table = {
   :UWORD => 3,
   :LWORD => 4,
   :PWORD => 5,
-  :AND => 6,
-  :ERROR => 7 }
+  :ANDFL => 6,
+  :ANDLF => 7,
+  :ERROR => 8 }
 
-racc_nt_base = 8
+racc_nt_base = 9
 
 racc_use_result_var = true
 
@@ -273,16 +311,21 @@ Racc_token_to_s_table = [
   "UWORD",
   "LWORD",
   "PWORD",
-  "AND",
+  "ANDFL",
+  "ANDLF",
   "ERROR",
   "$start",
   "result",
   "names",
   "name",
+  "flname",
+  "lfname",
   "word",
   "u_words",
   "von",
   "last",
+  "comma",
+  "lastfirst",
   "first",
   "opt_words",
   "u_word",
@@ -296,7 +339,7 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'names.y', 31)
   def _reduce_1(val, _values, result)
-     result = []
+     result = [] 
     result
   end
 .,.,
@@ -305,139 +348,212 @@ module_eval(<<'.,.,', 'names.y', 31)
 
 module_eval(<<'.,.,', 'names.y', 33)
   def _reduce_3(val, _values, result)
-     result = [val[0]]
+     result = [val[0]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'names.y', 34)
   def _reduce_4(val, _values, result)
-     result << val[2]
+     result << val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 38)
+module_eval(<<'.,.,', 'names.y', 36)
   def _reduce_5(val, _values, result)
-             result = Name.new(:last => val[0])
-
+     result = Name.new(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 42)
+module_eval(<<'.,.,', 'names.y', 37)
   def _reduce_6(val, _values, result)
-             result = Name.new(:first => val[0], :last => val[1])
-
+     result = Name.new(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 46)
+module_eval(<<'.,.,', 'names.y', 41)
   def _reduce_7(val, _values, result)
-             result = Name.new(:first => val[0], :von => val[1], :last => val[2])
-
+               result = { :last => val[0] }
+         
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 50)
+module_eval(<<'.,.,', 'names.y', 45)
   def _reduce_8(val, _values, result)
-             result = Name.new(:von => val[0], :last => val[1])
-
+               result = { :first => val[0].join(' '), :last => val[1] }
+         
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 54)
+module_eval(<<'.,.,', 'names.y', 49)
   def _reduce_9(val, _values, result)
-             result = Name.new(:last => val[0], :jr => val[2][0], :first => val[2][1])
-
+               result = { :first => val[0].join(' '), :von => val[1], :last => val[2] }
+         
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 58)
+module_eval(<<'.,.,', 'names.y', 53)
   def _reduce_10(val, _values, result)
-             result = Name.new(:von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1])
-
+               result = { :von => val[0], :last => val[1] }
+         
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 62)
-  def _reduce_11(val, _values, result)
-             result = Name.new(:von => val[0,2].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1])
+# reduce 11 omitted
 
+module_eval(<<'.,.,', 'names.y', 59)
+  def _reduce_12(val, _values, result)
+               result = { :last => val[0][0], :first => val[0][1] }
+         
     result
   end
 .,.,
 
-# reduce 12 omitted
-
-module_eval(<<'.,.,', 'names.y', 67)
+module_eval(<<'.,.,', 'names.y', 63)
   def _reduce_13(val, _values, result)
-     result = val.join(' ')
+               result = { :von => val[0], :last => val[1][0], :first => val[1][1] }
+         
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 68)
+module_eval(<<'.,.,', 'names.y', 67)
   def _reduce_14(val, _values, result)
-     result = val.join(' ')
+               result = { :von => val[0..1].join(' '), :last => val[2][0], :first => val[2][1] }
+         
     result
   end
 .,.,
 
 # reduce 15 omitted
 
-# reduce 16 omitted
+module_eval(<<'.,.,', 'names.y', 73)
+  def _reduce_16(val, _values, result)
+              result = { :last => val[0], :jr => val[2][0], :first => val[2][1] }
+        
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'names.y', 72)
+module_eval(<<'.,.,', 'names.y', 77)
   def _reduce_17(val, _values, result)
-     result = [nil,val[0]]
+              result = { :von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1] }
+        
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 73)
+module_eval(<<'.,.,', 'names.y', 81)
   def _reduce_18(val, _values, result)
-     result = [val[0],val[2]]
+              result = { :von => val[0..1].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1] }
+        
     result
   end
 .,.,
 
 # reduce 19 omitted
 
-module_eval(<<'.,.,', 'names.y', 76)
+module_eval(<<'.,.,', 'names.y', 85)
   def _reduce_20(val, _values, result)
-     result = val.join(' ')
+     result = val.join(' ') 
     result
   end
 .,.,
 
-# reduce 21 omitted
+module_eval(<<'.,.,', 'names.y', 86)
+  def _reduce_21(val, _values, result)
+     result = val.join(' ') 
+    result
+  end
+.,.,
 
-# reduce 22 omitted
+module_eval(<<'.,.,', 'names.y', 88)
+  def _reduce_22(val, _values, result)
+     result = [val[0], nil] 
+    result
+  end
+.,.,
 
-# reduce 23 omitted
+module_eval(<<'.,.,', 'names.y', 89)
+  def _reduce_23(val, _values, result)
+     result = [val[0][0], val[0][1] ? val[0][1..-1].join(' ') : nil] 
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'names.y', 81)
+module_eval(<<'.,.,', 'names.y', 90)
   def _reduce_24(val, _values, result)
-     result = val.join(' ')
+     result = [val[0][0], (val[0][1..-1] << val[1]).join(' ')] 
     result
   end
 .,.,
 
 # reduce 25 omitted
 
-# reduce 26 omitted
+module_eval(<<'.,.,', 'names.y', 92)
+  def _reduce_26(val, _values, result)
+     result = val[0].join(' ') 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'names.y', 94)
+  def _reduce_27(val, _values, result)
+     result = [nil,val[0]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'names.y', 95)
+  def _reduce_28(val, _values, result)
+     result = [val[0],val[2]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'names.y', 97)
+  def _reduce_29(val, _values, result)
+     result = [val[0]] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'names.y', 98)
+  def _reduce_30(val, _values, result)
+     result << val[1] 
+    result
+  end
+.,.,
+
+# reduce 31 omitted
+
+# reduce 32 omitted
+
+# reduce 33 omitted
+
+module_eval(<<'.,.,', 'names.y', 103)
+  def _reduce_34(val, _values, result)
+     result = val.join(' ') 
+    result
+  end
+.,.,
+
+# reduce 35 omitted
+
+# reduce 36 omitted
 
-# reduce 27 omitted
+# reduce 37 omitted
 
-# reduce 28 omitted
+# reduce 38 omitted
 
-# reduce 29 omitted
+# reduce 39 omitted
 
 def _reduce_none(val, _values, result)
   val[0]

data/lib/bibtex/names.y

@@ -23,7 +23,7 @@
 
 class BibTeX::NameParser
 
-token COMMA UWORD LWORD PWORD AND ERROR
+token COMMA UWORD LWORD PWORD ANDFL ANDLF ERROR
 
 expect 0
 
@@ -31,50 +31,72 @@ rule
 
   result : { result = [] } | names
 
-  names : name           { result = [val[0]] }
-        | names AND name { result << val[2] }
-
-  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])
-       }
-       ;
+  names : name       { result = [val[0]] }
+        | names name { result << val[1] }
+
+  name : ANDFL flname { result = Name.new(val[1]) }
+       | ANDLF lfname { result = Name.new(val[1]) }
+
+  flname : word
+         {
+           result = { :last => val[0] }
+         }
+         | u_words word
+         {
+           result = { :first => val[0].join(' '), :last => val[1] }
+         }
+         | u_words von last
+         {
+           result = { :first => val[0].join(' '), :von => val[1], :last => val[2] }
+         }
+         | von last
+         {
+           result = { :von => val[0], :last => val[1] }
+         }
+         | comma
+
+  lfname : lastfirst
+         {
+           result = { :last => val[0][0], :first => val[0][1] }
+         }
+         | von lastfirst
+         {
+           result = { :von => val[0], :last => val[1][0], :first => val[1][1] }
+         }
+         | u_words von lastfirst
+         {
+           result = { :von => val[0..1].join(' '), :last => val[2][0], :first => val[2][1] }
+         }
+         | comma
+
+  comma : last COMMA first
+        {
+          result = { :last => val[0], :jr => val[2][0], :first => val[2][1] }
+        }
+        | von last COMMA first
+        {
+          result = { :von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1] }
+        }
+        | u_words von last COMMA first
+        {
+          result = { :von => val[0..1].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1] }
+        }
 
   von : LWORD
       | von LWORD         { result = val.join(' ') }
       | von u_words LWORD { result = val.join(' ') }
 
-  last : LWORD | u_words
+  lastfirst : LWORD         { result = [val[0], nil] }
+            | u_words       { result = [val[0][0], val[0][1] ? val[0][1..-1].join(' ') : nil] }
+            | u_words LWORD { result = [val[0][0], (val[0][1..-1] << val[1]).join(' ')] }
+
+  last : LWORD | u_words { result = val[0].join(' ') }
 
   first : opt_words                 { result = [nil,val[0]] }
         | opt_words COMMA opt_words { result = [val[0],val[2]] }
 
-  u_words : u_word
-          | u_words u_word { result = val.join(' ') }
+  u_words : u_word         { result = [val[0]] }
+          | u_words u_word { result << val[1] }
 
   u_word : UWORD | PWORD
 
@@ -96,13 +118,14 @@ require 'strscan'
     :and => /,?\s+and\s+/io,
     :space => /\s+/o,
     :comma => /,/o,
-    :lower => /[[:lower:]][^\s\{\}\d\\,]*/o,
-    :upper => /[[:upper:]][^\s\{\}\d\\,]*/uo,
-    :symbols => /(\d|\\.)+/o,
+    :lower => /[[:lower:]][[:lower:][:upper:]]*/uo,
+    :upper => /[[:upper:]][[:lower:][:upper:].]*/uo,
+    :other => /[^\s,\{\}\\[:upper:][:lower:]]+/uo,
     :lbrace => /\{/o,
     :rbrace => /\}/o,
-    :period => /./o,
-    :braces => /[\{\}]/o
+    :braces => /[\{\}]/o,
+    :escape => /\\./o,
+    :last_first => /[\p{Han}\p{Hiragana}\p{Katakana}\p{Hangul}]/uo
   }
 
   class << self
@@ -134,7 +157,8 @@ require 'strscan'
   def scan(input)
     @src = StringScanner.new(input)
     @brace_level = 0
-    @stack = []
+    @last_and = 0
+    @stack = [[:ANDFL,'(^start)']]
     @word = [:PWORD,'']
     do_scan
   end
@@ -146,9 +170,10 @@ require 'strscan'
       case
       when @src.scan(NameParser.patterns[:and])
         push_word
-        @stack.push([:AND,@src.matched])
+        @last_and = @stack.length
+        @stack.push([:ANDFL,@src.matched])
 
-      when @src.scan(NameParser.patterns[:space])
+      when @src.skip(NameParser.patterns[:space])
         push_word
 
       when @src.scan(NameParser.patterns[:comma])
@@ -163,7 +188,8 @@ require 'strscan'
         is_uppercase
         @word[1] << @src.matched
 
-      when @src.scan(NameParser.patterns[:symbols])
+      when @src.scan(NameParser.patterns[:other])
+        check_name_order
         @word[1] << @src.matched
 
       when @src.scan(NameParser.patterns[:lbrace])
@@ -173,8 +199,11 @@ require 'strscan'
       when @src.scan(NameParser.patterns[:rbrace])
         error_unbalanced
 
-      when @src.scan(NameParser.patterns[:period])
+      when @src.scan(NameParser.patterns[:escape])
         @word[1] << @src.matched
+
+      else
+        error_invalid
       end
     end
 
@@ -197,6 +226,11 @@ require 'strscan'
     @word[0] = :UWORD if @word[0] == :PWORD
   end
 
+  def check_name_order
+    return if RUBY_VERSION < '1.9'
+    @stack[@last_and][0] = :ANDLF if @stack[@last_and][0] != :ANDLF && @src.matched =~ NameParser.patterns[:last_first]
+  end
+
   def scan_literal
     @brace_level = 1
 
@@ -225,4 +259,9 @@ require 'strscan'
     BibTeX.log.warn("NameParser: unbalanced braces at position #{@src.pos}; brace level #{@brace_level}.")
   end
 
+  def error_invalid
+    @stack.push [:ERROR,@src.getch]
+    BibTeX.log.warn("NameParser: invalid character at position #{@src.pos}; brace level #{@brace_level}.")
+  end
+
 # -*- racc -*-

data/lib/bibtex/version.rb

@@ -19,8 +19,8 @@
 module BibTeX
   module Version
     MAJOR = 4
-    MINOR = 0
-    PATCH = 16
+    MINOR = 1
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.16
+  version: 4.1.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode