Working XML import with new surnames

svn: r15947

data/grampsxml.dtd

@@ -55,7 +55,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, events?, people?, families?,
                     sources?, places?, objects?, repositories?, notes?,
                     bookmarks?,namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.3.0/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.4.0/">
 
 <!--	************************************************************
 HEADER
@@ -96,7 +96,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*)>
 <!ATTLIST person
@@ -112,7 +112,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
@@ -124,16 +124,19 @@ 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 nick      (#PCDATA)>
+<!ELEMENT surname    (#PCDATA)>
+<!ATTLIST surname
+        prefix      CDATA #IMPLIED
+        primary     (0|1) #IMPLIED
+        derivation  CDATA #IMPLIED
+        connector   CDATA #IMPLIED
+>
 
 <!ELEMENT childof EMPTY>
 <!ATTLIST childof hlink IDREF  #REQUIRED