Stripped out support for "hgroup", since W3C is removing support for it in HTML5. Added support for "value" attribute on "li" in "ol".

Author: Sanders Kleinfeld

htmlbook.xsd

@@ -229,12 +229,7 @@
         <xs:group ref="headings" minOccurs="0" maxOccurs="unbounded"/>
         <xs:group ref="blockelements" minOccurs="0" maxOccurs="unbounded"/>
       </xs:sequence>
-      <!-- Option 2: hgroup followed by block elements -->
-      <xs:sequence>        
-        <xs:element ref="hgroup"/>
-        <xs:group ref="blockelements" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-      <!-- Option 3: inlines and text only -->
+      <!-- Option 2: inlines and text only -->
       <xs:group ref="inlineelements" minOccurs="0" maxOccurs="unbounded"/>
     </xs:choice>
     <xs:attributeGroup ref="globals"/>
@@ -474,7 +469,16 @@
 <xs:element name="ol">
   <xs:complexType>
     <xs:sequence>
-      <xs:element ref="li" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- "li"s in an "ol" can have a value attribute -->
+      <xs:element name="li" minOccurs="0" maxOccurs="unbounded">
+        <xs:complexType>
+          <xs:complexContent>
+            <xs:extension base="block_xor_inline_children">
+              <xs:attribute name="value" type="positive_int"/>
+            </xs:extension>
+          </xs:complexContent>
+        </xs:complexType>
+      </xs:element>
     </xs:sequence>
     <xs:attributeGroup ref="ol_attrs"/>
     <xs:attributeGroup ref="globals"/>
@@ -1318,15 +1322,6 @@
 
 <xs:element name="figcaption" type="caption"/>
 
-<xs:element name="hgroup">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:group ref="headings" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence> 
-    <xs:attributeGroup ref="globals"/>
-  </xs:complexType>
-</xs:element>
-  
 <xs:element name="legend" type="inline_children_only"/>
 
 <xs:element name="li" type="block_xor_inline_children"/>
@@ -1468,7 +1463,6 @@
 </xs:element>
 
 <!-- Heading elements -->
-<!-- ToDo: Support hgroup in <section> to facilitate subheadings? Already allowed in <div> -->
 <!-- ToDo: Should we require class="title" on all section heading titles? -->
 <xs:element name="h1" type="inline_children_only"/>
 

samples/test_schema.html

@@ -52,14 +52,6 @@ <h3>Another heading you choose</h3>
             <p>Test 123</p>
           </div>
 
-          <!-- An hgroup here -->
-          <div id="third_div" class="third_test_block">
-            <hgroup id="heading_group" class="heading_group" lang="fr">
-              <h1>First heading</h1>
-              <h1>Second heading</h1>
-            </hgroup>
-            <p>Test 123</p>
-          </div>
 
           <section class="sect2" id="a_sect2" lang="en">
             <h2>Test</h2>
@@ -204,7 +196,7 @@ <h1>Table of Contents</h1>
             <!-- Don't forget an ordered list -->
             <ol id="orderedlist" start="3" type="decimal" reversed="ReVersed" spellcheck="true">
               <li><p>This list item</p><p>Has multiple paragraphs</p></li>
-              <li>This one is has just <em>one paragraph</em>, so no need to use block elements</li>
+              <li value="2">This one is has just <em>one paragraph</em>, so no need to use block elements</li>
               <li>Just plain text</li>
             </ol>