namae 0.11.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 353d854c14d8acad677aac4e0b841fc611a9cb03
-  data.tar.gz: 5dfa68cf2d7aa11aecede120dccbbab29b2f8b9f
+SHA256:
+  metadata.gz: 348bf4a2385c1aa56c35759cc2219a8163fa7cb76e3c05482cd6db7a207906fb
+  data.tar.gz: 4329ea23260aef483460581391fcd43c80bde61ecebef419f89c2d23f0cfeffc
 SHA512:
-  metadata.gz: 5324332c13cd3b7bfd3e617b795b95a1c2ce909f6e235a0f5d49d31edd03ab36331250335f94a401d141ee2c276a867a558adf70db3c0eeb7a7ac70dba5a90fa
-  data.tar.gz: 080622e3b17a89f136eb18a62e121bd383c6c88a27c27b7b63068121d92e5f1e2afb08cbcbfc4e87ec252ecb6ab8e7ccda492232b67f79e51d9c44db048342b0
+  metadata.gz: 806964f1611f6931acd6e68e4f5a75069b30abf42795191bf084d89adbfe378d98f6b28f10f96cc5cc446ab9068ddafafd6794e71f2c53fd97d2a0aff5a59914
+  data.tar.gz: f235fb82617020393be215fe078bd74bbb947ab682f387f5aad87e7bb6e3b62323ee03da30409034ca747beca7b5319905f1a081a43bc8763a25dca5b40722c4

data/.travis.yml

@@ -6,26 +6,25 @@ cache: bundler
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.3.1
+  - rvm: 3.0
     env: WITH_COVERALLS=true
-  - rvm: 2.2
+  - rvm: 2.7
     env: WITH_COVERALLS=false
-  - rvm: 2.1
+  - rvm: 2.6
     env: WITH_COVERALLS=false
-  - rvm: 2.0
-    env: WITH_COVERALLS=false
-  - rvm: 1.9.3
+  - rvm: 2.5
     env: WITH_COVERALLS=false
   - rvm: jruby-19mode
     env: WITH_COVERALLS=false
-  - rvm: rbx-2
-    env: WITH_COVERALLS=false
+
+before_install:
+  - gem update --system
 
 install:
   - if [[ $WITH_COVERALLS = "true" ]]; then
-      bundle install --without debug osx optional;
+      bundle install --without debug optional;
     else
-      bundle install --without debug osx optional coverage;
+      bundle install --without debug optional coverage;
     fi
 
 script:

data/BSDL

@@ -1,6 +1,6 @@
 Namae. A personal name parser.
 Copyright (C) 2012 President and Fellows of Harvard College
-Copyright (C) 2013-2014 Sylvester Keil
+Copyright (C) 2013-2020 Sylvester Keil
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/Gemfile

@@ -1,40 +1,26 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem 'rspec', '~>3.0'
-  gem 'rake', '~>10.1'
-  gem 'cucumber', '~>1.3'
+  gem 'rspec', '~> 3.7'
+  gem 'rake'
+  gem 'cucumber', '~> 3.1'
 end
 
-
 group :development do
-  gem 'racc', '1.4.9', :platform => :ruby
+  gem 'racc', '~> 1.4', :platform => :ruby
 end
 
 group :coverage do
-  gem 'simplecov', '~>0.8', :require => false, :platforms => :ruby
-  gem 'rubinius-coverage', '~>2.0', :platform => :rbx
-  gem 'coveralls', '~>0.7', :require => false
+  gem 'simplecov', :require => false, :platforms => :ruby
+  gem 'coveralls', :require => false if ENV['CI']
 end
 
 group :optional do
-  gem 'ZenTest', '~>4.9'
-  gem 'jeweler', '~> 2.0'
-  gem 'yard', '~>0.8'
+  gem 'jeweler'
+  gem 'yard'
 end
 
 group :debug do
-  gem 'debugger', '~>1.6', :platform => [:mri_19]
-  gem 'byebug', '~>3.5', :platform => :mri if RUBY_VERSION > '2.0'
-  gem 'rubinius-compiler', '~>2.0', :platform => :rbx
-  gem 'rubinius-debugger', '~>2.0', :platform => :rbx
-end
-
-group :osx do
-  gem 'autotest-fsevent'
-end
-
-group :rbx do
-  gem 'rubysl', '~>2.0', :platform => :rbx
-  gem 'json', '~>1.8', :platform => :rbx
+  gem 'debugger', :platform => [:mri_19]
+  gem 'byebug', :platform => :mri if RUBY_VERSION > '2.0'
 end

