updates for objectxmlwrap, and relaxing constraint on containerid att…

…ribute to string.
SAA-SDT · Oct 19, 2017 · 42c2037 · 42c2037
1 parent 53e7930
commit 42c2037
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 EAD3
 ============
 
-###EAD3 Schema files
+### EAD3 Schema files
 
 * `ead3.rng`: RelaxNG Schema for EAD3. Compiled version of `inprocess/ead3_driver.rng` and included files, which is the primary maintenance schema from which other versions are derived
 * `ead3.dtd`: XML Document Type Definition for EAD3, derived from `inprocess/ead3_dtd.rng` customization to create DTD version

diff --git a/ead3.dtd b/ead3.dtd
@@ -564,7 +564,7 @@
   localtype CDATA #IMPLIED
   encodinganalog CDATA #IMPLIED
   parent IDREFS #IMPLIED
-  containerid NMTOKEN #IMPLIED>
+  containerid CDATA #IMPLIED>
 
 <!ELEMENT dao (descriptivenote)?>
 <!ATTLIST dao

diff --git a/ead3.rng b/ead3.rng
@@ -2,8 +2,8 @@
     <!-- 
     Encoded Archival Description
 	Version: EAD3
-	Release: 1.10 (test)
-	Date: 2017-04-01
+	Release: 1.1
+	Date: 2017-10
 
 	Hosted by the Library of Congress at http://www.loc.gov/ead/.
 		
@@ -722,7 +722,7 @@
       </optional>
       <optional>
         <attribute name="containerid">
-          <data type="NMTOKEN"/>
+          <data type="string"/>
         </attribute>
       </optional>
       <ref name="m.mixed.basic"/>

diff --git a/ead3.xsd b/ead3.xsd
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ead3.archivists.org/schema/" elementFormDefault="qualified" targetNamespace="http://ead3.archivists.org/schema/">
+<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ead3.archivists.org/schema/" elementFormDefault="qualified" targetNamespace="http://ead3.archivists.org/schema/">
   <!--
     Encoded Archival Description
         Version: EAD3
-        Release: 1.10 (test)
-        Date: 2017-04-01
+        Release: 1.1
+        Date: 2017-10
     
         Hosted by the Library of Congress at http://www.loc.gov/ead/.
     
@@ -448,7 +447,7 @@
           <xs:attribute name="localtype" type="xs:token"/>
           <xs:attribute name="encodinganalog" type="xs:token"/>
           <xs:attribute name="parent" type="xs:IDREFS"/>
-          <xs:attribute name="containerid" type="xs:NMTOKEN"/>
+          <xs:attribute name="containerid" type="xs:string"/>
         </xs:extension>
       </xs:complexContent></xs:complexType>
   <xs:complexType name="dao"><xs:sequence>
@@ -1470,10 +1469,9 @@
         </xs:extension>
       </xs:complexContent></xs:complexType>
   <xs:complexType name="e.anyname">
-    <xs:choice>
-      <xs:any namespace="##other" processContents="lax"/>
-      <xs:any namespace="##local" processContents="lax"/>
-    </xs:choice>
+    <xs:sequence>
+      <xs:any processContents="lax"/>
+    </xs:sequence>
   </xs:complexType>
   <!-- ELEMENT MODELS -->
   <xs:group name="m.blocks">

diff --git a/undeprecated/ead3_undeprecated.dtd b/undeprecated/ead3_undeprecated.dtd
@@ -943,7 +943,7 @@
   localtype CDATA #IMPLIED
   encodinganalog CDATA #IMPLIED
   parent IDREFS #IMPLIED
-  containerid NMTOKEN #IMPLIED>
+  containerid CDATA #IMPLIED>
 
 <!ELEMENT dao (descriptivenote)?>
 <!ATTLIST dao

diff --git a/undeprecated/ead3_undeprecated.rng b/undeprecated/ead3_undeprecated.rng
@@ -330,6 +330,12 @@
                 <ref name="m.mixed.basic.plus.access.ref"/>
             </element>
         </rng:define>
