From 482f2d112e1855663ccbb1208497b9a234f0d82e Mon Sep 17 00:00:00 2001
From: Benny Malengier <benny.malengier@gramps-project.org>
Date: Tue, 16 Nov 2010 20:29:45 +0000
Subject: [PATCH] extend nameorigin with 3 extra types: coming from father,
 from mother, and from occupation. Adding surname to the generated docs

svn: r16197
---
 docs/gen/gen_lib.rst          | 23 +++++++++++++++++++++++
 src/gen/lib/nameorigintype.py | 32 ++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/docs/gen/gen_lib.rst b/docs/gen/gen_lib.rst
index e911604ca..e1e095c08 100644
--- a/docs/gen/gen_lib.rst
+++ b/docs/gen/gen_lib.rst
@@ -95,6 +95,14 @@ AttributeBase
    :undoc-members:
    :show-inheritance:
 
+SurnameBase
+====================================
+.. automodule:: gen.lib.surnamebase
+.. autoclass:: SurnameBase
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 DateBase
 ====================================
 .. automodule:: gen.lib.datebase
@@ -260,6 +268,14 @@ Name
    :undoc-members:
    :show-inheritance:
 
+Surname
+====================================
+.. automodule:: gen.lib.surname
+.. autoclass:: Surname
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 Url
 ====================================
 .. automodule:: gen.lib.url
@@ -408,6 +424,13 @@ NameType
    :undoc-members:
    :show-inheritance:
 
+NameOriginType
+===========
+.. automodule:: gen.lib.nameorigintype
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 AttributeType
 =============
 .. automodule:: gen.lib.attrtype
diff --git a/src/gen/lib/nameorigintype.py b/src/gen/lib/nameorigintype.py
index 00089a607..3257bd39f 100644
--- a/src/gen/lib/nameorigintype.py
+++ b/src/gen/lib/nameorigintype.py
@@ -40,18 +40,21 @@ from gen.lib.grampstype import GrampsType
 
 class NameOriginType(GrampsType):
     """
-    Name Origina Types
+    Name Origin Types
     
     .. attribute UNKNOWN:   Unknown origin
     .. attribute CUSTOM:    Custom user defined origin
     .. attribute NONE:      no given origin
     .. attribute INHERITED: name was inherited from parents
+    .. attribute PATRILINEAL:  name was inherited from father's family name
+    .. attribute MATRILINEAL:  name was inherited from mother's family name
     .. attribute GIVEN:     name was bestowed on the individual
     .. attribute TAKEN:     name was chosen by the individual
     .. attribute PATRONYMIC: name is derived from father's given name
     .. attribute MATRONYMIC: name is derived from mother's given name
     .. attribute FEUDAL:    name refers to the holding of land in a fief
     .. attribute PSEUDONYM: name is fictitious
+    .. attribute OCCUPATION: name follows from the occupation of the person
     """
 
     UNKNOWN    = -1
@@ -64,22 +67,27 @@ class NameOriginType(GrampsType):
     MATRONYMIC = 6
     FEUDAL     = 7
     PSEUDONYM  = 8
+    PATRILINEAL= 9
+    MATRILINEAL= 10
+    OCCUPATION = 11
 
     _CUSTOM = CUSTOM
     _DEFAULT = NONE
 
     _DATAMAP = [
-        (UNKNOWN   , _("Unknown"),           "Unknown"),
-        (CUSTOM    , _("Custom"),            "Custom"),
-        (NONE      , "",                     ""),
-        (INHERITED , _("Surname|Inherited"), "Inherited"),
-        (GIVEN     , _("Surname|Given"),     "Given"),
-        (TAKEN     , _("Surname|Taken"),     "Taken"),
-        (PATRONYMIC, _("Patronymic"),        "Patronymic"),
-        (MATRONYMIC, _("Matronymic"),        "Matronymic"),
-        (FEUDAL    , _("Surname|Feudal"),    "Feudal"),
-        (PSEUDONYM , _("Pseudonym"),         "Pseudonym"),
-        
+        (UNKNOWN    , _("Unknown"),           "Unknown"),
+        (CUSTOM     , _("Custom"),            "Custom"),
+        (NONE       , "",                     ""),
+        (INHERITED  , _("Surname|Inherited"), "Inherited"),
+        (GIVEN      , _("Surname|Given"),     "Given"),
+        (TAKEN      , _("Surname|Taken"),     "Taken"),
+        (PATRONYMIC , _("Patronymic"),        "Patronymic"),
+        (MATRONYMIC , _("Matronymic"),        "Matronymic"),
+        (FEUDAL     , _("Surname|Feudal"),    "Feudal"),
+        (PSEUDONYM  , _("Pseudonym"),         "Pseudonym"),
+        (PATRILINEAL, _("Patrilineal"),       "Patrilineal"),
+        (MATRILINEAL, _("Matrilineal"),       "Matrilineal"),
+        (OCCUPATION , _("Occupation"),        "Occupation")
         ]
 
     def __init__(self, value=None):