data/README.md

@@ -4,9 +4,9 @@ Namae is a parser for human names. It recognizes personal names of various
 cultural backgrounds and tries to split them into their component parts
 (e.g., given and family names, honorifics etc.).
 
-[![Build Status](https://secure.travis-ci.org/inukshuk/namae.png)](http://travis-ci.org/inukshuk/namae)
-[![Coverage Status](https://coveralls.io/repos/inukshuk/namae/badge.png)](https://coveralls.io/r/inukshuk/namae)
-[![Gem Version](https://badge.fury.io/rb/namae.png)](http://badge.fury.io/rb/namae)
+[![Build Status](https://travis-ci.org/berkmancenter/namae.svg?branch=master)](https://travis-ci.org/berkmancenter/namae)
+[![Coverage Status](https://coveralls.io/repos/github/berkmancenter/namae/badge.svg?branch=master)](https://coveralls.io/github/berkmancenter/namae?branch=master)
+[![Gem Version](https://badge.fury.io/rb/namae.svg)](http://badge.fury.io/rb/namae)
 [![Code Climate](https://codeclimate.com/github/berkmancenter/namae/badges/gpa.svg)](https://codeclimate.com/github/berkmancenter/namae)
 
 Quickstart
@@ -121,6 +121,33 @@ ambiguous. For example, multiple family names are always possible in sort-order:
 Whilst in display-order, multiple family names are only supported when the
 name contains a particle or a nickname.
 
+Namae tries to detect common particles using the `:uppercase_particle` lexer
+pattern. If you prefer to always include particles with the family name, you
+can set the the `:include_particle_in_family` parser option.
+
+    Namae.parse 'Ludwig von Beethoven'
+    #-> [#<Name family="Beethoven" given="Ludwig" particle="von">]
+
+    Namae.options[:include_particle_in_family] = true
+    #-> [#<Name family="von Beethoven" given="Ludwig">]
+
+Configuration
+-------------
+You can tweak some of Namae's parse rules by configuring the parser's
+options. Take a look at `Namae.options` to see your current settings.
+If you want to change the default settings for all parsers, you can run
+`Namae.configure` which will yield the default options (make sure to
+change the configuration before using the parser).
+
+A Note On Thread Safety
+-----------------------
+When using the top-level parse functions, Namae will re-use a thread-local
+parser instance (`Namae::Parser.instance`); the instance is created, using
+the current default options (`Namae::Parser.defaults`). If you need more
+control, you are encouraged to create individual parser instances using
+`Namae::Parser.new`.
+
+
 Rationale
 ---------
 Parsing human names is at once too easy and too hard. When working in the
@@ -170,7 +197,8 @@ Namae was written as a part of a Google Summer of Code project. Thanks Google!
 
 Copyright
 ---------
+Copyright (c) 2013-2020 Sylvester Keil
+
 Copyright (c) 2012 President and Fellows of Harvard College.
-Copyright (c) 2013-2014 Sylvester Keil
 
 Namae is dual licensed under the AGPL and a BSD-style license.

data/features/examples.feature

@@ -34,3 +34,19 @@ Feature: Parse the names in the Readme file
       | Mr. Yukihiro "Matz" Matsumoto     | Yukihiro     |          | Matsumoto    |        |           | Mr.         | Matz |
       | Yukihiro "Matz" Matsumoto Sr.     | Yukihiro     |          | Matsumoto    | Sr.    |           |             | Matz |
       | Mr. Yukihiro "Matz" Matsumoto Sr. | Yukihiro     |          | Matsumoto    | Sr.    |           | Mr.         | Matz |
+
+    @particle
+    Scenarios: Particles
+      | name                              | given        | particle | family       | suffix | title     | appellation | nick |
+      | Ludwig von Beethoven              | Ludwig       | von      | Beethoven    |        |           |             |      |
+      | Beethoven, Ludwig von             | Ludwig von   |          | Beethoven    |        |           |             |      |
+      | Vincent Van Gogh                  | Vincent      | Van      | Gogh         |        |           |             |      |
+      | Vincent van Gogh                  | Vincent      | van      | Gogh         |        |           |             |      |
+      | Van Gogh, Vincent                 | Vincent      | Van      | Gogh         |        |           |             |      |
+      | van Gogh, Vincent                 | Vincent      | van      | Gogh         |        |           |             |      |
+      | Walther von der Vogelheide        | Walther      | von der  | Vogelheide   |        |           |             |      |
+      | Don De Lillo                      | Don          | De       | Lillo        |        |           |             |      |
+      | De Lillo, Don                     | Don          | De       | Lillo        |        |           |             |      |
+      | Tom Van de Weghe                  | Tom          | Van de   | Weghe        |        |           |             |      |
+      | Tom Van De Weghe                  | Tom          | Van De   | Weghe        |        |           |             |      |
+

data/features/lists.feature

@@ -115,14 +115,24 @@ Feature: Parse a list of names
       | B     | Malcom  |
 
   Scenario: A list of names with particles separated by commas
-    Given a parser that prefers commas as separators
+    Given I want to include particles in the family name
+    And a parser that prefers commas as separators
     When I parse the names "Di Proctor, M., von Cooper, P."
     Then the names should be:
       | given | family     |
       | M.    | Di Proctor |
-      | P.    | Cooper     |
+      | P.    | von Cooper |
     When I parse the names "Di Proctor, M, von Cooper, P"
     Then the names should be:
       | given | family     |
       | M     | Di Proctor |
-      | P     | Cooper     |
+      | P     | von Cooper |
+
+  Scenario: A list of names with two consecutive accented characters
+    Given I want to include particles in the family name
+    And a parser that prefers commas as separators
+    When I parse the names "Çakıroğlu, Ü., Başıbüyük, B."
+    Then the names should be:
+      | given | family     |
+      | Ü.    | Çakıroğlu  |
+      | B.    | Başıbüyük  |

data/features/step_definitions/namae_steps.rb

@@ -2,6 +2,11 @@ Given /^a parser that prefers commas as separators$/ do
   Namae::Parser.instance.options[:prefer_comma_as_separator] = true
 end
 
+Given /^I want to include particles in the family name$/ do
+  Namae::Parser.instance.options[:include_particle_in_family] = true
+end
+
+
 When /^I parse the name "(.*)"$/ do |string|
   @name = Namae.parse!(string)[0]
 end

data/features/support/env.rb

@@ -1,12 +1,3 @@
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
 begin
   require 'simplecov'
   require 'coveralls' if ENV['CI']

data/lib/namae.rb

@@ -2,4 +2,4 @@ require 'namae/version'
 
 require 'namae/name'
 require 'namae/parser'
-require 'namae/utility'
+require 'namae/utility'

data/lib/namae/name.rb

@@ -183,6 +183,13 @@ module Namae
       self
     end
 
+    def merge_particles!
+      self.family = [dropping_particle, particle, family].compact.join(' ')
+      self.dropping_particle = nil
+      self.particle = nil
+      self
+    end
+
     # @return [String] a string representation of the name
     def inspect
       "#<Name #{each_pair.map { |k,v| [k,v.inspect].join('=') if v }.compact.join(' ')}>"

data/lib/namae/parser.rb

@@ -1,34 +1,43 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.5.2
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
 
-require 'singleton'
 require 'strscan'
 
 module Namae
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 107)
-
-  include Singleton
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 111)
+
+  @defaults = {
+    :debug => false,
+    :prefer_comma_as_separator => false,
+    :include_particle_in_family => false,
+    :comma => ',',
+    :stops => ',;',
+    :separator => /\s*(\band\b|\&|;)\s*/i,
+    :title => /\s*\b(sir|lord|count(ess)?|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|pastor|pr|reverend|rev|elder|deacon|deaconess|father|fr|rabbi|cantor|vicar|prof|dr|md|ph\.?d)\.?)(\s+|$)/i,
+    :suffix => /\s*\b(JR|Jr|jr|SR|Sr|sr|[IVX]{2,})(\.|\b)/,
+    :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i,
+    :uppercase_particle => /\s*\b(D[aiu]|De[rs]?|St\.?|Saint|La|Les|V[ao]n)(\s+|$)/
+  }
+
+  class << self
+    attr_reader :defaults
+
+    def instance
+      Thread.current[:namae] ||= new
+    end
+  end
 
   attr_reader :options, :input
 
-  def initialize
-    @input, @options = StringScanner.new(''), {
-      :debug => false,
-      :prefer_comma_as_separator => false,
-      :comma => ',',
-      :stops => ',;',
-      :separator => /\s*(\band\b|\&|;)\s*/i,
-      :title => /\s*\b(sir|lord|count(ess)?|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|pastor|pr|reverend|rev|elder|deacon|deaconess|father|fr|vicar|prof|dr|md|ph\.?d)\.?)(\s+|$)/i,
-      :suffix => /\s*\b(JR|Jr|jr|SR|Sr|sr|[IVX]{2,})(\.|\b)/,
-      :appellation => /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i
-    }
+  def initialize(options = {})
+    @options = self.class.defaults.merge(options)
   end
 
   def debug?
@@ -43,6 +52,10 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 107)
     options[:comma]
   end
 
+  def include_particle_in_family?
+    options[:include_particle_in_family]
+  end
+
   def stops
     options[:stops]
   end
@@ -59,26 +72,31 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 107)
     options[:appellation]
   end
 
+  def uppercase_particle
+    options[:uppercase_particle]
+  end
+
   def prefer_comma_as_separator?
     options[:prefer_comma_as_separator]
   end
 
-  def parse(input)
-    parse!(input)
+  def parse(string)
+    parse!(string)
   rescue => e
     warn e.message if debug?
     []
   end
 
   def parse!(string)
-    input.string = normalize(string)
+    @input = StringScanner.new(normalize(string))
     reset
-    do_parse
+    names = do_parse
+    names.map(&:merge_particles!) if include_particle_in_family?
+    names
   end
 
   def normalize(string)
-    string = string.strip
-    string
+    string.scrub.strip
   end
 
   def reset
@@ -129,11 +147,11 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 107)
   end
 
   def will_see_suffix?
-    input.peek(8).to_s.strip.split(/\s+/)[0] =~ suffix
+    input.rest.strip.split(/\s+/)[0] =~ suffix
   end
 
   def will_see_initial?
-    input.peek(6).to_s.strip.split(/\s+/)[0] =~ /^[[:upper:]]+\b/
+    input.rest.strip.split(/\s+/)[0] =~ /^[[:upper:]]+\b/
   end
 
   def seen_full_name?
@@ -165,6 +183,8 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 107)
       else
         consume_word(:UWORD, input.matched)
       end
+    when input.scan(uppercase_particle)
+      consume_word(:UPARTICLE, input.matched.strip)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:upper:]][^\s#{stops}]*/)
       consume_word(:UWORD, input.matched)
     when input.scan(/((\\\w+)?\{[^\}]*\})*[[:lower:]][^\s#{stops}]*/)
@@ -189,133 +209,142 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 107)
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -39,    16,    32,    30,   -40,    31,    33,   -39,    17,   -39,
-   -39,   -40,    67,   -40,   -40,    66,    53,    52,    54,   -38,
-    59,   -22,    39,   -34,    45,    58,   -38,    53,    52,    54,
-    53,    52,    54,    59,    39,    39,    62,    39,    53,    52,
-    54,    14,    12,    15,    68,    39,     7,     8,    14,    12,
-    15,    58,    39,     7,     8,    14,    22,    15,    24,    14,
-    22,    15,    24,    14,    22,    15,    30,    28,    31,    30,
-    28,    31,   -19,   -19,   -19,    30,    42,    31,    30,    28,
-    31,   -20,   -20,   -20,    30,    46,    31,    30,    28,    31,
-    30,    28,    31,   -19,   -19,   -19,    53,    52,    54,    53,
-    52,    54,    39,    58,    59 ]
+   -43,    36,    26,    37,   -41,    38,    39,   -43,   -42,   -43,
+   -43,   -41,   -40,   -41,   -41,   -42,    45,   -42,   -42,   -40,
+    50,   -40,   -40,    72,    59,    58,    60,    73,    16,    13,
+    17,   -36,    61,     7,    18,    65,    14,    16,    25,    17,
+    16,    25,    17,    28,    18,    14,    65,    45,    14,    36,
+    34,    37,    68,    16,    13,    17,    26,    35,     7,    18,
+    18,    14,    16,    25,    17,    28,    36,    34,    37,    45,
+    14,    36,    34,    37,    35,    36,    34,    37,    45,    35,
+    36,    52,    37,    35,   -22,   -22,   -22,    18,    35,    59,
+    58,    60,   -22,    36,    34,    37,    45,    61,    36,    34,
+    37,    35,    59,    58,    60,    65,    35,   nil,   nil,    45,
+    61,    59,    58,    60,    59,    58,    60,   nil,    45,    61,
+    19,   nil,    61,    59,    58,    60,   -40,    20,   -24,   nil,
+   nil,    61,   nil,   -40 ]
 
 racc_action_check = [
-    14,     1,    11,    43,    15,    43,    16,    14,     1,    14,
-    14,    15,    50,    15,    15,    49,    49,    49,    49,    12,
-    50,    12,    23,    49,    27,    37,    12,    32,    32,    32,
-    45,    45,    45,    38,    32,    40,    44,    45,    62,    62,
-    62,     0,     0,     0,    57,    62,     0,     0,    17,    17,
-    17,    60,    61,    17,    17,     9,     9,     9,     9,    20,
-    20,    20,    20,     5,     5,     5,    10,    10,    10,    21,
-    21,    21,    22,    22,    22,    24,    24,    24,    25,    25,
-    25,    28,    28,    28,    29,    29,    29,    35,    35,    35,
-    41,    41,    41,    42,    42,    42,    67,    67,    67,    73,
-    73,    73,    64,    70,    72 ]
+    14,    48,     8,    48,    16,    11,    19,    14,    17,    14,
+    14,    16,    25,    16,    16,    17,    27,    17,    17,    25,
+    31,    25,    25,    55,    55,    55,    55,    56,     0,     0,
+     0,    55,    55,     0,     0,    56,     0,     5,     5,     5,
+     9,     9,     9,     9,    43,     5,    44,    46,     9,    10,
+    10,    10,    49,    20,    20,    20,    64,    10,    20,    20,
+    66,    20,    23,    23,    23,    23,    24,    24,    24,    67,
+    23,    28,    28,    28,    24,    29,    29,    29,    70,    28,
+    33,    33,    33,    29,    34,    34,    34,    75,    33,    38,
+    38,    38,    34,    41,    41,    41,    38,    38,    47,    47,
+    47,    41,    50,    50,    50,    77,    47,   nil,   nil,    50,
+    50,    68,    68,    68,    73,    73,    73,   nil,    68,    68,
+     1,   nil,    73,    78,    78,    78,    13,     1,    13,   nil,
+   nil,    78,   nil,    13 ]
 
 racc_action_pointer = [
-    38,     1,   nil,   nil,   nil,    60,   nil,   nil,   nil,    52,
-    63,     0,    19,   nil,     0,     4,     6,    45,   nil,   nil,
-    56,    66,    69,    12,    72,    75,   nil,    22,    78,    81,
-   nil,   nil,    24,   nil,   nil,    84,   nil,    16,    23,   nil,
-    25,    87,    90,     0,    34,    27,   nil,   nil,   nil,    13,
-    10,   nil,   nil,   nil,   nil,   nil,   nil,    35,   nil,   nil,
-    42,    42,    35,   nil,    92,   nil,   nil,    93,   nil,   nil,
-    94,   nil,    94,    96,   nil ]
+    25,   120,   nil,   nil,   nil,    34,   nil,   nil,    -7,    37,
+    46,     3,   nil,   126,     0,   nil,     4,     8,   nil,     6,
+    50,   nil,   nil,    59,    63,    12,   nil,     6,    68,    72,
+   nil,    18,   nil,    77,    81,   nil,   nil,   nil,    86,   nil,
+   nil,    90,   nil,    35,    36,   nil,    37,    95,    -2,    50,
+    99,   nil,   nil,   nil,   nil,    21,    25,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    47,   nil,    51,    59,   108,   nil,
+    68,   nil,   nil,   111,   nil,    78,   nil,    95,   120,   nil ]
 
 racc_action_default = [
-    -1,   -49,    -2,    -4,    -5,   -49,    -8,    -9,   -10,   -23,
-   -49,   -49,   -19,   -28,   -30,   -31,   -49,   -49,    -6,    -7,
-   -49,   -49,   -38,   -41,   -49,   -49,   -29,   -15,   -22,   -23,
-   -30,   -31,   -36,    75,    -3,   -49,   -15,   -45,   -42,   -43,
-   -41,   -49,   -22,   -23,   -14,   -36,   -21,   -16,   -24,   -37,
-   -26,   -32,   -38,   -39,   -40,   -14,   -11,   -46,   -47,   -44,
-   -45,   -41,   -36,   -17,   -49,   -33,   -35,   -49,   -48,   -12,
-   -45,   -18,   -25,   -27,   -13 ]
+    -1,   -52,    -2,    -4,    -5,   -52,    -8,    -9,   -10,   -25,
+   -52,   -52,   -19,   -22,   -23,   -30,   -32,   -33,   -50,   -52,
+   -52,    -6,    -7,   -52,   -52,   -22,   -51,   -44,   -52,   -52,
+   -31,   -15,   -20,   -25,   -24,   -23,   -32,   -33,   -38,    80,
+    -3,   -52,   -15,   -48,   -45,   -46,   -44,   -52,   -25,   -14,
+   -38,   -21,   -22,   -16,   -26,   -39,   -28,   -34,   -40,   -41,
+   -42,   -43,   -14,   -11,   -49,   -47,   -48,   -44,   -38,   -17,
+   -52,   -35,   -37,   -52,   -12,   -48,   -18,   -27,   -29,   -13 ]
 
 racc_goto_table = [
-     3,    37,    26,    50,    56,    18,     2,     9,    47,    23,
-     1,    19,    20,    26,    73,    27,    50,     3,    60,    64,
-    23,    63,    26,    34,     9,   nil,    36,    69,    21,    40,
-    44,    43,    25,    50,   nil,    72,    26,    74,    71,    70,
-    55,   nil,   nil,    35,   nil,   nil,    61,    41,   nil,    65,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    65 ]
+     3,    30,    43,     1,    22,    21,    56,    53,    31,    27,
+    32,    63,    78,    70,   nil,    30,   nil,   nil,    56,    69,
+     3,    66,    42,    27,    32,    30,    46,    49,    24,    32,
+     9,   nil,    29,    51,    74,    23,    56,    76,    77,    62,
+    30,    32,    75,    79,     2,    67,    41,    32,     8,   nil,
+     9,    47,   nil,   nil,   nil,    71,   nil,   nil,    48,   nil,
+   nil,   nil,   nil,   nil,    40,   nil,   nil,   nil,     8,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    71 ]
 
 racc_goto_check = [
-     3,     8,    17,    16,     9,     3,     2,     7,    12,     3,
-     1,     4,     7,    17,    14,    10,    16,     3,     8,    15,
-     3,    12,    17,     2,     7,   nil,    10,     9,    11,    10,
-    10,     7,    11,    16,   nil,    16,    17,     9,    12,     8,
-    10,   nil,   nil,    11,   nil,   nil,    10,    11,   nil,     3,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     3 ]
+     3,    19,     9,     1,     4,     3,    18,    13,    11,     3,
+    14,    10,    16,    17,   nil,    19,   nil,   nil,    18,    13,
+     3,     9,    11,     3,    14,    19,    11,    11,    12,    14,
+     8,   nil,    12,    14,    10,     8,    18,    13,    18,    11,
+    19,    14,     9,    10,     2,    11,    12,    14,     7,   nil,
+     8,    12,   nil,   nil,   nil,     3,   nil,   nil,     8,   nil,
+   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,     7,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     3 ]
 
 racc_goto_pointer = [
-   nil,    10,     6,     0,     6,   nil,   nil,     7,   -22,   -33,
-     5,    23,   -24,   nil,   -53,   -30,   -29,    -7,   nil ]
+   nil,     3,    44,     0,    -1,   nil,   nil,    48,    30,   -25,
+   -32,    -2,    23,   -31,     0,   nil,   -61,   -42,   -32,    -8 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    51,     4,     5,     6,    29,   nil,   nil,
-    11,    10,   nil,    48,    49,   nil,    38,    13,    57 ]
+   nil,   nil,   nil,    57,     4,     5,     6,    64,    33,   nil,
+   nil,    11,    10,   nil,    12,    54,    55,   nil,    44,    15 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  0, 12, :_reduce_1,
-  1, 12, :_reduce_2,
-  3, 12, :_reduce_3,
-  1, 13, :_reduce_4,
-  1, 13, :_reduce_none,
-  2, 13, :_reduce_6,
-  2, 13, :_reduce_7,
-  1, 13, :_reduce_none,
-  1, 16, :_reduce_9,
-  1, 16, :_reduce_10,
-  4, 15, :_reduce_11,
-  5, 15, :_reduce_12,
-  6, 15, :_reduce_13,
-  3, 15, :_reduce_14,
-  2, 15, :_reduce_15,
-  3, 17, :_reduce_16,
-  4, 17, :_reduce_17,
-  5, 17, :_reduce_18,
-  1, 22, :_reduce_none,
-  2, 22, :_reduce_20,
-  3, 22, :_reduce_21,
-  1, 21, :_reduce_none,
-  1, 21, :_reduce_none,
-  1, 23, :_reduce_24,
-  3, 23, :_reduce_25,
-  1, 23, :_reduce_26,
-  3, 23, :_reduce_27,
-  1, 18, :_reduce_none,
-  2, 18, :_reduce_29,
-  1, 28, :_reduce_none,
-  1, 28, :_reduce_none,
-  1, 25, :_reduce_none,
-  2, 25, :_reduce_33,
-  0, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  0, 24, :_reduce_none,
-  1, 24, :_reduce_none,
+  0, 13, :_reduce_1,
+  1, 13, :_reduce_2,
+  3, 13, :_reduce_3,
+  1, 14, :_reduce_4,
   1, 14, :_reduce_none,
