--- xhtml11-flat.dtd	2009-07-07 09:31:23.000000000 -0700
+++ xhtml11-media-custom.dtd	2009-07-07 10:48:19.000000000 -0700
@@ -5,6 +5,11 @@
 
 <!-- XHTML 1.1 DTD
 
+     Custom XHTML, based on XHTML 1.1 DTD.
+     Added audio,video,source elements.
+     Added autocomplete attribute to form and input.
+     Added a core attribute calleed spider.
+     
      This is XHTML, a reformulation of HTML as a modular XML application.
 
      The Extensible HyperText Markup Language (XHTML)
@@ -129,6 +134,54 @@
 <!-- end of xhtml-inlstyle-1.mod -->
 ]]>
 
+
+
+
+<!-- Spider Module  ........................................ -->
+<!ENTITY % xhtml-spider.module "INCLUDE" >
+<![%xhtml-spider.module;[
+<!ENTITY % xhtml-spider.mod
+     SYSTEM "http://devel.clfsrpm.net/dtd/xhtml-modularization/DTD/xhtml-spider-1.mod" >
+<!-- ...................................................................... -->
+<!-- XHTML Spider Module  ........................................... -->
+<!-- file: xhtml-spider-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-inlspider-1.mod,v 1.4 2008/10/08 21:02:31 jules Exp $
+
+     This DTD module is identified by the SYSTEM identifier:
+
+       SYSTEM "http://www.clfsrpm.net/dtd/xhtml-modularization/DTD/xhtml-spider-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Spider
+
+     This module declares the 'spider' attribute, used to tell search
+     engines what not to index.
+     This module must be instantiated prior to the XHTML
+     Common Attributes module in order to be included in %Core.attrib;.
+-->
+
+<!ENTITY % spider.attrib
+     "spider        ( on | off )                    #IMPLIED"
+>
+
+
+<!ENTITY % Snore.extra.attrib
+     "%spider.attrib;"
+>
+
+<!-- end of xhtml-spider-1.mod -->
+]]>
+
+
+
+
+
 <!-- declare Document Model module instantiated in framework
 -->
 <!ENTITY % xhtml-model.mod
@@ -631,6 +684,15 @@
 <!-- module:  xhtml-object-1.mod -->
 <!ENTITY % object.qname  "%XHTML.pfx;object" >
 
+<!-- module:  xhtml-source-1.mod -->
+<!ENTITY % source.qname  "%XHTML.pfx;source" >
+
+<!-- module:  xhtml-audio-1.mod -->
+<!ENTITY % audio.qname  "%XHTML.pfx;audio" >
+
+<!-- module:  xhtml-video-1.mod -->
+<!ENTITY % video.qname  "%XHTML.pfx;video" >
+
 <!-- module:  xhtml-script-1.mod -->
 <!ENTITY % script.qname  "%XHTML.pfx;script" >
 <!ENTITY % noscript.qname  "%XHTML.pfx;noscript" >
@@ -841,13 +903,15 @@
 >
 
 <!ENTITY % Core.extra.attrib "" >
+<!ENTITY % Snore.extra.attrib "" >
 
 <!ENTITY % Core.attrib
      "%XHTML.xmlns.attrib;
       %id.attrib;
       %class.attrib;
       %title.attrib;
-      %Core.extra.attrib;"
+      %Core.extra.attrib;
+      %Snore.extra.attrib;"
 >
 
 <!ENTITY % lang.attrib
@@ -1000,7 +1064,7 @@
 
 <!ENTITY % InlSpecial.class
      "| %img.qname; | %map.qname;
-      | %object.qname;" >
+      | %object.qname; |%audio.qname; |%video.qname;" >
 
 <!ENTITY % InlForm.class
      "| %input.qname; | %select.qname; | %textarea.qname;
@@ -3728,6 +3792,188 @@
 <!-- end of xhtml-object-1.mod -->
 ]]>
 
