Commit 96587cd1 by Robbie Hott

Latest cpf.rng version

parent b6ab2938
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
STILL NEEDS REVISION OF WHERE placeEntry USED
***************** *****************
SNAC localization: SNAC localization:
...@@ -40,6 +40,23 @@ ...@@ -40,6 +40,23 @@
Added local attribute snac:preferenceScore to <nameEntry> Added local attribute snac:preferenceScore to <nameEntry>
7. 20140319
Fixed misspelling of attribute name accuarcy > accuracy (twice)
8. 20140414
snac:placeEntry -modified placeEntry to accommodate attempts at matching geonames in order to normalize the entry and
to fetch coordinate information. Because this could not be done with reliable accuracy, we decided to record the
results of the matching attempt for later use in human editing, as a a "good match" is frequenty in the result sets.
The revision "wraps the original placeEntry," that is, the placeEntry derived from contributed SNAC source data in a
snac:placeEntry (with original placeEntry the first contained tagged data, followed by snac:placeEntryLikelySame (one,
optional), and then followed by snac:placeEntryBestMaybeSame (one, optional), followed by zero or more
snac:placeEntryMaybeSame. This revision is highly specific to SNAC, and thus is not a candidate for revision of
standard SNAC.
***************** *****************
ENCODED ARCHIVAL CONTEXT-CORPORATE BODIES, PERSONS, AND FAMILIES (EAC-CPF) SCHEMA ENCODED ARCHIVAL CONTEXT-CORPORATE BODIES, PERSONS, AND FAMILIES (EAC-CPF) SCHEMA
...@@ -102,7 +119,6 @@ ...@@ -102,7 +119,6 @@
xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xml="http://www.w3.org/XML/1998/namespace"
xmlns:snac="http://socialarchive.iath.virginia.edu/"> xmlns:snac="http://socialarchive.iath.virginia.edu/">
<!-- <!--
Import used in cpf.xsd: Import used in cpf.xsd:
...@@ -113,11 +129,9 @@ ...@@ -113,11 +129,9 @@
<xs:attributeGroup ref="xlink:simpleLink"/> <xs:attributeGroup ref="xlink:simpleLink"/>
--> -->
<start> <start>
<ref name="e.eac-cpf"/> <ref name="e.eac-cpf"/>
</start> </start>
<define name="e.eac-cpf"> <define name="e.eac-cpf">
<element a:id="eac-cpf" name="eac-cpf"> <element a:id="eac-cpf" name="eac-cpf">
<optional> <optional>
...@@ -136,7 +150,6 @@ ...@@ -136,7 +150,6 @@
</choice> </choice>
</element> </element>
</define> </define>
<define name="e.cpfDescription"> <define name="e.cpfDescription">
<element a:id="cpfDescription" name="cpfDescription"> <element a:id="cpfDescription" name="cpfDescription">
<optional> <optional>
...@@ -160,7 +173,6 @@ ...@@ -160,7 +173,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.multipleIdentities"> <define name="e.multipleIdentities">
<element a:id="multipleIdentities" name="multipleIdentities"> <element a:id="multipleIdentities" name="multipleIdentities">
<optional> <optional>
...@@ -178,9 +190,7 @@ ...@@ -178,9 +190,7 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
<div a:documentation="Control"> <div a:documentation="Control">
<define name="e.control"> <define name="e.control">
<element a:id="control" name="control"> <element a:id="control" name="control">
<optional> <optional>
...@@ -250,7 +260,6 @@ ...@@ -250,7 +260,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.maintenanceAgency"> <define name="e.maintenanceAgency">
<element a:id="maintenanceAgency" name="maintenanceAgency"> <element a:id="maintenanceAgency" name="maintenanceAgency">
<optional> <optional>
...@@ -291,7 +300,6 @@ ...@@ -291,7 +300,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.maintenanceHistory"> <define name="e.maintenanceHistory">
<element a:id="maintenanceHistory" name="maintenanceHistory"> <element a:id="maintenanceHistory" name="maintenanceHistory">
<optional> <optional>
...@@ -368,7 +376,6 @@ ...@@ -368,7 +376,6 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
<define name="e.languageDeclaration"> <define name="e.languageDeclaration">
<element a:id="languageDeclaration" name="languageDeclaration"> <element a:id="languageDeclaration" name="languageDeclaration">
<optional> <optional>
...@@ -384,7 +391,6 @@ ...@@ -384,7 +391,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.conventionDeclaration"> <define name="e.conventionDeclaration">
<element a:id="conventionDeclaration" name="conventionDeclaration"> <element a:id="conventionDeclaration" name="conventionDeclaration">
<optional> <optional>
...@@ -402,7 +408,6 @@ ...@@ -402,7 +408,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.localTypeDeclaration"> <define name="e.localTypeDeclaration">
<element a:id="localTypeDeclaration" name="localTypeDeclaration"> <element a:id="localTypeDeclaration" name="localTypeDeclaration">
<optional> <optional>
...@@ -420,7 +425,6 @@ ...@@ -420,7 +425,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.abbreviation"> <define name="e.abbreviation">
<element a:id="abbreviation" name="abbreviation"> <element a:id="abbreviation" name="abbreviation">
<optional> <optional>
...@@ -429,7 +433,6 @@ ...@@ -429,7 +433,6 @@
<data type="token"/> <data type="token"/>
</element> </element>
</define> </define>
<define name="e.localControl"> <define name="e.localControl">
<element a:id="localControl" name="localControl"> <element a:id="localControl" name="localControl">
<optional> <optional>
...@@ -450,7 +453,6 @@ ...@@ -450,7 +453,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.sources"> <define name="e.sources">
<element a:id="sources" name="sources"> <element a:id="sources" name="sources">
<optional> <optional>
...@@ -497,11 +499,8 @@ ...@@ -497,11 +499,8 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
</div> </div>
<div a:documentation="Identity"> <div a:documentation="Identity">
<define name="e.identity"> <define name="e.identity">
<element a:id="identity" name="identity"> <element a:id="identity" name="identity">
<optional> <optional>
...@@ -569,7 +568,6 @@ ...@@ -569,7 +568,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.part"> <define name="e.part">
<element a:id="part" name="part"> <element a:id="part" name="part">
<optional> <optional>
...@@ -584,7 +582,6 @@ ...@@ -584,7 +582,6 @@
<text/> <text/>
</element> </element>
</define> </define>
<define name="e.useDates"> <define name="e.useDates">
<element a:id="useDates" name="useDates"> <element a:id="useDates" name="useDates">
<optional> <optional>
...@@ -596,7 +593,6 @@ ...@@ -596,7 +593,6 @@
<ref name="m.dates"/> <ref name="m.dates"/>
</element> </element>
</define> </define>
<define name="e.nameEntryParallel"> <define name="e.nameEntryParallel">
<element a:id="nameEntryParallel" name="nameEntryParallel"> <element a:id="nameEntryParallel" name="nameEntryParallel">
<optional> <optional>
...@@ -615,7 +611,6 @@ ...@@ -615,7 +611,6 @@
<ref name="m.nameEntryAuthorizedorAlternative"/> <ref name="m.nameEntryAuthorizedorAlternative"/>
</element> </element>
</define> </define>
<define name="m.nameEntryInParallel"> <define name="m.nameEntryInParallel">
<element a:id="nameEntryInParallel" name="nameEntry"> <element a:id="nameEntryInParallel" name="nameEntry">
<optional> <optional>
...@@ -645,7 +640,6 @@ ...@@ -645,7 +640,6 @@
</zeroOrMore> </zeroOrMore>
</element> </element>
</define> </define>
<define name="a.snacPreferenceScore"> <define name="a.snacPreferenceScore">
<optional> <optional>
<attribute name="snac:preferenceScore"> <attribute name="snac:preferenceScore">
...@@ -655,7 +649,6 @@ ...@@ -655,7 +649,6 @@
</attribute> </attribute>
</optional> </optional>
</define> </define>
<define name="m.nameEntryAuthorizedorAlternative"> <define name="m.nameEntryAuthorizedorAlternative">
<zeroOrMore> <zeroOrMore>
<choice> <choice>
...@@ -674,11 +667,8 @@ ...@@ -674,11 +667,8 @@
</choice> </choice>
</zeroOrMore> </zeroOrMore>
</define> </define>
</div> </div>
<div a:documentation="Description"> <div a:documentation="Description">
<define name="e.description"> <define name="e.description">
<element a:id="description" name="description"> <element a:id="description" name="description">
<optional> <optional>
...@@ -718,7 +708,6 @@ ...@@ -718,7 +708,6 @@
</zeroOrMore> </zeroOrMore>
</element> </element>
</define> </define>
<define name="e.existDates"> <define name="e.existDates">
<element a:id="existDates" name="existDates"> <element a:id="existDates" name="existDates">
<optional> <optional>
...@@ -736,9 +725,7 @@ ...@@ -736,9 +725,7 @@
</optional> </optional>
</element> </element>
</define> </define>
<div a:documentation="Plural Versions"> <div a:documentation="Plural Versions">
<define name="e.places"> <define name="e.places">
<element a:id="places" name="places"> <element a:id="places" name="places">
<optional> <optional>
...@@ -765,7 +752,6 @@ ...@@ -765,7 +752,6 @@
</choice> </choice>
</element> </element>
</define> </define>
<define name="e.localDescriptions"> <define name="e.localDescriptions">
<element a:id="localDescriptions" name="localDescriptions"> <element a:id="localDescriptions" name="localDescriptions">
<optional> <optional>
...@@ -790,7 +776,6 @@ ...@@ -790,7 +776,6 @@
</choice> </choice>
</element> </element>
</define> </define>
<define name="e.languagesUsed"> <define name="e.languagesUsed">
<element a:id="languagesUsed" name="languagesUsed"> <element a:id="languagesUsed" name="languagesUsed">
<optional> <optional>
...@@ -810,7 +795,6 @@ ...@@ -810,7 +795,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.legalStatuses"> <define name="e.legalStatuses">
<element a:id="legalStatuses" name="legalStatuses"> <element a:id="legalStatuses" name="legalStatuses">
<optional> <optional>
...@@ -837,7 +821,6 @@ ...@@ -837,7 +821,6 @@
</choice> </choice>
</element> </element>
</define> </define>
<define name="e.occupations"> <define name="e.occupations">
<element a:id="occupations" name="occupations"> <element a:id="occupations" name="occupations">
<optional> <optional>
...@@ -864,7 +847,6 @@ ...@@ -864,7 +847,6 @@
</choice> </choice>
</element> </element>
</define> </define>
<define name="e.functions"> <define name="e.functions">
<element a:id="functions" name="functions"> <element a:id="functions" name="functions">
<optional> <optional>
...@@ -891,7 +873,6 @@ ...@@ -891,7 +873,6 @@
</choice> </choice>
</element> </element>
</define> </define>
<define name="e.mandates"> <define name="e.mandates">
<element a:id="mandates" name="mandates"> <element a:id="mandates" name="mandates">
<optional> <optional>
...@@ -918,7 +899,6 @@ ...@@ -918,7 +899,6 @@
</choice> </choice>
</element> </element>
</define> </define>
<define name="m.discursiveSet"> <define name="m.discursiveSet">
<choice> <choice>
<ref name="e.p"/> <ref name="e.p"/>
...@@ -927,11 +907,8 @@ ...@@ -927,11 +907,8 @@
<ref name="e.citation"/> <ref name="e.citation"/>
</choice> </choice>
</define> </define>
</div> </div>
<div a:documentation="Singular Version"> <div a:documentation="Singular Version">
<define name="e.place"> <define name="e.place">
<element a:id="place" name="place"> <element a:id="place" name="place">
<!-- Note that place uses the same model as m.simpleDescription except for the insertion of <!-- Note that place uses the same model as m.simpleDescription except for the insertion of
...@@ -949,7 +926,8 @@ ...@@ -949,7 +926,8 @@
<ref name="e.placeRole"/> <ref name="e.placeRole"/>
</optional> </optional>
<zeroOrMore> <zeroOrMore>
<ref name="e.placeEntry"/> <!-- <ref name="e.placeEntry"/> -->
<ref name="alternativePlaceEntry"/>
</zeroOrMore> </zeroOrMore>
<optional> <optional>
<element a:id="address" name="address"> <element a:id="address" name="address">
...@@ -989,7 +967,6 @@ ...@@ -989,7 +967,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.placeEntry"> <define name="e.placeEntry">
<element a:id="placeEntry" name="placeEntry"> <element a:id="placeEntry" name="placeEntry">
<optional> <optional>
...@@ -1017,7 +994,7 @@ ...@@ -1017,7 +994,7 @@
<ref name="a.vocabularySource"/> <ref name="a.vocabularySource"/>
</optional> </optional>
<optional> <optional>
<attribute a:id="accuracy" name="accuarcy"> <attribute a:id="accuracy" name="accuracy">
<text/> <text/>
</attribute> </attribute>
</optional> </optional>
...@@ -1027,7 +1004,81 @@ ...@@ -1027,7 +1004,81 @@
<text/> <text/>
</element> </element>
</define> </define>
<define name="alternativePlaceEntry">
<choice>
<ref name="e.placeEntry"/>
<ref name="e.snacPlaceEntry"/>
</choice>
</define>
<define name="e.snacPlaceEntry">
<element name="snac:placeEntry">
<ref name="e.placeEntry"/>
<optional>
<element name="snac:placeEntryLikelySame">
<ref name="m.snacPlaceEntryBody"/>
</element>
</optional>
<optional>
<element name="snac:placeEntryBestMaybeSame">
<ref name="m.snacPlaceEntryBody"/>
</element>
</optional>
<zeroOrMore>
<element name="snac:placeEntryMaybeSame">
<ref name="m.snacPlaceEntryBody"/>
</element>
</zeroOrMore>
</element>
</define>
<define name="m.snacPlaceEntryBody">
<optional>
<ref name="id"/>
</optional>
<optional>
<ref name="m.entryLanguageAttributes"/>
</optional>
<optional>
<ref name="a.localType"/>
</optional>
<optional>
<attribute name="administrationCode">
<text/>
</attribute>
</optional>
<optional>
<attribute name="certaintyScore">
<!-- Range 1 to 0, 1=100% certainty; 0=0% certainty. Only display snac:placeEntry rather than placeEntry if
certainty ="1" to ".06". Otherwise display placeEntry -->
<text/>
</attribute>
</optional>
<optional>
<attribute a:id="countryCode" name="countryCode">
<choice>
<data type="string">
<param name="pattern">[A-Z]{2}</param>
</data>
<data type="string">
<param name="pattern">[A-Z]{4}</param>
</data>
</choice>
</attribute>
</optional>
<optional>
<ref name="a.vocabularySource"/>
</optional>
<optional>
<attribute a:id="accuracy" name="accuracy">
<text/>
</attribute>
</optional>
<optional>
<ref name="m.geographicalCoordinates"/>
</optional>
<text/>
</define>
<define name="e.localDescription"> <define name="e.localDescription">
<element a:id="localDescription" name="localDescription"> <element a:id="localDescription" name="localDescription">
<optional> <optional>
...@@ -1040,7 +1091,6 @@ ...@@ -1040,7 +1091,6 @@
<ref name="m.simpleDescription"/> <ref name="m.simpleDescription"/>
</element> </element>
</define> </define>
<define name="e.languageUsed"> <define name="e.languageUsed">
<element a:id="languageUsed" name="languageUsed"> <element a:id="languageUsed" name="languageUsed">
<optional> <optional>
...@@ -1059,7 +1109,6 @@ ...@@ -1059,7 +1109,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.legalStatus"> <define name="e.legalStatus">
<element a:id="legalStatus" name="legalStatus"> <element a:id="legalStatus" name="legalStatus">
<optional> <optional>
...@@ -1074,7 +1123,6 @@ ...@@ -1074,7 +1123,6 @@
<ref name="m.simpleDescription"/> <ref name="m.simpleDescription"/>
</element> </element>
</define> </define>
<define name="e.occupation"> <define name="e.occupation">
<element a:id="occupation" name="occupation"> <element a:id="occupation" name="occupation">
<optional> <optional>
...@@ -1089,7 +1137,6 @@ ...@@ -1089,7 +1137,6 @@
<ref name="m.simpleDescription"/> <ref name="m.simpleDescription"/>
</element> </element>
</define> </define>
<define name="e.function"> <define name="e.function">
<element a:id="function" name="function"> <element a:id="function" name="function">
<optional> <optional>
...@@ -1104,7 +1151,6 @@ ...@@ -1104,7 +1151,6 @@
<ref name="m.simpleDescription"/> <ref name="m.simpleDescription"/>
</element> </element>
</define> </define>
<define name="e.mandate"> <define name="e.mandate">
<element a:id="mandate" name="mandate"> <element a:id="mandate" name="mandate">
<optional> <optional>
...@@ -1119,13 +1165,13 @@ ...@@ -1119,13 +1165,13 @@
<ref name="m.simpleDescription"/> <ref name="m.simpleDescription"/>
</element> </element>
</define> </define>
<define name="m.simpleDescription"> <define name="m.simpleDescription">
<optional> <optional>
<ref name="e.term"/> <ref name="e.term"/>
</optional> </optional>
<zeroOrMore> <zeroOrMore>
<ref name="e.placeEntry"/> <!-- <ref name="e.placeEntry"/> -->
<ref name="alternativePlaceEntry"/>
</zeroOrMore> </zeroOrMore>
<optional> <optional>
<ref name="m.dates"/> <ref name="m.dates"/>
...@@ -1137,7 +1183,6 @@ ...@@ -1137,7 +1183,6 @@
<ref name="e.descriptiveNote"/> <ref name="e.descriptiveNote"/>
</optional> </optional>
</define> </define>
<define name="e.placeRole"> <define name="e.placeRole">
<element a:id="placeRole" name="placeRole"> <element a:id="placeRole" name="placeRole">
<optional> <optional>
...@@ -1155,9 +1200,7 @@ ...@@ -1155,9 +1200,7 @@
<text/> <text/>
</element> </element>
</define> </define>
</div> </div>
<define name="e.structureOrGenealogy"> <define name="e.structureOrGenealogy">
<element a:id="structureOrGenealogy" name="structureOrGenealogy"> <element a:id="structureOrGenealogy" name="structureOrGenealogy">
<optional> <optional>
...@@ -1174,7 +1217,6 @@ ...@@ -1174,7 +1217,6 @@
</zeroOrMore> </zeroOrMore>
</element> </element>
</define> </define>
<define name="e.generalContext"> <define name="e.generalContext">
<element a:id="generalContext" name="generalContext"> <element a:id="generalContext" name="generalContext">
<optional> <optional>
...@@ -1191,7 +1233,6 @@ ...@@ -1191,7 +1233,6 @@
</zeroOrMore> </zeroOrMore>
</element> </element>
</define> </define>
<define name="e.biogHist"> <define name="e.biogHist">
<element a:id="biogHist" name="biogHist"> <element a:id="biogHist" name="biogHist">
<optional> <optional>
...@@ -1217,7 +1258,6 @@ ...@@ -1217,7 +1258,6 @@
</zeroOrMore> </zeroOrMore>
</element> </element>
</define> </define>
<define name="e.abstract"> <define name="e.abstract">
<element a:id="abstract" name="abstract"> <element a:id="abstract" name="abstract">
<optional> <optional>
...@@ -1232,11 +1272,8 @@ ...@@ -1232,11 +1272,8 @@
<ref name="m.mixedContent"/> <ref name="m.mixedContent"/>
</element> </element>
</define> </define>
</div> </div>
<div a:documentation="Relations"> <div a:documentation="Relations">
<define name="e.relations"> <define name="e.relations">
<element a:id="relations" name="relations"> <element a:id="relations" name="relations">
<optional> <optional>
...@@ -1259,7 +1296,6 @@ ...@@ -1259,7 +1296,6 @@
</zeroOrMore> </zeroOrMore>
</element> </element>
</define> </define>
<define name="e.relationEntry"> <define name="e.relationEntry">
<element a:id="relationEntry" name="relationEntry"> <element a:id="relationEntry" name="relationEntry">
<optional> <optional>
...@@ -1274,7 +1310,6 @@ ...@@ -1274,7 +1310,6 @@
<text/> <text/>
</element> </element>
</define> </define>
<define name="e.objectXMLWrap"> <define name="e.objectXMLWrap">
<element a:id="objectXMLWrap" name="objectXMLWrap"> <element a:id="objectXMLWrap" name="objectXMLWrap">
<optional> <optional>
...@@ -1283,7 +1318,6 @@ ...@@ -1283,7 +1318,6 @@
<ref name="e.anyName"/> <ref name="e.anyName"/>
</element> </element>
</define> </define>
<define name="e.objectBinWrap"> <define name="e.objectBinWrap">
<element a:id="objectBinWrap" name="objectBinWrap"> <element a:id="objectBinWrap" name="objectBinWrap">
<optional> <optional>
...@@ -1292,7 +1326,6 @@ ...@@ -1292,7 +1326,6 @@
<data type="base64Binary"/> <data type="base64Binary"/>
</element> </element>
</define> </define>
<define name="m.relationBody"> <define name="m.relationBody">
<optional> <optional>
<ref name="a.lastDateTimeVerified"/> <ref name="a.lastDateTimeVerified"/>
...@@ -1313,13 +1346,13 @@ ...@@ -1313,13 +1346,13 @@
<ref name="m.dates"/> <ref name="m.dates"/>
</optional> </optional>
<optional> <optional>
<ref name="e.placeEntry"/> <!-- <ref name="e.placeEntry"/> -->
<ref name="alternativePlaceEntry"/>
</optional> </optional>
<optional> <optional>
<ref name="e.descriptiveNote"/> <ref name="e.descriptiveNote"/>
</optional> </optional>
</define> </define>
<define name="e.cpfRelation"> <define name="e.cpfRelation">
<element a:id="cpfRelation" name="cpfRelation"> <element a:id="cpfRelation" name="cpfRelation">
<optional> <optional>
...@@ -1346,7 +1379,6 @@ ...@@ -1346,7 +1379,6 @@
<ref name="m.relationBody"/> <ref name="m.relationBody"/>
</element> </element>
</define> </define>
<define name="e.resourceRelation"> <define name="e.resourceRelation">
<element a:id="resourceRelation" name="resourceRelation"> <element a:id="resourceRelation" name="resourceRelation">
<optional> <optional>
...@@ -1367,7 +1399,6 @@ ...@@ -1367,7 +1399,6 @@
<ref name="m.relationBody"/> <ref name="m.relationBody"/>
</element> </element>
</define> </define>
<define name="e.functionRelation"> <define name="e.functionRelation">
<element a:id="functionRelation" name="functionRelation"> <element a:id="functionRelation" name="functionRelation">
<optional> <optional>
...@@ -1388,11 +1419,8 @@ ...@@ -1388,11 +1419,8 @@
<ref name="m.relationBody"/> <ref name="m.relationBody"/>
</element> </element>
</define> </define>
</div> </div>
<div a:documentation="alternativeSet"> <div a:documentation="alternativeSet">
<define name="e.alternativeSet"> <define name="e.alternativeSet">
<element a:id="alternativeSet" name="alternativeSet"> <element a:id="alternativeSet" name="alternativeSet">
<optional> <optional>
...@@ -1446,18 +1474,14 @@ ...@@ -1446,18 +1474,14 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
</div> </div>
<div a:documentation="Shared"> <div a:documentation="Shared">
<define name="e.anyName"> <define name="e.anyName">
<element a:id="e.anyName"> <element a:id="e.anyName">
<anyName/> <anyName/>
<ref name="m.anything"/> <ref name="m.anything"/>
</element> </element>
</define> </define>
<define name="m.anything"> <define name="m.anything">
<zeroOrMore> <zeroOrMore>
<attribute a:id="a.anyName"> <attribute a:id="a.anyName">
...@@ -1471,15 +1495,12 @@ ...@@ -1471,15 +1495,12 @@
</choice> </choice>
</zeroOrMore> </zeroOrMore>
</define> </define>
<div a:documentation="Dates"> <div a:documentation="Dates">
<define name="a.lastDateTimeVerified"> <define name="a.lastDateTimeVerified">
<attribute a:id="lastDateTimeVerified" name="lastDateTimeVerified"> <attribute a:id="lastDateTimeVerified" name="lastDateTimeVerified">
<ref name="m.data.standardDateTime"/> <ref name="m.data.standardDateTime"/>
</attribute> </attribute>
</define> </define>
<define name="m.data.standardDateTime"> <define name="m.data.standardDateTime">
<choice> <choice>
<data type="date"> <data type="date">
...@@ -1496,7 +1517,6 @@ ...@@ -1496,7 +1517,6 @@
</data> </data>
</choice> </choice>
</define> </define>
<define name="m.data.standardDate"> <define name="m.data.standardDate">
<choice> <choice>
<data type="date"> <data type="date">
...@@ -1510,7 +1530,6 @@ ...@@ -1510,7 +1530,6 @@
</data> </data>
</choice> </choice>
</define> </define>
<define name="e.dateSingle"> <define name="e.dateSingle">
<element a:id="date" name="date"> <element a:id="date" name="date">
<optional> <optional>
...@@ -1525,7 +1544,6 @@ ...@@ -1525,7 +1544,6 @@
<ref name="m.dateSingle"/> <ref name="m.dateSingle"/>
</element> </element>
</define> </define>
<define name="m.dateSingle"> <define name="m.dateSingle">
<optional> <optional>
<attribute a:id="standardDate" name="standardDate"> <attribute a:id="standardDate" name="standardDate">
...@@ -1544,7 +1562,6 @@ ...@@ -1544,7 +1562,6 @@
</optional> </optional>
<text/> <text/>
</define> </define>
<define name="e.dateRange"> <define name="e.dateRange">
<element a:id="dateRange" name="dateRange"> <element a:id="dateRange" name="dateRange">
<optional> <optional>
...@@ -1586,7 +1603,6 @@ ...@@ -1586,7 +1603,6 @@
</optional> </optional>
</element> </element>
</define> </define>
<define name="e.dateSet"> <define name="e.dateSet">
<element a:id="dateSet" name="dateSet"> <element a:id="dateSet" name="dateSet">
<optional> <optional>
...@@ -1610,7 +1626,6 @@ ...@@ -1610,7 +1626,6 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
<define name="m.dates"> <define name="m.dates">
<choice> <choice>
<ref name="e.dateSingle"/> <ref name="e.dateSingle"/>
...@@ -1618,11 +1633,8 @@ ...@@ -1618,11 +1633,8 @@
<ref name="e.dateSet"/> <ref name="e.dateSet"/>
</choice> </choice>
</define> </define>
</div> </div>
<div a:documentation="Language"> <div a:documentation="Language">
<define name="e.language"> <define name="e.language">
<element a:id="language" name="language"> <element a:id="language" name="language">
<optional> <optional>
...@@ -1639,7 +1651,6 @@ ...@@ -1639,7 +1651,6 @@
<text/> <text/>
</element> </element>
</define> </define>
<define name="e.script"> <define name="e.script">
<element a:id="script" name="script"> <element a:id="script" name="script">
<optional> <optional>
...@@ -1652,7 +1663,6 @@ ...@@ -1652,7 +1663,6 @@
<text/> <text/>
</element> </element>
</define> </define>
<define name="a.scriptCode"> <define name="a.scriptCode">
<attribute a:id="scriptCode" name="scriptCode"> <attribute a:id="scriptCode" name="scriptCode">
<data type="string"> <data type="string">
...@@ -1660,14 +1670,11 @@ ...@@ -1660,14 +1670,11 @@
</data> </data>
</attribute> </attribute>
</define> </define>
<define name="a.transliteration"> <define name="a.transliteration">
<attribute a:id="transliteration" name="transliteration"> <attribute a:id="transliteration" name="transliteration">
<data type="NMTOKEN"/> <data type="NMTOKEN"/>
</attribute> </attribute>
</define> </define>
<define name="m.entryLanguageAttributes"> <define name="m.entryLanguageAttributes">
<optional> <optional>
<ref name="a.scriptCode"/> <ref name="a.scriptCode"/>
...@@ -1680,12 +1687,10 @@ ...@@ -1680,12 +1687,10 @@
</optional> </optional>
</define> </define>
</div> </div>
<define name="m.data.standardRepository"> <define name="m.data.standardRepository">
<data type="token"> <data type="token">
<param name="pattern">[\S]+</param> <param name="pattern">[\S]+</param>
</data> </data>
<!-- <!--
<a:documentation>This pattern represents the character pattern requirements of ISIL (ISO <a:documentation>This pattern represents the character pattern requirements of ISIL (ISO
15511). Values that conform to the pattern are not, strictly speaking, conformant to ISIL, as 15511). Values that conform to the pattern are not, strictly speaking, conformant to ISIL, as
...@@ -1698,7 +1703,6 @@ ...@@ -1698,7 +1703,6 @@
<param name="pattern">([A-Z]{2}-[a-zA-Z0-9:/\-]{1,13})|([a-zA-Z]{1}-[a-zA-Z0-9:/\-]{1,14})|([a-zA-Z]{3}-[a-zA-Z0-9:/\-]{1,12})|([a-zA-Z]{4}-[a-zA-Z0-9:/\-]{1,11})</param> <param name="pattern">([A-Z]{2}-[a-zA-Z0-9:/\-]{1,13})|([a-zA-Z]{1}-[a-zA-Z0-9:/\-]{1,14})|([a-zA-Z]{3}-[a-zA-Z0-9:/\-]{1,12})|([a-zA-Z]{4}-[a-zA-Z0-9:/\-]{1,11})</param>
--> -->
</define> </define>
<define name="e.term"> <define name="e.term">
<element a:id="term" name="term"> <element a:id="term" name="term">
<optional> <optional>
...@@ -1716,7 +1720,6 @@ ...@@ -1716,7 +1720,6 @@
<text/> <text/>
</element> </element>
</define> </define>
<define name="e.descriptiveNote"> <define name="e.descriptiveNote">
<element a:id="descriptiveNote" name="descriptiveNote"> <element a:id="descriptiveNote" name="descriptiveNote">
<optional> <optional>
...@@ -1730,7 +1733,6 @@ ...@@ -1730,7 +1733,6 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
<define name="e.citation"> <define name="e.citation">
<element a:id="citation" name="citation"> <element a:id="citation" name="citation">
<optional> <optional>
...@@ -1748,14 +1750,12 @@ ...@@ -1748,14 +1750,12 @@
<ref name="m.mixedContent"/> <ref name="m.mixedContent"/>
</element> </element>
</define> </define>
<define name="m.id"> <define name="m.id">
<optional> <optional>
<ref name="a.localType"/> <ref name="a.localType"/>
</optional> </optional>
<text/> <text/>
</define> </define>
<define name="e.p"> <define name="e.p">
<element a:id="p" name="p"> <element a:id="p" name="p">
<optional> <optional>
...@@ -1767,7 +1767,6 @@ ...@@ -1767,7 +1767,6 @@
<ref name="m.mixedContent"/> <ref name="m.mixedContent"/>
</element> </element>
</define> </define>
<define name="m.mixedContent"> <define name="m.mixedContent">
<zeroOrMore> <zeroOrMore>
<choice> <choice>
...@@ -1776,7 +1775,6 @@ ...@@ -1776,7 +1775,6 @@
</choice> </choice>
</zeroOrMore> </zeroOrMore>
</define> </define>
<define name="e.chronList"> <define name="e.chronList">
<element a:id="chronList" name="chronList"> <element a:id="chronList" name="chronList">
<optional> <optional>
...@@ -1807,14 +1805,16 @@ ...@@ -1807,14 +1805,16 @@
<choice> <choice>
<group> <group>
<optional> <optional>
<ref name="e.placeEntry"/> <!-- <ref name="e.placeEntry"/> -->
<ref name="alternativePlaceEntry"/>
</optional> </optional>
<ref name="e.event"/> <ref name="e.event"/>
</group> </group>
<oneOrMore> <oneOrMore>
<element name="chronItemSet"> <element name="chronItemSet">
<zeroOrMore> <zeroOrMore>
<ref name="e.placeEntry"/> <!-- <ref name="e.placeEntry"/> -->
<ref name="alternativePlaceEntry"/>
</zeroOrMore> </zeroOrMore>
<oneOrMore> <oneOrMore>
<ref name="e.event"/> <ref name="e.event"/>
...@@ -1826,7 +1826,6 @@ ...@@ -1826,7 +1826,6 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
<define name="e.event"> <define name="e.event">
<element a:id="event" name="event"> <element a:id="event" name="event">
<optional> <optional>
...@@ -1841,7 +1840,6 @@ ...@@ -1841,7 +1840,6 @@
<text/> <text/>
</element> </element>
</define> </define>
<define name="e.list"> <define name="e.list">
<element a:id="list" name="list"> <element a:id="list" name="list">
<optional> <optional>
...@@ -1858,7 +1856,6 @@ ...@@ -1858,7 +1856,6 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
<define name="e.item"> <define name="e.item">
<element a:id="item" name="item"> <element a:id="item" name="item">
<optional> <optional>
...@@ -1873,7 +1870,6 @@ ...@@ -1873,7 +1870,6 @@
<ref name="m.mixedContent"/> <ref name="m.mixedContent"/>
</element> </element>
</define> </define>
<define name="e.outline"> <define name="e.outline">
<element a:id="outline" name="outline"> <element a:id="outline" name="outline">
<optional> <optional>
...@@ -1890,7 +1886,6 @@ ...@@ -1890,7 +1886,6 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
<define name="e.level"> <define name="e.level">
<element a:id="level" name="level"> <element a:id="level" name="level">
<optional> <optional>
...@@ -1908,7 +1903,6 @@ ...@@ -1908,7 +1903,6 @@
</zeroOrMore> </zeroOrMore>
</element> </element>
</define> </define>
<define name="e.span"> <define name="e.span">
<optional> <optional>
<element a:id="span" name="span"> <element a:id="span" name="span">
...@@ -1928,25 +1922,21 @@ ...@@ -1928,25 +1922,21 @@
</element> </element>
</optional> </optional>
</define> </define>
<define name="a.localType"> <define name="a.localType">
<attribute a:id="localType" name="localType"> <attribute a:id="localType" name="localType">
<data type="anyURI"/> <data type="anyURI"/>
</attribute> </attribute>
</define> </define>
<define name="a.vocabularySource"> <define name="a.vocabularySource">
<attribute a:id="vocabularySource" name="vocabularySource"> <attribute a:id="vocabularySource" name="vocabularySource">
<data type="anyURI"/> <data type="anyURI"/>
</attribute> </attribute>
</define> </define>
<define name="a.style"> <define name="a.style">
<attribute a:id="style" name="style"> <attribute a:id="style" name="style">
<text/> <text/>
</attribute> </attribute>
</define> </define>
<define name="m.geographicalCoordinates"> <define name="m.geographicalCoordinates">
<attribute a:id="longitude" name="longitude"> <attribute a:id="longitude" name="longitude">
<data type="NMTOKEN"/> <data type="NMTOKEN"/>
...@@ -1960,9 +1950,7 @@ ...@@ -1960,9 +1950,7 @@
</attribute> </attribute>
</optional> </optional>
</define> </define>
<div a:documentation="XML Special Attributes"> <div a:documentation="XML Special Attributes">
<define name="lang" ns="http://www.w3.org/XML/1998/namespace"> <define name="lang" ns="http://www.w3.org/XML/1998/namespace">
<attribute a:id="xmlLang" name="xml:lang"> <attribute a:id="xmlLang" name="xml:lang">
<choice> <choice>
...@@ -1971,13 +1959,11 @@ ...@@ -1971,13 +1959,11 @@
</choice> </choice>
</attribute> </attribute>
</define> </define>
<define name="base" ns="http://www.w3.org/XML/1998/namespace"> <define name="base" ns="http://www.w3.org/XML/1998/namespace">
<attribute a:id="xmlBase" name="xml:base"> <attribute a:id="xmlBase" name="xml:base">
<data type="anyURI"/> <data type="anyURI"/>
</attribute> </attribute>
</define> </define>
<define name="id" ns="http://www.w3.org/XML/1998/namespace"> <define name="id" ns="http://www.w3.org/XML/1998/namespace">
<attribute a:id="xmlID" name="xml:id"> <attribute a:id="xmlID" name="xml:id">
<data type="NCName"> <data type="NCName">
...@@ -1987,9 +1973,7 @@ ...@@ -1987,9 +1973,7 @@
</data> </data>
</attribute> </attribute>
</define> </define>
</div> </div>
<div a:documentation="XLINK"> <div a:documentation="XLINK">
<define name="simpleLink" xmlns:xlink="http://www.w3.org/1999/xlink"> <define name="simpleLink" xmlns:xlink="http://www.w3.org/1999/xlink">
<attribute a:defaultValue="simple" a:id="xlinkType" name="xlink:type"> <attribute a:defaultValue="simple" a:id="xlinkType" name="xlink:type">
...@@ -2053,9 +2037,6 @@ ...@@ -2053,9 +2037,6 @@
</choice> </choice>
</attribute> </attribute>
</define> </define>
</div> </div>
</div> </div>
</grammar> </grammar>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment