namae 0.11.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a5eed2ed2fda1cdb5f3788c9efeeb683b7e8276f
-  data.tar.gz: 532bf0e2614b9eaabf573738a51eab2ce6c6f3ec
+SHA256:
+  metadata.gz: 82fa8955c4f650ccbcb6bf67db18f005eafd2f1f09252b8d98203a6f04949ed2
+  data.tar.gz: c96965c52193db381f8fceb0e8bfc34453f62127c846b6cb593e804c25394908
 SHA512:
-  metadata.gz: 553ba41aeacc723823d2a211fb411dd108f99729d209e9e60162c560b93bf3253ec34c174b3109ce765da7671850f6867cc33d7262b3a257ee1749cfda1ed61d
-  data.tar.gz: 008fc33f407ec11f5e65ad91cd0474c990e8cf4007c3357ceb3d6136aa4912da657dea824a84aedbc82650fa444d216637cceed27dbd59a9c21bb9c8e1b3cba0
+  metadata.gz: 14644528eb8d587a2fd0064fbddfa6cfe8925d7a1b9b3f6a75b33c599f3bbb9a43b53e951e4ec8fab9506c5edc2ef62abff77fc1f43cca1ce3489c5ab4c36f8f
+  data.tar.gz: 921b0c60e964b8e5f6154008ab8923d59a2df5523484e38618f3ddddbd89eb2d0ad99ffdbbc9d90629cced3051e38fffb05617657338018afd8913cefc6e891c

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,23 @@ 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.
 
+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 +187,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/lists.feature

@@ -115,7 +115,8 @@ 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     |
@@ -126,3 +127,12 @@ Feature: Parse a list of names
       | given | family     |
       | M     | Di Proctor |
       | P     | 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/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', 122)
+
+  @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((Da|De|Di|De\sLa|Du|Der|Des|Da|St|Saint|Les|Van)\.?)(\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,29 @@ 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
   end
 
   def normalize(string)
-    string = string.match(/\D*/).to_s.strip
-    string
+    string.scrub.strip
   end
 
   def reset
@@ -129,11 +145,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 +181,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 +207,143 @@ 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 ]
+   -41,    18,    25,    34,   -42,    35,    36,   -41,    19,   -41,
+   -41,   -42,    40,   -42,   -42,    15,    13,    16,    46,    52,
+     7,    17,    62,    12,    15,    24,    16,    27,    15,    13,
+    16,    17,    29,     7,    17,    66,    12,    15,    24,    16,
+    27,    73,    60,    59,    61,    29,    74,    46,   -40,   -36,
+   -24,    60,    59,    61,    66,   -40,    69,    25,    46,    60,
+    59,    61,    60,    59,    61,    17,    46,    46,    46,    46,
+    60,    59,    61,    15,    24,    16,    17,    46,    34,    32,
+    35,    34,    38,    35,    34,    32,    35,   -21,   -21,   -21,
+    34,    49,    35,    34,    32,    35,    34,    38,    35,   -22,
+   -22,   -22,    34,    53,    35,    34,    32,    35,    34,    32,
+    35,   -21,   -21,   -21,    60,    59,    61,    60,    59,    61,
+    66 ]
 
 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 ]
+    15,     1,     8,    39,    16,    39,    11,    15,     1,    15,
+    15,    16,    18,    16,    16,     0,     0,     0,    26,    31,
+     0,     0,    37,     0,     9,     9,     9,     9,    19,    19,
+    19,    44,     9,    19,    19,    45,    19,    22,    22,    22,
+    22,    56,    56,    56,    56,    22,    57,    47,    13,    56,
+    13,    36,    36,    36,    57,    13,    50,    65,    36,    52,
+    52,    52,    62,    62,    62,    67,    52,    68,    71,    62,
+    69,    69,    69,     5,     5,     5,    77,    69,    10,    10,
+    10,    12,    12,    12,    23,    23,    23,    24,    24,    24,
+    27,    27,    27,    28,    28,    28,    29,    29,    29,    32,
+    32,    32,    33,    33,    33,    42,    42,    42,    48,    48,
+    48,    49,    49,    49,    74,    74,    74,    80,    80,    80,
+    79 ]
 
 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 ]
