Fixing the descgrp bug for another test release.

SAA-SDT · Nov 19, 2017 · ed5b0f2 · ed5b0f2
1 parent 42c2037
commit ed5b0f2
Show file tree

Hide file tree

Showing 6 changed files with 398 additions and 57 deletions.
diff --git a/ead3.dtd b/ead3.dtd
@@ -1,4 +1,74 @@
-
+  <!--
+    Encoded Archival Description
+        Version: EAD3
+        Release: 1.1
+        Date: 2017-11-19
+
+        Hosted by the Library of Congress at http://www.loc.gov/ead/.
+
+        Developed by the Society of American Archivists' 
+        Technical Subcommittee for Encoded Archival Description (TS-EAD) 
+        and Schema Development Team, 2010-2015. 
+
+        Adopted by SAA Council, July 2015.
+
+        Lead schema developer: Terry Catapano
+
+        EAD3 was possible because of the generous support of the 
+        Society of American Archivists, the Gladys Krieble Delmas Foundation, 
+        the National Endowment for the Humanities, the Nationaal Archief of the 
+        Netherlands, the Beinecke Rare Book and Manuscript Library, 
+        the Institute for Advanced Technology in the Humanities at the 
+        University of Virginia, and OCLC Research. 
+
+        EAD3 Deliverables
+
+        ead3.dtd	ead3_undeprecated.dtd	
+        ead3.rng	ead3_undeprecated.rng
+        ead3.xsd	ead3_undeprecated.xsd
+        ead3.sch
+
+        Notes:
+        -EAD3 is available as DTD, Relax NG Schema, and W3C Schema. 
+        -The EAD3 DTD does not support the <objectxmlwrap> element.
+        -In the EAD3 DTD, attributes with anyURI, token, and string 
+        data types are converted to CDATA.
+        -Deprecated EAD 2002 elements are available in the undprecated 
+        versions of EAD3. 
+        -A Schematron schema (ead3.sch) is available to validate external code lists
+        not maintained within EAD, standard attribute value patterns, 
+        attribute or element co-ocurrence not enforcable in the schema,
+        and some encoding practices recommended for future migration.
+
+***************************************************
+Changes in version 1.1:
+
+1. The @render attribute can now be used with the quote element.
+   See https://github.com/SAA-SDT/EAD3/issues/485
+
+2. The objectxmlwrap element can now be validated properly in the XSD schemas.
+   See https://github.com/SAA-SDT/EAD3/issues/499
+   (bug fix)
+
+3. Manually fixed a bug that was causing the descgrp element not to validate correctly in the undeprecated DTD.
+   See https://github.com/SAA-SDT/EAD3/issues/503
+   (bug fix)
+
+4. The date element is now a valid child of the part element.
+   See https://github.com/SAA-SDT/EAD3/issues/505
+
+5. rightsdeclaration, a new element, has been added to the control section.
+   See https://github.com/SAA-SDT/EAD3/issues/506
+   (new element)
+
+6. The @localtype attribute can now be used wiht the conventiondeclaration element.
+   See https://github.com/SAA-SDT/EAD3/issues/507
+
+7. The datatype associated with the @containerid attribute has been relaxed to xsd:string (in EAD3 version 1.0, the datatype for this attribute was restricted to xsd:NMTOKEN).
+   See https://github.com/SAA-SDT/EAD3/issues/512
+
+*****************************************************
+  -->
 <!-- include "ead_revised_defs.rng" -->
 
 <!-- ELEMENTS -->

diff --git a/ead3.rng b/ead3.rng
@@ -1,47 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?><grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://ead3.archivists.org/schema/">
-    <!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://ead3.archivists.org/schema/">
+  <!--
     Encoded Archival Description
-	Version: EAD3
-	Release: 1.1
-	Date: 2017-10
-
-	Hosted by the Library of Congress at http://www.loc.gov/ead/.
-		
-	Developed by the Society of American Archivists' 
-	Technical Subcommittee for Encoded Archival Description (TS-EAD) 
-	and Schema Development Team, 2010-2015. 
-
-	Adopted by SAA Council, July 2015.
-	
-	Lead schema developer: Terry Catapano
-	
-	EAD3 was possible because of the generous support of the 
-	Society of American Archivists, the Gladys Krieble Delmas Foundation, 
-	the National Endowment for the Humanities, the Nationaal Archief of the 
-	Netherlands, the Beinecke Rare Book and Manuscript Library, 
-	the Institute for Advanced Technology in the Humanities at the 
-	University of Virginia, and OCLC Research. 
-
-	EAD3 Deliverables
-
-	ead3.dtd	ead3_undeprecated.dtd	
-	ead3.rng	ead3_undeprecated.rng
-	ead3.xsd	ead3_undeprecated.xsd
-	ead3.sch
-
-	Notes:
-	-EAD3 is available as DTD, Relax NG Schema, and W3C Schema. 
-	-The EAD3 DTD does not support the <objectxmlwrap> element.
-	-In the EAD3 DTD, attributes with anyURI, token, and string 
-	data types are converted to CDATA.
-	-Deprecated EAD 2002 elements are available in the undprecated 
-	versions of EAD3. 
-	-A Schematron schema (ead3.sch) is available to validate external code lists
-	not maintained within EAD, standard attribute value patterns, 
-	attribute or element co-ocurrence not enforcable in the schema,
-	and some encoding practices recommended for future migration.
-    -->
+        Version: EAD3
+        Release: 1.1
+        Date: 2017-11-19
+    
+        Hosted by the Library of Congress at http://www.loc.gov/ead/.
+    
+        Developed by the Society of American Archivists' 
+        Technical Subcommittee for Encoded Archival Description (TS-EAD) 
+        and Schema Development Team, 2010-2015. 
     
