Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge schema files from trunk

Browse Source 
svn: r18087
This commit is contained in:
Nick Hall 2011-08-30 18:30:12 +00:00
parent afef197a57
commit b438b7c248
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/grampsxml.dtd
View File

@ -119,9 +119,8 @@ GENDER has values of M, F, or U.
--> -->
<!ELEMENT gender (#PCDATA)> <!ELEMENT gender (#PCDATA)>
<!ELEMENT name (first?, call?, surname*, nick?, familynick?, suffix?, title?, <!ELEMENT name (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
group?, (daterange|datespan|dateval|datestr)?, noteref*, (daterange|datespan|dateval|datestr)?, noteref*, citationref*)>
citationref*)>
<!ATTLIST name <!ATTLIST name
alt (0|1) #IMPLIED alt (0|1) #IMPLIED
type CDATA #IMPLIED type CDATA #IMPLIED
@ -165,6 +164,7 @@ GENDER has values of M, F, or U.
<!ATTLIST address priv (0|1) #IMPLIED> <!ATTLIST address priv (0|1) #IMPLIED>
<!ELEMENT street (#PCDATA)> <!ELEMENT street (#PCDATA)>
<!ELEMENT locality (#PCDATA)>
<!ELEMENT city (#PCDATA)> <!ELEMENT city (#PCDATA)>
<!ELEMENT county (#PCDATA)> <!ELEMENT county (#PCDATA)>
<!ELEMENT country (#PCDATA)> <!ELEMENT country (#PCDATA)>
@ -381,7 +381,8 @@ BOOKMARKS
<!ELEMENT bookmarks (bookmark)*> <!ELEMENT bookmarks (bookmark)*>
<!ELEMENT bookmark EMPTY> <!ELEMENT bookmark EMPTY>
<!ATTLIST bookmark <!ATTLIST bookmark
target (person|family|event|source|place|media|repository) #REQUIRED target (person|family|event|source|place|media|repository|
note) #REQUIRED
hlink IDREF #REQUIRED hlink IDREF #REQUIRED
> >

49
data/grampsxml.rng
View File

@ -230,6 +230,7 @@
<ref name="priv-content"/> <ref name="priv-content"/>
</attribute></optional> </attribute></optional>
<optional><attribute name="type"><choice> <optional><attribute name="type"><choice>
<value>Unknown</value>
<value>Also Known As</value> <value>Also Known As</value>
<value>Birth Name</value> <value>Birth Name</value>
<value>Married Name</value> <value>Married Name</value>
@ -239,9 +240,9 @@
<optional><attribute name="display"><text/></attribute></optional> <optional><attribute name="display"><text/></attribute></optional>
<optional><element name="first"><text/></element></optional> <optional><element name="first"><text/></element></optional>
<optional><element name="call"><text/></element></optional> <optional><element name="call"><text/></element></optional>
<zeroOrMore> <zeroOrMore><element name="surname">
<ref name="surname-content"/> <ref name="surname-content"/>
</zeroOrMore> </element></zeroOrMore>
<optional><element name="suffix"><text/></element></optional> <optional><element name="suffix"><text/></element></optional>
<optional><element name="title"><text/></element></optional> <optional><element name="title"><text/></element></optional>
<optional><element name="nick"><text/></element></optional> <optional><element name="nick"><text/></element></optional>
@ -257,21 +258,27 @@
</define> </define>
<define name="surname-content"> <define name="surname-content">
<element name="surname"> <text/>
<text/> <optional><attribute name="prefix"><text/></attribute></optional>
<optional><attribute name="prefix"><text/></attribute></optional> <optional><attribute name="prim"><choice>
<optional><attribute name="prim"><choice> <value>1</value>
<value>1</value> <value>0</value>
<value>0</value> </choice></attribute></optional>
</choice></attribute></optional> <optional><attribute name="derivation"><choice>
<optional><attribute name="derivation"><choice> <value>Unknown</value>
<value>inherited</value> <value>Inherited</value>
<value>patronymic</value> <value>Given</value>
<value>matronymic</value> <value>Taken</value>
<value>other</value> <value>Patronymic</value>
</choice></attribute></optional> <value>Matronymic</value>
<optional><attribute name="connector"><text/></attribute></optional> <value>Feudal</value>
</element> <value>Pseudonym</value>
<value>Patrilineal</value>
<value>Matrilineal</value>
<value>Occupation</value>
<value>Location</value>
</choice></attribute></optional>
<optional><attribute name="connector"><text/></attribute></optional>
</define> </define>
<define name="address-content"> <define name="address-content">
@ -376,6 +383,12 @@
<optional><attribute name="frel"> <optional><attribute name="frel">
<ref name="child-rel"/> <ref name="child-rel"/>
</attribute></optional> </attribute></optional>
<zeroOrMore><element name="citationref">
<ref name="citationref-content"/>
</element></zeroOrMore>
<zeroOrMore><element name="noteref">
<ref name="noteref-content"/>
</element></zeroOrMore>
</element></zeroOrMore> </element></zeroOrMore>
<zeroOrMore><element name="attribute"> <zeroOrMore><element name="attribute">
<ref name="attribute-content"/> <ref name="attribute-content"/>
@ -464,6 +477,7 @@
</element></optional> </element></optional>
<zeroOrMore><element name="location"> <zeroOrMore><element name="location">
<optional><attribute name="street"><text/></attribute></optional> <optional><attribute name="street"><text/></attribute></optional>
<optional><attribute name="locality"><text/></attribute></optional>
<optional><attribute name="city"><text/></attribute></optional> <optional><attribute name="city"><text/></attribute></optional>
<optional><attribute name="parish"><text/></attribute></optional> <optional><attribute name="parish"><text/></attribute></optional>
<optional><attribute name="county"><text/></attribute></optional> <optional><attribute name="county"><text/></attribute></optional>
@ -532,6 +546,7 @@
<value>place</value> <value>place</value>
<value>media</value> <value>media</value>
<value>repository</value> <value>repository</value>
<value>note</value>
</choice></attribute> </choice></attribute>
<attribute name="hlink"><data type="IDREF"/></attribute> <attribute name="hlink"><data type="IDREF"/></attribute>
</define> </define>