Merged geps21 branch, changes r15866-16034, into trunk

svn: r16035

data/grampsxml.dtd

@@ -59,6 +59,7 @@ DATABASE
                     bookmarks?, namemaps?)>
 <!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.4.0/">
 
+
 <!--    ************************************************************
 HEADER
 
@@ -98,7 +99,7 @@ PEOPLE
         home    IDREF #IMPLIED
 >
 
-<!ELEMENT person (gender, name*, nick?, eventref*, lds_ord*,
+<!ELEMENT person (gender, name*, eventref*, lds_ord*,
                   objref*, address*, attribute*, url*, childof*,
                   parentin*, personref*, noteref*, sourceref*, tagref*)>
 <!ATTLIST person
@@ -114,7 +115,7 @@ GENDER has values of M, F, or U.
 -->
 <!ELEMENT gender  (#PCDATA)>
 
-<!ELEMENT name    (first?, call?, last?, suffix?, patronymic?, title?,
+<!ELEMENT name    (first?, call?, surname*, nick?, familynick?, suffix?, title?, group?
                   (daterange|datespan|dateval|datestr)?, noteref*, sourceref*)>
 <!ATTLIST name    
         alt       (0|1) #IMPLIED
@@ -126,16 +127,18 @@ GENDER has values of M, F, or U.
 
 <!ELEMENT first      (#PCDATA)>
 <!ELEMENT call       (#PCDATA)>
-<!ELEMENT last       (#PCDATA)>
-<!ATTLIST last
-        prefix CDATA #IMPLIED
-        group  CDATA #IMPLIED
->
 <!ELEMENT suffix     (#PCDATA)>
-<!ELEMENT patronymic (#PCDATA)>
 <!ELEMENT title      (#PCDATA)>
-
 <!ELEMENT nick       (#PCDATA)>
+<!ELEMENT familynick (#PCDATA)>
+<!ELEMENT group      (#PCDATA)>
+<!ELEMENT surname    (#PCDATA)>
+<!ATTLIST surname
+        prefix      CDATA #IMPLIED
+        primary     (1|0) #IMPLIED
+        derivation  CDATA #IMPLIED
+        connector   CDATA #IMPLIED
+>
 
 <!ELEMENT childof EMPTY>
 <!ATTLIST childof hlink IDREF  #REQUIRED