+        Adopted by SAA Council, July 2015.
+    
+        Lead schema developer: Terry Catapano
+    
+        EAD3 was possible because of the generous support of the 
+        Society of American Archivists, the Gladys Krieble Delmas Foundation, 
+        the National Endowment for the Humanities, the Nationaal Archief of the 
+        Netherlands, the Beinecke Rare Book and Manuscript Library, 
+        the Institute for Advanced Technology in the Humanities at the 
+        University of Virginia, and OCLC Research. 
+    
+        EAD3 Deliverables
+    
+        ead3.dtd	ead3_undeprecated.dtd	
+        ead3.rng	ead3_undeprecated.rng
+        ead3.xsd	ead3_undeprecated.xsd
+        ead3.sch
+    
+        Notes:
+        -EAD3 is available as DTD, Relax NG Schema, and W3C Schema. 
+        -The EAD3 DTD does not support the <objectxmlwrap> element.
+        -In the EAD3 DTD, attributes with anyURI, token, and string 
+        data types are converted to CDATA.
+        -Deprecated EAD 2002 elements are available in the undprecated 
+        versions of EAD3. 
+        -A Schematron schema (ead3.sch) is available to validate external code lists
+        not maintained within EAD, standard attribute value patterns, 
+        attribute or element co-ocurrence not enforcable in the schema,
+        and some encoding practices recommended for future migration.
+        
+***************************************************
+Changes in version 1.1:
+
+1. The @render attribute can now be used with the quote element.
+   See https://github.com/SAA-SDT/EAD3/issues/485
+   
+2. The objectxmlwrap element can now be validated properly in the XSD schemas.
+   See https://github.com/SAA-SDT/EAD3/issues/499
+   (bug fix)
+   
+3. Manually fixed a bug that was causing the descgrp element not to validate correctly in the undeprecated DTD.
+   See https://github.com/SAA-SDT/EAD3/issues/503
+   (bug fix)
+   
+4. The date element is now a valid child of the part element.
+   See https://github.com/SAA-SDT/EAD3/issues/505
+   
+5. rightsdeclaration, a new element, has been added to the control section.
+   See https://github.com/SAA-SDT/EAD3/issues/506
+   (new element)
+   
+6. The @localtype attribute can now be used wiht the conventiondeclaration element.
+   See https://github.com/SAA-SDT/EAD3/issues/507
+   
+7. The datatype associated with the @containerid attribute has been relaxed to xsd:string (in EAD3 version 1.0, the datatype for this attribute was restricted to xsd:NMTOKEN).
+   See https://github.com/SAA-SDT/EAD3/issues/512
+                                        
+*****************************************************
+  -->
     <rng:div xmlns:rng="http://relaxng.org/ns/structure/1.0">
 <!--include "ead_revised_defs.rng"-->
 <rng:div datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">

diff --git a/ead3.xsd b/ead3.xsd
@@ -1,9 +1,10 @@
-<?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.1
-        Date: 2017-10
+        Date: 2017-11-19
     
         Hosted by the Library of Congress at http://www.loc.gov/ead/.
     
@@ -40,6 +41,35 @@
         not maintained within EAD, standard attribute value patterns, 
         attribute or element co-ocurrence not enforcable in the schema,
         and some encoding practices recommended for future migration.
+
+***************************************************
+Changes in version 1.1:
+
+1. The @render attribute can now be used with the quote element.
+   See https://github.com/SAA-SDT/EAD3/issues/485
+
+2. The objectxmlwrap element can now be validated properly in the XSD schemas.
+   See https://github.com/SAA-SDT/EAD3/issues/499
+   (bug fix)
+   
+3. Manually fixed a bug that was causing the descgrp element not to validate correctly in the undeprecated DTD.
+   See https://github.com/SAA-SDT/EAD3/issues/503
+   (bug fix)
+   
+4. The date element is now a valid child of the part element.
+   See https://github.com/SAA-SDT/EAD3/issues/505
+
+5. rightsdeclaration, a new element, has been added to the control section.
+   See https://github.com/SAA-SDT/EAD3/issues/506
+   (new element)
+
+6. The @localtype attribute can now be used wiht the conventiondeclaration element.
+   See https://github.com/SAA-SDT/EAD3/issues/507
+   
+7. The datatype associated with the @containerid attribute has been relaxed to xsd:string (in EAD3 version 1.0, the datatype for this attribute was restricted to xsd:NMTOKEN).
+   See https://github.com/SAA-SDT/EAD3/issues/512
+                                        
+*****************************************************
   -->
   <!-- include "ead_revised_defs.rng" -->
   <!-- ELEMENTS -->