+  2, 14, :_reduce_6,
+  2, 14, :_reduce_7,
   1, 14, :_reduce_none,
-  1, 14, :_reduce_none,
-  0, 19, :_reduce_none,
-  1, 19, :_reduce_none,
-  1, 27, :_reduce_none,
-  2, 27, :_reduce_44,
-  0, 20, :_reduce_none,
+  1, 17, :_reduce_9,
+  1, 17, :_reduce_10,
+  4, 16, :_reduce_11,
+  5, 16, :_reduce_12,
+  6, 16, :_reduce_13,
+  3, 16, :_reduce_14,
+  2, 16, :_reduce_15,
+  3, 18, :_reduce_16,
+  4, 18, :_reduce_17,
+  5, 18, :_reduce_18,
+  1, 24, :_reduce_none,
+  2, 24, :_reduce_20,
+  3, 24, :_reduce_21,
+  1, 26, :_reduce_none,
+  1, 26, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 25, :_reduce_26,
+  3, 25, :_reduce_27,
+  1, 25, :_reduce_28,
+  3, 25, :_reduce_29,
   1, 20, :_reduce_none,
+  2, 20, :_reduce_31,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 28, :_reduce_none,
+  2, 28, :_reduce_35,
+  0, 29, :_reduce_none,
   1, 29, :_reduce_none,
