svn: r5314
This commit is contained in:
Alex Roitman
2005-10-13 21:36:18 +00:00
parent 9307f2221a
commit 1edd0bf53d
2 changed files with 29 additions and 8 deletions

View File

@@ -335,21 +335,22 @@ EVENT
value CDATA #REQUIRED value CDATA #REQUIRED
> >
<!ELEMENT lds_ord (temple?,place?,status?,sealed_to?,note?,sourceref*)> <!ELEMENT lds_ord ((daterange|dateval|datestr)?,temple?,place?,status?,
sealed_to?,note?,sourceref*)>
<!ATTLIST lds_ord <!ATTLIST lds_ord
type CDATA #REQUIRED type CDATA #REQUIRED
> >
<!ELEMENt temple #EMPTY> <!ELEMENT temple EMPTY>
<!ATTLIST temple <!ATTLIST temple
val CDATA #REQUIRED val CDATA #REQUIRED
> >
<!ELEMENt status #EMPTY> <!ELEMENT status EMPTY>
<!ATTLIST status <!ATTLIST status
val CDATA #REQUIRED val CDATA #REQUIRED
> >
<!ELEMENt sealed_to #EMPTY> <!ELEMENT sealed_to EMPTY>
<!ATTLIST sealed_to <!ATTLIST sealed_to
hlink IDREF #REQUIRED hlink IDREF #REQUIRED
> >

View File

@@ -160,11 +160,12 @@
<define name="child-rel"> <define name="child-rel">
<choice> <choice>
<value>None</value>
<value>Birth</value> <value>Birth</value>
<value>Adopted</value> <value>Adopted</value>
<value>Stepchild</value>
<value>Sponsored</value> <value>Sponsored</value>
<value>Foster</value> <value>Foster</value>
<value>None</value>
<value>Other</value> <value>Other</value>
<value>Unknown</value> <value>Unknown</value>
</choice> </choice>
@@ -247,7 +248,7 @@
<define name="family-content"> <define name="family-content">
<ref name="primary-object"/> <ref name="primary-object"/>
<optional><attribute name="comlpete"><choice> <optional><attribute name="complete"><choice>
<value>0</value> <value>0</value>
<value>1</value> <value>1</value>
</choice></attribute></optional> </choice></attribute></optional>
@@ -276,6 +277,16 @@
<zeroOrMore><element name="child"> <zeroOrMore><element name="child">
<attribute name="hlink"><data type="IDREF"/></attribute> <attribute name="hlink"><data type="IDREF"/></attribute>
</element></zeroOrMore> </element></zeroOrMore>
<zeroOrMore><element name="attribute">
<ref name="attribute-content"/>
</element></zeroOrMore>
<optional><element name="note">
<ref name="note-content"/>
</element></optional>
<optional><ref name="date-content"/></optional>
<zeroOrMore><element name="sourceref">
<ref name="sourceref-content"/>
</element></zeroOrMore>
</define> </define>
<define name="source-content"> <define name="source-content">
@@ -378,16 +389,24 @@
</attribute></optional> </attribute></optional>
<attribute name="type"><text/></attribute> <attribute name="type"><text/></attribute>
<attribute name="value"><text/></attribute> <attribute name="value"><text/></attribute>
<zeroOrMore><element name="sourceref">
<ref name="sourceref-content"/>
</element></zeroOrMore>
<optional><element name="note">
<ref name="note-content"/>
</element></optional>
</define> </define>
<define name="event-content"> <define name="event-content">
<attribute name="type"><text/></attribute> <attribute name="type"><text/></attribute>
<optional><attribute name="priv"> <optional><attribute name="priv">
<ref name="priv-content"/> <ref name="priv-content"/>
</attribute></optional> </attribute></optional>
<optional><ref name="date-content"/></optional> <optional><ref name="date-content"/></optional>
<zeroOrMore><element name="witness"> <zeroOrMore><element name="witness">
<optional><attribute name="hlink"><data type="IDREF"/></attribute></optional> <optional><attribute name="hlink">
<data type="IDREF"/>
</attribute></optional>
<optional><attribute name="name"><text/></attribute></optional> <optional><attribute name="name"><text/></attribute></optional>
<optional><element name="comment"><text/></element></optional> <optional><element name="comment"><text/></element></optional>
</element></zeroOrMore> </element></zeroOrMore>
@@ -434,6 +453,7 @@
<define name="lds-content"> <define name="lds-content">
<attribute name="type"><text/></attribute> <attribute name="type"><text/></attribute>
<optional><ref name="date-content"/></optional>
<optional><element name="temple"> <optional><element name="temple">
<attribute name="val"><text/></attribute> <attribute name="val"><text/></attribute>
</element></optional> </element></optional>