4209: XML DTD rewrite, cleanup

svn: r17648
This commit is contained in:
Michiel Nauta
2011-06-01 21:33:49 +00:00
parent f8c7e748c7
commit 5d467fc7ea
5 changed files with 599 additions and 480 deletions

View File

@@ -107,7 +107,7 @@ PEOPLE
objref*, address*, attribute*, url*, childof*,
parentin*, personref*, noteref*, sourceref*, tagref*)>
<!ATTLIST person
id CDATA #REQUIRED
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
marker CDATA #IMPLIED
@@ -182,7 +182,7 @@ FAMILY
<!ELEMENT family (rel?, father?, mother?, eventref*, lds_ord*, objref*,
childref*, attribute*, noteref*, sourceref*, tagref*)>
<!ATTLIST family
id CDATA #REQUIRED
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
marker CDATA #IMPLIED
@@ -216,7 +216,7 @@ EVENT
<!ELEMENT event (type?, (daterange|datespan|dateval|datestr)?, place?, cause?,
description?, attribute*, noteref*, sourceref*, objref*)>
<!ATTLIST event
id CDATA #REQUIRED
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
marker CDATA #IMPLIED
@@ -231,7 +231,7 @@ SOURCES
<!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
noteref*, objref*, data_item*, reporef*)>
<!ATTLIST source
id CDATA #REQUIRED
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
marker CDATA #IMPLIED
@@ -251,7 +251,7 @@ PLACES
<!ELEMENT placeobj (ptitle?, coord?, location*, objref*, url*, noteref*,
sourceref*)>
<!ATTLIST placeobj
id CDATA #REQUIRED
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
marker CDATA #IMPLIED
@@ -287,7 +287,7 @@ OBJECTS
<!ELEMENT object (file, attribute*, noteref*,
(daterange|datespan|dateval|datestr)?, sourceref*, tagref*)>
<!ATTLIST object
id CDATA #REQUIRED
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
marker CDATA #IMPLIED
@@ -309,7 +309,7 @@ REPOSITORIES
<!ELEMENT repository (rname, type, address*, url*, noteref*)>
<!ATTLIST repository
id CDATA #REQUIRED
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
marker CDATA #IMPLIED
@@ -326,7 +326,7 @@ NOTES
<!ELEMENT note (text, style*, tagref*)>
<!ATTLIST note
id CDATA #REQUIRED
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
marker CDATA #IMPLIED

View File

@@ -143,7 +143,7 @@
<define name="primary-object">
<ref name="table-object"/>
<attribute name="id"><text/></attribute>
<optional><attribute name="id"><text/></attribute></optional>
<optional><attribute name="priv"><choice>
<value>0</value>
<value>1</value>