No longer allow class="toc" on list

sbsdev · Feb 11, 2011 · 4714d16 · 4714d16
1 parent 10f4d1d
commit 4714d16
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/documents/schema/minimalSchema.rng b/documents/schema/minimalSchema.rng
@@ -122,9 +122,14 @@
   </define>
   <define name="rearmatter">
     <element name="rearmatter">
-      <oneOrMore>
-        <ref name="level1"/>
-      </oneOrMore>
+      <interleave>
+        <oneOrMore>
+          <ref name="level1"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="volume"/>
+        </zeroOrMore>
+      </interleave>
     </element>
   </define>
   <define name="gradeAttribute">
@@ -624,11 +629,6 @@ for this emphasis</a:documentation>
       <optional>
         <ref name="brailleClassAttribute"/>
       </optional>
-      <optional>
-        <attribute name="class">
-          <value>toc</value>
-        </attribute>
-      </optional>
       <attribute name="type">
         <value>pl</value>
       </attribute>
@@ -839,6 +839,9 @@ for this emphasis</a:documentation>
         <zeroOrMore>
           <ref name="epigraph"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="pagenum"/>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="div"/>
         </zeroOrMore>

diff --git a/documents/schema/minimalSchema.xsd b/documents/schema/minimalSchema.xsd
@@ -104,7 +104,10 @@
   </xs:element>
   <xs:element name="rearmatter">
     <xs:complexType>
-      <xs:group maxOccurs="unbounded" ref="dtbook:level1"/>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:group ref="dtbook:level1"/>
+        <xs:element ref="brl:volume"/>
+      </xs:choice>
     </xs:complexType>
   </xs:element>
   <xs:attributeGroup name="gradeAttribute">
@@ -433,13 +436,6 @@ for this emphasis</xs:documentation>
         <xs:element ref="dtbook:pagenum"/>
       </xs:choice>
       <xs:attribute ref="brl:class"/>
-      <xs:attribute name="class">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="toc"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
       <xs:attribute name="type" use="required">
         <xs:simpleType>
           <xs:restriction base="xs:token">
@@ -556,6 +552,7 @@ for this emphasis</xs:documentation>
         <xs:element ref="dtbook:linegroup"/>
         <xs:element ref="dtbook:byline"/>
         <xs:element ref="dtbook:epigraph"/>
+        <xs:element ref="dtbook:pagenum"/>
         <xs:element ref="dtbook:div"/>
       </xs:choice>
       <xs:attributeGroup ref="dtbook:brailleClassAttribute"/>