+
+
+
+
+
+<!-- Media Source Module  ..................................... -->
+<!ENTITY % xhtml-source.module "INCLUDE" >
+<![%xhtml-source.module;[
+<!ENTITY % xhtml-source.mod
+     SYSTEM "http://devel.clfsrpm.net/dtd/xhtml-modularization/DTD/xhtml-source-1.mod" >
+<!-- ...................................................................... -->
+<!-- XHTML Source Element Module  ..................................... -->
+<!-- file: xhtml-source-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-source-1.mod,v 1.1 2001-05-10 08:41:58 gerald Exp SMI
+
+     This DTD module is identified by the SYSTEM identifier:
+
+       SYSTEM "http://www.clfsrpm.net/dtd/xhtml-modularization/DTD/xhtml-source-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Source for Audio and Video Embedded Media
+
+        source
+
+     This module provides declarations for the source element, 
+     used to provide uri values for the audio
+     and video elements. 
+-->
+
+<!-- source: Named Property Value ....................... -->
+
+<!ENTITY % source.element  "INCLUDE" >
+<![%source.element;[
+<!ENTITY % source.content  "EMPTY" >
+<!ENTITY % source.qname  "source" >
+<!ELEMENT %source.qname;  %source.content; >
+<!-- end of source.element -->]]>
+
+<!ENTITY % source.attlist  "INCLUDE" >
+<![%source.attlist;[
+<!ATTLIST %source.qname;
+      %XHTML.xmlns.attrib; 
+      %id.attrib;
+      src         %URI.datatype;            #REQUIRED
+      type        %ContentType.datatype;    #IMPLIED
+      media       CDATA                     #IMPLIED
+>
+<!-- end of source.attlist -->]]>
+
+<!-- end of xhtml-source-1.mod -->
+]]>
+
+<!-- Media Audio Module  ..................................... -->
+<!ENTITY % xhtml-audio.module "INCLUDE" >
+<![%xhtml-audio.module;[
+<!ENTITY % xhtml-audio.mod
+     SYSTEM "http://devel.clfsrpm.net/dtd/xhtml-modularization/DTD/xhtml-audio-1.mod" >
+<!-- ...................................................................... -->
+<!-- XHTML Audio Element Module  ........................................ -->
+<!-- file: xhtml-audio-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-audio-1.mod,v 1.1 2001-05-10 08:41:58 gerald Exp SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifier:
+
+       SYSTEM "http://www.clfsrpm.net/dtd/xhtml-modularization/DTD/xhtml-audio-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Audio Elements
+
+        audio
+
+     This module declares the audio element type and its attributes,
+     used to embed external audio as part of XHTML pages.
+     
+     Note that use of this module requires instantiation of the 
+     Source Element Module prior to this module.
+-->
+
+<!-- audio: Generic Embedded Audio ................... -->
+
+<!ENTITY % audio.element  "INCLUDE" >
+<![%audio.element;[
+<!ENTITY % audio.content
+     "( %Flow.mix; | %source.qname; )*"
+>
+<!ENTITY % audio.qname  "audio" >
+<!ELEMENT %audio.qname;  %audio.content; >
+<!-- end of audio.element -->]]>
+
+<!ENTITY % audio.attlist  "INCLUDE" >
+<![%audio.attlist;[
+<!ATTLIST %audio.qname;
+      %Common.attrib;
+      autoplay     (autoplay)               #IMPLIED
+      autobuffer   (autobuffer)             #IMPLIED
+      controls     (controls)               #IMPLIED
+      loop         (loop)                   #IMPLIED
+      src          %URI.datatype;           #IMPLIED
+>
+<!-- end of audio.attlist -->]]>
+
+<!-- end of xhtml-audio-1.mod -->
+]]>
+
+<!-- Media Video Module  ..................................... -->
+<!ENTITY % xhtml-video.module "INCLUDE" >
+<![%xhtml-video.module;[
+<!ENTITY % xhtml-video.mod
+     SYSTEM "http://devel.clfsrpm.net/dtd/xhtml-modularization/DTD/xhtml-video-1.mod" >
+<!-- ...................................................................... -->
+<!-- XHTML Video Element Module  ........................................ -->
+<!-- file: xhtml-video-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-video-1.mod,v 1.1 2001-05-10 08:41:58 gerald Exp SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifier:
+
+       SYSTEM "http://www.clfsrpm.net/dtd/xhtml-modularization/DTD/xhtml-video-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Video Elements
+
+        video
+
+     This module declares the video element type and its attributes,
+     used to embed external video as part of XHTML pages.
+     
+     Note that use of this module requires instantiation of the 
+     Source Element Module prior to this module.
+-->
+
+<!-- video: Generic Embedded Video ................... -->
+
+<!ENTITY % video.element  "INCLUDE" >
+<![%video.element;[
+<!ENTITY % video.content
+     "( %Flow.mix; | %source.qname; )*"
+>
+<!ENTITY % video.qname  "video" >
+<!ELEMENT %video.qname;  %video.content; >
+<!-- end of video.element -->]]>
+
+<!ENTITY % video.attlist  "INCLUDE" >
+<![%video.attlist;[
+<!ATTLIST %video.qname;
+      %Common.attrib;
+      autoplay     (autoplay)               #IMPLIED
+      autobuffer   (autobuffer)             #IMPLIED
+      controls     (controls)               #IMPLIED
+      height       %Length.datatype;        #IMPLIED
+      loop         (loop)                   #IMPLIED
+      poster       %URI.datatype;           #IMPLIED
+      src          %URI.datatype;           #IMPLIED
+      width        %Length.datatype;        #IMPLIED
+>
+<!-- end of video.attlist -->]]>
+
+<!-- end of xhtml-video-1.mod -->
+]]>
+
+
+
+
+
+
 <!-- Tables Module ............................................... -->
 <!ENTITY % xhtml-table.module "INCLUDE" >
 <![%xhtml-table.module;[
@@ -4148,6 +4394,7 @@
       enctype      %ContentType.datatype;   'application/x-www-form-urlencoded'
       accept-charset %Charsets.datatype;    #IMPLIED
       accept       %ContentTypes.datatype;  #IMPLIED
+      autocomplete ( on | off )             #IMPLIED
 >
 <!-- end of form.attlist -->]]>
 
@@ -4213,6 +4460,7 @@
       tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
       accept       %ContentTypes.datatype;  #IMPLIED
+      autocomplete ( on | off )             #IMPLIED
 >
 <!-- end of input.attlist -->]]>