Skip to content

Commit

Permalink
updated rng and xsd schemas from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@tcatapano
tcatapano committed Jun 27, 2015
1 parent fd7486c commit 89e8597
Show file tree
Hide file tree
Showing 4 changed files with 2,029 additions and 149 deletions.
36 changes: 3 additions & 33 deletions ead3.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2771,47 +2771,17 @@
<rng:define name="m.datesingle">
<optional>
<attribute name="standarddate">
<choice>
<data type="date">
<param name="maxInclusive">2099-12-31</param>
</data>
<data type="gYear">
<param name="maxInclusive">2099</param>
</data>
<data type="gYearMonth">
<param name="maxInclusive">2099-12</param>
</data>
</choice>
<data type="token"/>
</attribute>
</optional>
<optional>
<attribute name="notbefore">
<choice>
<data type="date">
<param name="maxInclusive">2099-12-31</param>
</data>
<data type="gYear">
<param name="maxInclusive">2099</param>
</data>
<data type="gYearMonth">
<param name="maxInclusive">2099-12</param>
</data>
</choice>
<data type="token"/>
</attribute>
</optional>
<optional>
<attribute name="notafter">
<choice>
<data type="date">
<param name="maxInclusive">2099-12-31</param>
</data>
<data type="gYear">
<param name="maxInclusive">2099</param>
</data>
<data type="gYearMonth">
<param name="maxInclusive">2099-12</param>
</data>
</choice>
<data type="token"/>
</attribute>
</optional>
<ref name="m.mixed.basic"/>
Expand Down
66 changes: 3 additions & 63 deletions ead3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1460,69 +1460,9 @@
<xs:complexType name="m.datesingle">
<xs:complexContent>
<xs:extension base="m.mixed.basic">
<xs:attribute name="standarddate">
<xs:simpleType>
<xs:union>
<xs:simpleType>
<xs:restriction base="xs:date">
<xs:maxInclusive value="2099-12-31"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
<xs:restriction base="xs:gYear">
<xs:maxInclusive value="2099"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
<xs:restriction base="xs:gYearMonth">
<xs:maxInclusive value="2099-12"/>
</xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="notbefore">
<xs:simpleType>
<xs:union>
<xs:simpleType>
<xs:restriction base="xs:date">
<xs:maxInclusive value="2099-12-31"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
<xs:restriction base="xs:gYear">
<xs:maxInclusive value="2099"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
<xs:restriction base="xs:gYearMonth">
<xs:maxInclusive value="2099-12"/>
</xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="notafter">
<xs:simpleType>
<xs:union>
<xs:simpleType>
<xs:restriction base="xs:date">
<xs:maxInclusive value="2099-12-31"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
<xs:restriction base="xs:gYear">
<xs:maxInclusive value="2099"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
<xs:restriction base="xs:gYearMonth">
<xs:maxInclusive value="2099-12"/>
</xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="standarddate" type="xs:token"/>
<xs:attribute name="notbefore" type="xs:token"/>
<xs:attribute name="notafter" type="xs:token"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
Expand Down
90 changes: 37 additions & 53 deletions ead3_undeprecated.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,17 @@
<rng:define name="e.ead">
<element name="ead">
<ref name="am.common"/>
<ref name="a.relatedencoding"/>
<ref name="a.base"/>
<optional>
<ref name="a.relatedencoding"/>
</optional>
<optional>
<ref name="a.base"/>
</optional>
<ref name="e.control"/>
<!-- OPTIONAL FRONTMATTER -->
<optional><ref name="e.frontmatter"/></optional>
<optional>
<ref name="e.frontmatter"/>
</optional>
<ref name="e.archdesc"/>
</element>
</rng:define>
Expand All @@ -20,11 +26,17 @@
<rng:define name="e.archdesc">
<element name="archdesc">
<ref name="am.common"/>
<ref name="a.localtype"/>
<ref name="a.relatedencoding"/>
<optional>
<ref name="a.localtype"/>
</optional>
<optional>
<ref name="a.relatedencoding"/>
</optional>
<ref name="am.desc.base"/>
<ref name="a.level"/>
<ref name="a.base"/>
<optional>
<ref name="a.base"/>
</optional>
<zeroOrMore>
<ref name="e.runner"/>
</zeroOrMore>
Expand All @@ -37,7 +49,7 @@
</zeroOrMore>
</element>
</rng:define>

<!-- dsc -->

<rng:define name="e.dsc">
Expand Down Expand Up @@ -82,7 +94,7 @@
</optional>
</element>
</rng:define>

<!-- Components -->
<rng:define name="e.c">
<element name="c">
Expand Down Expand Up @@ -2758,7 +2770,7 @@
<element>
<anyName>
<except>
<nsName ns="http://ead3.archivists.org/schema/"/>
<nsName ns="http://ead3.archivists.org/schema/undeprecated/"/>
</except>
</anyName>
<zeroOrMore>
Expand Down Expand Up @@ -2822,47 +2834,17 @@
<rng:define name="m.datesingle">
<optional>
<attribute name="standarddate">
<choice>
<data type="date">
<param name="maxInclusive">2099-12-31</param>
</data>
<data type="gYear">
<param name="maxInclusive">2099</param>
</data>
<data type="gYearMonth">
<param name="maxInclusive">2099-12</param>
</data>
</choice>
<data type="token"/>
</attribute>
</optional>
<optional>
<attribute name="notbefore">
<choice>
<data type="date">
<param name="maxInclusive">2099-12-31</param>
</data>
<data type="gYear">
<param name="maxInclusive">2099</param>
</data>
<data type="gYearMonth">
<param name="maxInclusive">2099-12</param>
</data>
</choice>
<data type="token"/>
</attribute>
</optional>
<optional>
<attribute name="notafter">
<choice>
<data type="date">
<param name="maxInclusive">2099-12-31</param>
</data>
<data type="gYear">
<param name="maxInclusive">2099</param>
</data>
<data type="gYearMonth">
<param name="maxInclusive">2099-12</param>
</data>
</choice>
<data type="token"/>
</attribute>
</optional>
<ref name="m.mixed.basic"/>
Expand Down Expand Up @@ -3462,8 +3444,10 @@
<ref name="e.head"/>
</optional>
<oneOrMore>
<choice>
<ref name="m.blocks"/>
<ref name="m.desc.base.descgrp"/>
</choice>
</oneOrMore>
</element>
</rng:define>
Expand Down Expand Up @@ -3500,21 +3484,21 @@
</choice>
</zeroOrMore>
</element>


</rng:define>
<rng:define xmlns:rng="http://relaxng.org/ns/structure/1.0" name="e.frontmatter">

<element name="frontmatter">
<ref name="am.common"/>
<optional>
<ref name="e.titlepage"/>
</optional>
<zeroOrMore>
<ref name="e.div"/>
</zeroOrMore>
</element>
<element name="frontmatter">
<ref name="am.common"/>
<optional>
<ref name="e.titlepage"/>

</optional>
<zeroOrMore>
<ref name="e.div"/>
</zeroOrMore>
</element>
</rng:define>
<rng:define xmlns:rng="http://relaxng.org/ns/structure/1.0" name="e.titlepage">
<element name="titlepage">
Expand Down
Loading

0 comments on commit 89e8597

Please sign in to comment.