-  2, 29, :_reduce_48 ]
+  0, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  0, 21, :_reduce_none,
+  1, 21, :_reduce_none,
+  1, 30, :_reduce_none,
+  2, 30, :_reduce_47,
+  0, 22, :_reduce_none,
+  1, 22, :_reduce_none,
+  1, 19, :_reduce_none,
+  2, 19, :_reduce_51 ]
 
-racc_reduce_n = 49
+racc_reduce_n = 52
 
-racc_shift_n = 75
+racc_shift_n = 80
 
 racc_token_table = {
   false => 0,
@@ -328,9 +357,10 @@ racc_token_table = {
   :AND => 7,
   :APPELLATION => 8,
   :TITLE => 9,
-  :SUFFIX => 10 }
+  :SUFFIX => 10,
+  :UPARTICLE => 11 }
 
-racc_nt_base = 11
+racc_nt_base = 12
 
 racc_use_result_var = true
 
@@ -362,6 +392,7 @@ Racc_token_to_s_table = [
   "APPELLATION",
   "TITLE",
   "SUFFIX",
+  "UPARTICLE",
   "$start",
   "names",
   "name",
@@ -369,18 +400,19 @@ Racc_token_to_s_table = [
   "display_order",
   "honorific",
   "sort_order",
+  "titles",
   "u_words",
   "opt_suffices",
   "opt_titles",
   "last",
   "von",
   "first",
+  "particle",
   "opt_words",
   "words",
   "opt_comma",
   "suffices",
-  "u_word",
-  "titles" ]
+  "u_word" ]
 
 Racc_debug_parser = false
 