+        <rng:define name="e.objectxmlwrap">
+            <element name="objectxmlwrap">
+                <ref name="am.common"/>
+                <ref name="e.anyname"/>
+            </element>
+        </rng:define>
         <rng:define name="e.anyname">
             <element>
                 <anyName>
@@ -350,6 +356,7 @@
                 </zeroOrMore>
             </element>
         </rng:define>
+
     <rng:div datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!-- ELEMENTS -->
 
@@ -994,7 +1001,7 @@
       </optional>
       <optional>
         <attribute name="containerid">
-          <data type="NMTOKEN"/>
+          <data type="string"/>
         </attribute>
       </optional>
       <ref name="m.mixed.basic"/>
@@ -2798,12 +2805,7 @@
       </oneOrMore>
     </element>
   </rng:define>
-  <rng:define name="e.objectxmlwrap">
-    <element name="objectxmlwrap">
-      <ref name="am.common"/>
-      <ref name="e.anyname"/>
-    </element>
-  </rng:define>
+
 
   <!-- ELEMENT MODELS -->
   <rng:define name="m.blocks">
@@ -3484,8 +3486,36 @@
             </optional>
             <oneOrMore>
                 <choice>
-                    <ref name="m.blocks"/>
-                    <ref name="m.desc.base.descgrp"/>
+                    <ref name="e.p"/>
+                    <ref name="e.blockquote"/>
+                    <ref name="e.chronlist"/>
+                    <ref name="e.list"/>
+                    <ref name="e.table"/>
+                    <ref name="e.accessrestrict"/>
+                    <ref name="e.accruals"/>
+                    <ref name="e.acqinfo"/>
+                    <ref name="e.altformavail"/>
+                    <ref name="e.appraisal"/>
+                    <ref name="e.arrangement"/>
+                    <ref name="e.bibliography"/>
+                    <ref name="e.bioghist"/>
+                    <ref name="e.controlaccess"/>
+                    <ref name="e.custodhist"/>
+                    <ref name="e.descgrp"/>
+                    <ref name="e.fileplan"/>
+                    <ref name="e.index"/>
+                    <ref name="e.legalstatus"/>
+                    <ref name="e.odd"/>
+                    <ref name="e.originalsloc"/>
+                    <ref name="e.otherfindaid"/>
+                    <ref name="e.phystech"/>
+                    <ref name="e.prefercite"/>
+                    <ref name="e.processinfo"/>
+                    <ref name="e.relatedmaterial"/>
+                    <ref name="e.relations"/>
+                    <ref name="e.scopecontent"/>
+                    <ref name="e.separatedmaterial"/>
+                    <ref name="e.userestrict"/>
                 </choice>
             </oneOrMore>
         </element>

diff --git a/undeprecated/ead3_undeprecated.xsd b/undeprecated/ead3_undeprecated.xsd
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ead3.archivists.org/schema/undeprecated/" elementFormDefault="qualified" targetNamespace="http://ead3.archivists.org/schema/undeprecated/">
+<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ead3.archivists.org/schema/undeprecated/" elementFormDefault="qualified" targetNamespace="http://ead3.archivists.org/schema/undeprecated/">
   <!-- include "ead_revised_defs.rng" -->
   <xs:element name="ead">
     <xs:complexType>
@@ -168,11 +167,15 @@
           <xs:attribute name="encodinganalog" type="xs:token"/>
         </xs:extension>
       </xs:complexContent></xs:complexType>
+  <xs:complexType name="objectxmlwrap"><xs:complexContent>
+        <xs:extension base="e.anyname">
+          <xs:attributeGroup ref="am.common"/>
+        </xs:extension>
+      </xs:complexContent></xs:complexType>
   <xs:complexType name="e.anyname">