+    12,     1,   nil,   nil,   nil,    70,   nil,   nil,    -7,    21,
+    75,     4,    78,    48,   nil,     0,     4,   nil,    12,    25,
+   nil,   nil,    34,    81,    84,   nil,     8,    87,    90,    93,
+   nil,    17,    96,    99,   nil,   nil,    48,    20,   nil,     0,
+   nil,   nil,   102,   nil,    22,    25,   nil,    37,   105,   108,
+    54,   nil,    56,   nil,   nil,   nil,    39,    44,   nil,   nil,
+   nil,   nil,    59,   nil,   nil,    48,   nil,    56,    57,    67,
+   nil,    58,   nil,   nil,   111,   nil,   nil,    67,   nil,   110,
+   114,   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,   -51,    -2,    -4,    -5,   -51,    -8,    -9,   -10,   -25,
+   -51,   -51,   -51,   -21,   -30,   -32,   -33,   -49,   -51,   -51,
+    -6,    -7,   -51,   -51,   -40,   -50,   -43,   -51,   -51,   -51,
+   -31,   -16,   -24,   -25,   -32,   -33,   -38,   -51,   -24,   -25,
+    82,    -3,   -51,   -16,   -47,   -44,   -45,   -43,   -51,   -24,
+   -14,   -15,   -38,   -23,   -17,   -26,   -39,   -28,   -34,   -40,
+   -41,   -42,   -38,   -14,   -11,   -48,   -46,   -47,   -43,   -38,
+   -19,   -51,   -35,   -37,   -51,   -18,   -12,   -47,   -20,   -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,
+     3,     1,    45,    44,    54,    20,    64,    21,    31,    26,
+    37,    23,    80,     2,    71,    28,     8,   nil,    30,     3,
+    70,    43,    26,    45,    67,    47,    50,    51,    42,    76,
+    75,    30,    41,    48,   nil,     8,   nil,    78,     9,    81,
+    63,   nil,    30,    22,    45,    77,    68,    79,    30,   nil,
+    39,   nil,   nil,   nil,   nil,   nil,    72,     9,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    39,   nil,    39,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    65 ]
+    72 ]
 
 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,
+     3,     1,    17,     9,    13,     3,    10,     4,    11,     3,
+    11,    12,    15,     2,    16,    12,     7,   nil,    18,     3,
+    13,    11,     3,    17,     9,    11,    11,    11,    12,    10,
+    13,    18,     2,    12,   nil,     7,   nil,    13,     8,    10,
+    11,   nil,    18,     8,    17,     9,    11,    17,    18,   nil,
+     8,   nil,   nil,   nil,   nil,   nil,     3,     8,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     8,   nil,     8,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     3 ]
+     3 ]
 
 racc_goto_pointer = [
-   nil,    10,     6,     0,     6,   nil,   nil,     7,   -22,   -33,
-     5,    23,   -24,   nil,   -53,   -30,   -29,    -7,   nil ]
+   nil,     1,    13,     0,     2,   nil,   nil,    16,    38,   -23,
+   -38,    -2,     6,   -32,   nil,   -62,   -42,   -24,     9 ]
 
 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,    58,     4,     5,     6,    65,    33,   nil,
+   nil,    11,    10,   nil,    55,    56,   nil,    57,    14 ]
 
 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,
-  1, 14, :_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,
-  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,
+  3, 16, :_reduce_15,
+  2, 16, :_reduce_16,
+  3, 18, :_reduce_17,
+  4, 18, :_reduce_18,
+  4, 18, :_reduce_19,
+  5, 18, :_reduce_20,
+  1, 24, :_reduce_none,
+  2, 24, :_reduce_22,
+  3, 24, :_reduce_23,
+  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, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 27, :_reduce_none,
+  2, 27, :_reduce_35,
+  0, 28, :_reduce_none,
+  1, 28, :_reduce_none,
+  0, 26, :_reduce_none,
+  1, 26, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
+  0, 21, :_reduce_none,
+  1, 21, :_reduce_none,
   1, 29, :_reduce_none,