diff --git a/undeprecated/ead3_undeprecated.dtd b/undeprecated/ead3_undeprecated.dtd
@@ -1,4 +1,74 @@
-
+  <!--
+    Encoded Archival Description
+        Version: EAD3
+        Release: 1.1
+        Date: 2017-11-19
+
+        Hosted by the Library of Congress at http://www.loc.gov/ead/.
+
+        Developed by the Society of American Archivists' 
+        Technical Subcommittee for Encoded Archival Description (TS-EAD) 
+        and Schema Development Team, 2010-2015. 
+
+        Adopted by SAA Council, July 2015.
+
+        Lead schema developer: Terry Catapano
+
+        EAD3 was possible because of the generous support of the 
+        Society of American Archivists, the Gladys Krieble Delmas Foundation, 
+        the National Endowment for the Humanities, the Nationaal Archief of the 
+        Netherlands, the Beinecke Rare Book and Manuscript Library, 
+        the Institute for Advanced Technology in the Humanities at the 
+        University of Virginia, and OCLC Research. 
+
+        EAD3 Deliverables
+
+        ead3.dtd	ead3_undeprecated.dtd	
+        ead3.rng	ead3_undeprecated.rng
+        ead3.xsd	ead3_undeprecated.xsd
+        ead3.sch
+
+        Notes:
+        -EAD3 is available as DTD, Relax NG Schema, and W3C Schema. 
+        -The EAD3 DTD does not support the <objectxmlwrap> element.
+        -In the EAD3 DTD, attributes with anyURI, token, and string 
+        data types are converted to CDATA.
+        -Deprecated EAD 2002 elements are available in the undprecated 
+        versions of EAD3. 
+        -A Schematron schema (ead3.sch) is available to validate external code lists
+        not maintained within EAD, standard attribute value patterns, 
+        attribute or element co-ocurrence not enforcable in the schema,
+        and some encoding practices recommended for future migration.
+
+***************************************************
+Changes in version 1.1:
+
+1. The @render attribute can now be used with the quote element.
+   See https://github.com/SAA-SDT/EAD3/issues/485
+
+2. The objectxmlwrap element can now be validated properly in the XSD schemas.
+   See https://github.com/SAA-SDT/EAD3/issues/499
+   (bug fix)
+
+3. Manually fixed a bug that was causing the descgrp element not to validate correctly in the undeprecated DTD.
+   See https://github.com/SAA-SDT/EAD3/issues/503
+   (bug fix)
+
+4. The date element is now a valid child of the part element.
+   See https://github.com/SAA-SDT/EAD3/issues/505
+
+5. rightsdeclaration, a new element, has been added to the control section.
+   See https://github.com/SAA-SDT/EAD3/issues/506
+   (new element)
+
+6. The @localtype attribute can now be used wiht the conventiondeclaration element.
+   See https://github.com/SAA-SDT/EAD3/issues/507
+
+7. The datatype associated with the @containerid attribute has been relaxed to xsd:string (in EAD3 version 1.0, the datatype for this attribute was restricted to xsd:NMTOKEN).
+   See https://github.com/SAA-SDT/EAD3/issues/512
+
+*****************************************************
+  -->
 <!-- include "ead_revised_defs.rng" -->
 
 <!ELEMENT ead (control,frontmatter?,archdesc)>
@@ -2335,15 +2405,13 @@
   placement (header|footer|watermark) #IMPLIED
   role CDATA #IMPLIED>
 
-<!ELEMENT descgrp (head?,((chronlist|list|table|blockquote|p),(accessrestrict|accruals|acqinfo
-                                |altformavail|appraisal|arrangement
-                                |bibliography|bioghist|controlaccess
-                                |custodhist|descgrp|fileplan|index
-                                |legalstatus|odd|originalsloc
-                                |otherfindaid|phystech|prefercite
-                                |processinfo|relatedmaterial|relations
-                                |scopecontent|separatedmaterial
-                                |userestrict))+)>
+<!ELEMENT descgrp (head?,(chronlist|list|table|blockquote|p|accessrestrict
+                         |accruals|acqinfo|altformavail|appraisal|arrangement
+                         |bibliography|bioghist|controlaccess|custodhist|descgrp
+                         |fileplan|index|legalstatus|odd|originalsloc|otherfindaid
+                         |phystech|prefercite |processinfo|relatedmaterial|relations
+                         |scopecontent|separatedmaterial|userestrict)+)>
+
 <!ATTLIST descgrp
 
   id ID #IMPLIED