@@ -450,36 +482,36 @@ module_eval(<<'.,.,', 'parser.y', 22)
 
 module_eval(<<'.,.,', 'parser.y', 26)
   def _reduce_11(val, _values, result)
-             result = Name.new(:given => val[0], :family => val[1],
-           :suffix => val[2], :title => val[3])
+             result = Name.new(
+           :given => val[0], :family => val[1], :suffix => val[2], :title => val[3]
+         )
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 31)
+module_eval(<<'.,.,', 'parser.y', 32)
   def _reduce_12(val, _values, result)
-             result = Name.new(:given => val[0], :nick => val[1],
-           :family => val[2], :suffix => val[3], :title => val[4])
+             result = Name.new(
+           :given => val[0], :nick => val[1], :family => val[2], :suffix => val[3], :title => val[4]
+         )
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 36)
+module_eval(<<'.,.,', 'parser.y', 38)
   def _reduce_13(val, _values, result)
-             result = Name.new(:given => val[0], :nick => val[1],
-           :particle => val[2], :family => val[3],
-           :suffix => val[4], :title => val[5])
+             result = Name.new(
+           :given => val[0], :nick => val[1], :particle => val[2], :family => val[3], :suffix => val[4], :title => val[5])
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 42)
+module_eval(<<'.,.,', 'parser.y', 43)
   def _reduce_14(val, _values, result)