-    <xs:choice>
-      <xs:any namespace="##other" processContents="lax"/>
-      <xs:any namespace="##local" processContents="lax"/>
-    </xs:choice>
+    <xs:sequence>
+      <xs:any processContents="lax"/>
+    </xs:sequence>
   </xs:complexType>
   <!-- ELEMENTS -->
   <!-- control -->
@@ -561,7 +564,7 @@
           <xs:attribute name="localtype" type="xs:token"/>
           <xs:attribute name="encodinganalog" type="xs:token"/>
           <xs:attribute name="parent" type="xs:IDREFS"/>
-          <xs:attribute name="containerid" type="xs:NMTOKEN"/>
+          <xs:attribute name="containerid" type="xs:string"/>
         </xs:extension>
       </xs:complexContent></xs:complexType>
   <xs:complexType name="dao"><xs:sequence>
@@ -1440,11 +1443,6 @@
         </xs:simpleType>
       </xs:attribute><xs:attributeGroup ref="am.simplelink"/></xs:complexType>
   <xs:complexType name="relationentry" mixed="true"><xs:attributeGroup ref="am.common"/><xs:attribute name="encodinganalog" type="xs:token"/><xs:attribute name="localtype" type="xs:token"/><xs:attribute name="transliteration" type="xs:NMTOKEN"/></xs:complexType>
-  <xs:complexType name="objectxmlwrap"><xs:complexContent>
-        <xs:extension base="e.anyname">
-          <xs:attributeGroup ref="am.common"/>
-        </xs:extension>
-      </xs:complexContent></xs:complexType>
   <!-- ELEMENT MODELS -->
   <xs:group name="m.blocks">
     <xs:choice>
@@ -1984,8 +1982,36 @@
   <xs:complexType name="descgrp"><xs:sequence>
         <xs:element name="head" type="head" minOccurs="0"/>
         <xs:choice maxOccurs="unbounded">
-          <xs:group ref="m.blocks"/>
-          <xs:group ref="m.desc.base.descgrp"/>
+          <xs:element name="p" type="p"/>
+          <xs:element name="blockquote" type="blockquote"/>
+          <xs:element name="chronlist" type="chronlist"/>
+          <xs:element name="list" type="list"/>
+          <xs:element name="table" type="table"/>
+          <xs:element name="accessrestrict" type="accessrestrict"/>
+          <xs:element name="accruals" type="accruals"/>
+          <xs:element name="acqinfo" type="acqinfo"/>
+          <xs:element name="altformavail" type="altformavail"/>
+          <xs:element name="appraisal" type="appraisal"/>
+          <xs:element name="arrangement" type="arrangement"/>
+          <xs:element name="bibliography" type="bibliography"/>
+          <xs:element name="bioghist" type="bioghist"/>
+          <xs:element name="controlaccess" type="controlaccess"/>
+          <xs:element name="custodhist" type="custodhist"/>
+          <xs:element name="descgrp" type="descgrp"/>
+          <xs:element name="fileplan" type="fileplan"/>
+          <xs:element name="index" type="index"/>
+          <xs:element name="legalstatus" type="legalstatus"/>
+          <xs:element name="odd" type="odd"/>
+          <xs:element name="originalsloc" type="originalsloc"/>
+          <xs:element name="otherfindaid" type="otherfindaid"/>
+          <xs:element name="phystech" type="phystech"/>
+          <xs:element name="prefercite" type="prefercite"/>
+          <xs:element name="processinfo" type="processinfo"/>
+          <xs:element name="relatedmaterial" type="relatedmaterial"/>
+          <xs:element name="relations" type="relations"/>
+          <xs:element name="scopecontent" type="scopecontent"/>
+          <xs:element name="separatedmaterial" type="separatedmaterial"/>
+          <xs:element name="userestrict" type="userestrict"/>
         </xs:choice>
       </xs:sequence><xs:attributeGroup ref="am.common"/><xs:attribute name="localtype" type="xs:token"/><xs:attribute name="encodinganalog" type="xs:token"/></xs:complexType>
   <xs:complexType name="m.c.base.descgrp">