Jan 2013 cpf.rng version

rng/cpf.rng

@@ -25,6 +25,11 @@
 	*****I also would like to add <preferredForm> to <nameEntry> not in <parallelEntry>
 	*******************
 	
+	3. 20130120
+	
+	On the second inauguration of Barack Obama, modified <chronItem> to include optional, repeatable <chronItemSet>
+	within which zero or more <placeEntry> may precede at least one though possibly more <event>
+	
 	
 	ENCODED ARCHIVAL CONTEXT-CORPORATE BODIES, PERSONS, AND FAMILIES (EAC-CPF) SCHEMA
 	
@@ -83,8 +88,7 @@
 	
 -->
 <grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="urn:isbn:1-931666-33-4"
-	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">
 
 	<!-- 
@@ -250,7 +254,7 @@
 								<text/>
 							</attribute>
 						</optional>
-						<ref name="m.data.standardRepository"></ref>
+						<ref name="m.data.standardRepository"/>
 					</element>
 				</optional>
 				<zeroOrMore>
@@ -617,8 +621,7 @@
 							<ref name="id"/>
 						</optional>
 						<data type="token">
-							<param name="pattern"
-								>[\S]+</param>
+							<param name="pattern">[\S]+</param>
 						</data>
 						<!--data type="NMTOKEN">
 							NMTOKEN instead of maintenance agency code constraints because the 
@@ -1656,8 +1659,7 @@
 
 		<define name="m.data.standardRepository">
 			<data type="token">
-				<param name="pattern"
-						>[\S]+</param>
+				<param name="pattern">[\S]+</param>
 			</data>
 
 			<!-- 
@@ -1777,9 +1779,30 @@
 							<ref name="e.dateSingle"/>
 							<ref name="e.dateRange"/>
 						</choice>
+						<choice>
+							<group>
 								<optional>
 									<ref name="e.placeEntry"/>
 								</optional>
+								<ref name="e.event"/>
+							</group>
+							<oneOrMore>
+								<element name="chronItemSet">
+									<zeroOrMore>
+										<ref name="e.placeEntry"/>
+									</zeroOrMore>
+									<oneOrMore>
+										<ref name="e.event"/>
+									</oneOrMore>
+								</element>
+							</oneOrMore>
+						</choice>
+					</element>
+				</oneOrMore>
+			</element>
+		</define>
+
+		<define name="e.event">
 			<element a:id="event" name="event">
 				<optional>
 					<ref name="id"/>
@@ -1792,9 +1815,6 @@
 				</optional>
 				<text/>
 			</element>
-					</element>
-				</oneOrMore>
-			</element>
 		</define>
 
 		<define name="e.list">