-             result = Name.new(:given => val[0], :particle => val[1],
-          :family => val[2])
+             result = Name.new(:given => val[0], :particle => val[1], :family => val[2])
 
     result
   end
@@ -495,26 +527,29 @@ module_eval(<<'.,.,', 'parser.y', 47)
 
 module_eval(<<'.,.,', 'parser.y', 52)
   def _reduce_16(val, _values, result)
-             result = Name.new({ :family => val[0], :suffix => val[2][0],
-           :given => val[2][1] }, !!val[2][0])
+             result = Name.new({
+           :family => val[0], :suffix => val[2][0], :given => val[2][1]
+         }, !!val[2][0])
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 57)
+module_eval(<<'.,.,', 'parser.y', 58)
   def _reduce_17(val, _values, result)
-             result = Name.new({ :particle => val[0], :family => val[1],
-           :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
+             result = Name.new({
+           :particle => val[0], :family => val[1], :suffix => val[3][0], :given => val[3][1]
+         }, !!val[3][0])
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 62)
+module_eval(<<'.,.,', 'parser.y', 64)
   def _reduce_18(val, _values, result)
-             result = Name.new({ :particle => val[0,2].join(' '), :family => val[2],
-           :suffix => val[4][0], :given => val[4][1] }, !!val[4][0])
+             result = Name.new({
+           :particle => val[0,2].join(' '), :family => val[2], :suffix => val[4][0], :given => val[4][1]
+         }, !!val[4][0])
 
     result
   end
@@ -522,14 +557,14 @@ module_eval(<<'.,.,', 'parser.y', 62)
 
 # reduce 19 omitted
 
-module_eval(<<'.,.,', 'parser.y', 68)
+module_eval(<<'.,.,', 'parser.y', 71)
   def _reduce_20(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 69)
+module_eval(<<'.,.,', 'parser.y', 72)
   def _reduce_21(val, _values, result)
      result = val.join(' ')
     result
@@ -540,60 +575,60 @@ module_eval(<<'.,.,', 'parser.y', 69)
 
 # reduce 23 omitted
 
-module_eval(<<'.,.,', 'parser.y', 73)
-  def _reduce_24(val, _values, result)
+# reduce 24 omitted
+
+# reduce 25 omitted
+
+module_eval(<<'.,.,', 'parser.y', 78)
+  def _reduce_26(val, _values, result)
      result = [nil,val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 74)
-  def _reduce_25(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 79)
+  def _reduce_27(val, _values, result)
      result = [val[2],val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 75)
-  def _reduce_26(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 80)
+  def _reduce_28(val, _values, result)
      result = [val[0],nil]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 76)