-  2, 29, :_reduce_48 ]
+  2, 29, :_reduce_46,
+  0, 22, :_reduce_none,
+  1, 22, :_reduce_none,
+  1, 19, :_reduce_none,
+  2, 19, :_reduce_50 ]
 
-racc_reduce_n = 49
+racc_reduce_n = 51
 
-racc_shift_n = 75
+racc_shift_n = 82
 
 racc_token_table = {
   false => 0,
@@ -328,9 +356,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 +391,7 @@ Racc_token_to_s_table = [
   "APPELLATION",
   "TITLE",
   "SUFFIX",
+  "UPARTICLE",
   "$start",
   "names",
   "name",
@@ -369,6 +399,7 @@ Racc_token_to_s_table = [
   "display_order",
   "honorific",
   "sort_order",
+  "titles",
   "u_words",
   "opt_suffices",
   "opt_titles",
@@ -379,8 +410,7 @@ Racc_token_to_s_table = [
   "words",
   "opt_comma",
   "suffices",
-  "u_word",
-  "titles" ]
+  "u_word" ]
 
 Racc_debug_parser = false
 
@@ -487,14 +517,26 @@ module_eval(<<'.,.,', 'parser.y', 42)
 
 module_eval(<<'.,.,', 'parser.y', 47)
   def _reduce_15(val, _values, result)
-             result = Name.new(:particle => val[0], :family => val[1])
+              result = if include_particle_in_family?
+                    Name.new(:given => val[0], :family => val[1,2].join(' '))
+                   else
+                     Name.new(:given => val[0], :particle => val[1], :family => val[2])
+                   end
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 52)
+module_eval(<<'.,.,', 'parser.y', 55)
   def _reduce_16(val, _values, result)
+             result = Name.new(:particle => val[0], :family => val[1])
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 60)
+  def _reduce_17(val, _values, result)
              result = Name.new({ :family => val[0], :suffix => val[2][0],
            :given => val[2][1] }, !!val[2][0])
 
@@ -502,8 +544,20 @@ module_eval(<<'.,.,', 'parser.y', 52)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 57)
-  def _reduce_17(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 65)
+  def _reduce_18(val, _values, result)
+             result = if include_particle_in_family?
+                    Name.new({ :family => val[0,2].join(' '), :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
+                  else
+                    Name.new({ :particle => val[0], :family => val[1], :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
+                  end
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 73)
+  def _reduce_19(val, _values, result)
              result = Name.new({ :particle => val[0], :family => val[1],
            :suffix => val[3][0], :given => val[3][1] }, !!val[3][0])
 
@@ -511,8 +565,8 @@ module_eval(<<'.,.,', 'parser.y', 57)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 62)
-  def _reduce_18(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 78)
+  def _reduce_20(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])
 
@@ -520,80 +574,76 @@ module_eval(<<'.,.,', 'parser.y', 62)
   end
 .,.,
 
-# reduce 19 omitted
+# reduce 21 omitted
 
-module_eval(<<'.,.,', 'parser.y', 68)
-  def _reduce_20(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 84)
+  def _reduce_22(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 69)
-  def _reduce_21(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 85)
+  def _reduce_23(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 22 omitted
+# reduce 24 omitted
 
-# reduce 23 omitted
+# reduce 25 omitted
 
-module_eval(<<'.,.,', 'parser.y', 73)
-  def _reduce_24(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 89)
+  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', 90)
+  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', 91)
+  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', 92)
+  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', 95)
+  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', 100)
+  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 +660,25 @@ 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
+
+module_eval(<<'.,.,', 'parser.y', 110)
+  def _reduce_46(val, _values, result)
      result = val.join(' ')
     result
   end
 .,.,
 
-# reduce 45 omitted
+# reduce 47 omitted
 
-# reduce 46 omitted
+# reduce 48 omitted
 
-# reduce 47 omitted
+# reduce 49 omitted
 
-module_eval(<<'.,.,', 'parser.y', 99)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 115)
+  def _reduce_50(val, _values, result)
      result = val.join(' ')
     result
   end