-  def _reduce_27(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 81)
+  def _reduce_29(val, _values, result)
      result = [val[0],val[2]]
     result
   end
 .,.,
 
-# reduce 28 omitted
+# reduce 30 omitted
 
-module_eval(<<'.,.,', 'parser.y', 79)
-  def _reduce_29(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 84)
+  def _reduce_31(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 30 omitted
+# reduce 32 omitted
 
-# reduce 31 omitted
+# reduce 33 omitted
 
-# reduce 32 omitted
+# reduce 34 omitted
 
-module_eval(<<'.,.,', 'parser.y', 84)
-  def _reduce_33(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 89)
+  def _reduce_35(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 34 omitted
-
-# reduce 35 omitted
-
 # reduce 36 omitted
 
 # reduce 37 omitted
@@ -610,21 +645,27 @@ module_eval(<<'.,.,', 'parser.y', 84)
 
 # reduce 43 omitted
 
-module_eval(<<'.,.,', 'parser.y', 94)
-  def _reduce_44(val, _values, result)
+# reduce 44 omitted
+
+# reduce 45 omitted
+
+# reduce 46 omitted
+
+module_eval(<<'.,.,', 'parser.y', 99)
+  def _reduce_47(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 45 omitted
+# reduce 48 omitted
 
-# reduce 46 omitted
+# reduce 49 omitted
 
-# reduce 47 omitted
+# reduce 50 omitted
 
-module_eval(<<'.,.,', 'parser.y', 99)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 104)
+  def _reduce_51(val, _values, result)
      result = val.join(' ')
     result
   end