--- xhtml-arch-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-arch-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-arch-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-arch-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-arch-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-arch-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-arch-1.mod"
 
      Revisions:
      (none)
--- xhtml-attribs-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-attribs-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-attribs-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-attribs-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-attribs-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-attribs-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-attribs-1.mod"
 
      Revisions:
      (none)
@@ -19,46 +19,20 @@
 
      This module declares many of the common attributes for the XHTML DTD.
      %NS.decl.attrib; is declared in the XHTML Qname module.
-
-	 Note that this file was extended in XHTML Modularization Second Edition to 
-	 include declarations of "global" versions of the attribute collections.
-	 The global versions of the attributes are for use on elements in other 
-	 namespaces.  The global version of "common" includes the xmlns declaration
-	 for the prefixed version of the xhtml namespace.  If you are only using a
-	 specific attribute or an individual attribute collection, you must also
-	 include the XHTML.xmlns.attrib.prefixed PE on your elements.
 -->
 
 <!ENTITY % id.attrib
      "id           ID                       #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.id.attrib
-     "%XHTML.prefix;:id           ID        #IMPLIED"
->
-]]>
-
 <!ENTITY % class.attrib
      "class        NMTOKENS                 #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.class.attrib
-     "%XHTML.prefix;:class        NMTOKENS                 #IMPLIED"
->
-]]>
-
 <!ENTITY % title.attrib
      "title        %Text.datatype;          #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.title.attrib
-     "%XHTML.prefix;:title        %Text.datatype;          #IMPLIED"
->
-]]>
-
 <!ENTITY % Core.extra.attrib "" >
 
 <!ENTITY % Core.attrib
@@ -66,25 +40,9 @@
       %id.attrib;
       %class.attrib;
       %title.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
       %Core.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.core.extra.attrib "" >
-
-<![%XHTML.global.attrs.prefixed;[
-
-<!ENTITY % XHTML.global.core.attrib
-     "%XHTML.global.id.attrib;
-      %XHTML.global.class.attrib;
-      %XHTML.global.title.attrib;
-      %XHTML.global.core.extra.attrib;"
->
-]]>
-
-<!ENTITY % XHTML.global.core.attrib "" >
-
-
 <!ENTITY % lang.attrib
      "xml:lang     %LanguageCode.datatype;  #IMPLIED"
 >
@@ -99,31 +57,17 @@
       %lang.attrib;"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY XHTML.global.i18n.attrib
-     "%XHTML.prefix;:dir          ( ltr | rtl )            #IMPLIED
-      %lang.attrib;"
->
-]]>
-<!ENTITY XHTML.global.i18n.attrib "" >
-
 ]]>
 <!ENTITY % I18n.attrib
      "%lang.attrib;"
 >
-<!ENTITY % XHTML.global.i18n.attrib
-     "%lang.attrib;"
->
 
 <!ENTITY % Common.extra.attrib "" >
-<!ENTITY % XHTML.global.common.extra.attrib "" >
 
 <!-- intrinsic event attributes declared previously
 -->
 <!ENTITY % Events.attrib "" >
 
-<!ENTITY % XHTML.global.events.attrib "" >
-
 <!ENTITY % Common.attrib
      "%Core.attrib;
       %I18n.attrib;
@@ -131,12 +75,4 @@
       %Common.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.common.attrib
-     "%XHTML.xmlns.attrib.prefixed;
-      %XHTML.global.core.attrib;
-	  %XHTML.global.i18n.attrib;
-	  %XHTML.global.events.attrib;
-	  %XHTML.global.common.extra.attrib;"
->
-
 <!-- end of xhtml-attribs-1.mod -->
--- xhtml-base-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-base-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-base-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-base-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-base-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-base-1.mod"
 
      Revisions:
      (none)
--- xhtml-basic-form-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic-form-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-basic-form-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic-form-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic-form-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"  
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic-form-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-form-1.mod"
 
      Revisions:
      (none)
@@ -105,7 +105,7 @@
 <!ELEMENT %input.qname;  %input.content; >
 <!-- end of input.element -->]]>
 
-<!-- Basic Forms removes 'button', 'image' and 'file' input types.
+<!-- Basic Forms removes 'image' and 'file' input types.
 -->
 <!ENTITY % input.attlist  "INCLUDE" >
 <![%input.attlist;[
@@ -121,10 +121,9 @@
       name         CDATA                    #IMPLIED
       value        CDATA                    #IMPLIED
       checked      ( checked )              #IMPLIED
-      size         %Number.datatype;        #IMPLIED
+      size         CDATA                    #IMPLIED
       maxlength    %Number.datatype;        #IMPLIED
       src          %URI.datatype;           #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
 >
 <!-- end of input.attlist -->]]>
@@ -144,7 +143,6 @@
       name         CDATA                    #IMPLIED
       size         %Number.datatype;        #IMPLIED
       multiple     ( multiple )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
 >
 <!-- end of select.attlist -->]]>
 
@@ -180,7 +178,6 @@
       name         CDATA                    #IMPLIED
       rows         %Number.datatype;        #REQUIRED
       cols         %Number.datatype;        #REQUIRED
-      tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
 >
 <!-- end of textarea.attlist -->]]>
--- xhtml-basic-table-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic-table-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-basic-table-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic-table-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic-table-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic-table-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-table-1.mod"
 
      Revisions:
      (none)
@@ -72,7 +72,6 @@
 <!ATTLIST %table.qname;
       %Common.attrib;
       summary      %Text.datatype;          #IMPLIED
-      width        %Length.datatype;        #IMPLIED
 >
 <!-- end of table.attlist -->]]>
 
--- xhtml-basic10-f.dtd	2005-04-13 22:13:02.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic10-f.dtd	2001-05-10 17:41:58.000000000 +0900
@@ -6,9 +6,9 @@
      This is XHTML Basic, a proper subset of XHTML.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2005 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research Consortium
-         for Informatics and Mathematics, Keio University).
+     Copyright 1998-2000 World Wide Web Consortium
+        (Massachusetts Institute of Technology, Institut National de
+         Recherche en Informatique et en Automatique, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML Basic DTD
@@ -21,7 +21,7 @@
 
         Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
                     Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-        Revision:   $Id: xhtml-basic10.dtd,v 2.13 2000/12/18 12:56:23 mimasa Exp $ SMI
+        Revision:   xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
 -->
 <!-- This is the driver file for version 1.0 of the XHTML Basic DTD.
@@ -49,8 +49,8 @@
 <!ENTITY % XLINK.xmlns.attrib "" >
 
 <!-- For example, if you are using XHTML Basic 1.0 directly, use
-     the public identifier in the DOCTYPE declaration, with the namespace
-     declaration on the document element to identify the default namespace:
+     the FPI in the DOCTYPE declaration, with the xmlns attribute
+     on the document element to identify the default namespace:
 
          <?xml version="1.0"?>
          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
@@ -79,23 +79,23 @@
 
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-basic10-model-1.mod" >
+            "xhtml-basic10-model-1.mod" >
 
 <!ENTITY % xhtml-framework.mod
      PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" >
+            "xhtml-framework-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Modular Framework Module  ...................................... -->
 <!-- file: xhtml-framework-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-framework-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-framework-1.mod"
 
      Revisions:
      (none)
@@ -118,12 +118,63 @@
      prior to Attributes but after Datatypes.
 -->
 
-<!ENTITY % xhtml-arch.module "IGNORE" >
+<!ENTITY % xhtml-arch.module "INCLUDE" >
 <![%xhtml-arch.module;[
 <!ENTITY % xhtml-arch.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
             "xhtml-arch-1.mod" >
-%xhtml-arch.mod;]]>
+<!-- ...................................................................... -->
+<!-- XHTML Base Architecture Module  ...................................... -->
+<!-- file: xhtml-arch-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-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-arch-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- This optional module includes declarations that enable XHTML to be used
+     as a base architecture according to the 'Architectural Forms Definition
+     Requirements' (Annex A.3, ISO/IEC 10744, 2nd edition). For more information
+     on use of architectural forms, see the HyTime web site at:
+
+         http://www.hytime.org/
+-->
+
+<?IS10744 ArcBase xhtml ?>
+
+<!NOTATION xhtml PUBLIC "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN" >
+
+<!-- Entity declaration for associated Architectural DTD
+-->
+<!ENTITY xhtml-arch.dtd
+      PUBLIC "-//W3C//DTD XHTML Architecture 1.1//EN"
+             "xhtml11-arch.dtd" >
+
+<?IS10744:arch xhtml
+    public-id       =  "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN"
+    dtd-public-id   =  "-//W3C//DTD XHTML 1.1//EN"
+    dtd-system-id   =  "xhtml11.dtd"
+    doc-elem-form   =  "html"
+    form-att        =  "html"
+    renamer-att     =  "htnames"
+    suppressor-att  =  "htsupp"
+    data-ignore-att =  "htign"
+    auto            =  "ArcAuto"
+    options         =  "HtModReq HtModOpt"
+    HtModReq        =  "Framework Text Hypertext Lists Structure"
+    HtModOpt        =  "Standard"
+?>
+
+<!-- end of xhtml-arch-1.mod -->
+]]>
 
 <!ENTITY % xhtml-notations.module "INCLUDE" >
 <![%xhtml-notations.module;[
@@ -135,13 +186,13 @@
 <!-- file: xhtml-notations-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-notations-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-notations-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-notations-1.mod"
 
      Revisions:
      (none)
@@ -149,7 +200,7 @@
 
 <!-- Notations
 
-     defines the following notations, many of these imported from
+     defines the following notations, many of these imported from 
      other specifications and standards. When an existing FPI is
      known, it is incorporated here.
 -->
@@ -158,11 +209,11 @@
 <!-- SGML and XML Notations ............................ -->
 
 <!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
+<!NOTATION w3c-xml 
      PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
 
 <!-- XML 1.0 CDATA -->
-<!NOTATION cdata
+<!NOTATION cdata 
      PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
 
 <!-- SGML Formal Public Identifiers -->
@@ -174,73 +225,73 @@
 <!-- Length defined for cellpadding/cellspacing -->
 
 <!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
+<!NOTATION length 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
 
 <!-- space-separated list of link types -->
-<!NOTATION linkTypes
+<!NOTATION linkTypes 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
 
 <!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
+<!NOTATION mediaDesc 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
 
 <!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
+<!NOTATION multiLength 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
 
 <!-- one or more digits (NUMBER) -->
-<!NOTATION number
+<!NOTATION number 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
 
 <!-- integer representing length in pixels -->
-<!NOTATION pixels
+<!NOTATION pixels 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
 
 <!-- script expression -->
-<!NOTATION script
+<!NOTATION script 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
 
 <!-- textual content -->
-<!NOTATION text
+<!NOTATION text 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
 
 <!-- Imported Notations ................................ -->
 
 <!-- a single character from [ISO10646] -->
-<!NOTATION character
+<!NOTATION character 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
 
 <!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
+<!NOTATION charset 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
 
 <!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
+<!NOTATION charsets 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
 
 <!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
+<!NOTATION contentType 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
 
 <!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
+<!NOTATION contentTypes 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
 
 <!-- date and time information. ISO date format -->
-<!NOTATION datetime
+<!NOTATION datetime 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
 
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
+<!-- a language code, as per [RFC1766] -->
+<!NOTATION languageCode 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
+<!NOTATION uri 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
 
 <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
+<!NOTATION uris 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
 
 <!-- end of xhtml-notations-1.mod -->
@@ -256,13 +307,13 @@
 <!-- file: xhtml-datatypes-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-datatypes-1.mod,v 4.1 2001/04/06 19:23:32 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-datatypes-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-datatypes-1.mod"
 
      Revisions:
      (none)
@@ -311,9 +362,6 @@
 <!-- a space separated list of character encodings, as per [RFC2045] -->
 <!ENTITY % Charsets.datatype "CDATA" >
 
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
 <!-- media type, as per [RFC2045] -->
 <!ENTITY % ContentType.datatype "CDATA" >
 
@@ -326,8 +374,8 @@
 <!-- formal public identifier, as per [ISO8879] -->
 <!ENTITY % FPI.datatype "CDATA" >
 
-<!-- a language code, as per [RFC3066] or its successor -->
-<!ENTITY % LanguageCode.datatype "CDATA" >
+<!-- a language code, as per [RFC1766] -->
+<!ENTITY % LanguageCode.datatype "NMTOKEN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
 <!ENTITY % URI.datatype "CDATA" >
@@ -352,16 +400,16 @@
 <!-- file: xhtml-qname-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-qname-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-qname-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-qname-1.mod"
 
      Revisions:
-#2000-10-22: added qname declarations for ruby elements
+     (none)
      ....................................................................... -->
 
 <!-- XHTML Qname (Qualified Name) Module
@@ -369,9 +417,9 @@
      This module is contained in two parts, labeled Section 'A' and 'B':
 
        Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing
+       qualified names, namespace declarations, and name prefixing 
        for XHTML and extensions.
-
+    
        Section B declares parameter entities used to provide
        namespace-qualified names for all XHTML element types:
 
@@ -379,49 +427,40 @@
          %base.qname;     the xmlns-qualified name for <base>
          ...
 
-     XHTML extensions would create a module similar to this one.
-     Included in the XHTML distribution is a template module
+     XHTML extensions would create a module similar to this one. 
+     Included in the XHTML distribution is a template module 
      ('template-qname-1.mod') suitable for this purpose.
 -->
 
 <!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
 
 <!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should
-        inherit '%NS.prefixed;' from the DTD driver, so that unless
-        overridden, the default behaviour follows the overall DTD
+        to activate namespace prefixing. The default value should 
+        inherit '%NS.prefixed;' from the DTD driver, so that unless 
+        overridden, the default behaviour follows the overall DTD 
         prefixing scheme.
 -->
 <!ENTITY % NS.prefixed "IGNORE" >
 <!ENTITY % XHTML.prefixed "%NS.prefixed;" >
 
-<!-- By default, we always permit XHTML attribute collections to have
-     namespace-qualified prefixes as well.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
-<!-- By default, we allow the XML Schema attributes on the root
-     element.
--->
-<!ENTITY % XHTML.xsi.attrs "INCLUDE" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
+<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing 
         the URI reference used to identify the XHTML namespace:
 -->
 <!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
 
 <!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing
+        the default namespace prefix string(s) to use when prefixing 
         is enabled. This may be overridden in the DTD driver or the
         internal subset of an document instance. If no default prefix
         is desired, this may be declared as an empty string.
 
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves
+     NOTE: As specified in [XMLNAMES], the namespace prefix serves 
      as a proxy for the URI reference, and is not in itself significant.
 -->
-<!ENTITY % XHTML.prefix  "xhtml" >
+<!ENTITY % XHTML.prefix  "" >
 
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
+<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the 
+        colonized prefix(es) (eg., '%XHTML.prefix;:') used when 
         prefixing is active, an empty string when it is not.
 -->
 <![%XHTML.prefixed;[
@@ -434,9 +473,9 @@
 
 
 <!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration
-        attributes for namespaces embedded in XHTML. The default
-        is an empty string.  XLink should be included here if used
+        redeclared to contain any non-XHTML namespace declaration 
+        attributes for namespaces embedded in XHTML. The default 
+        is an empty string.  XLink should be included here if used 
         in the DTD.
 -->
 <!ENTITY % XHTML.xmlns.extra.attrib "" >
@@ -445,15 +484,12 @@
 
 <!-- Declare a parameter entity %NS.decl.attrib; containing
      all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether
-     prefixing is active.
+     xmlns declaration for XHTML, its form dependent on whether 
+     prefixing is active. 
 -->
-<!ENTITY % XHTML.xmlns.attrib.prefixed
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'"
->
 <![%XHTML.prefixed;[
 <!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.attrib.prefixed;
+     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
       %XHTML.xmlns.extra.attrib;"
 >
 ]]>
@@ -461,58 +497,22 @@
      "%XHTML.xmlns.extra.attrib;"
 >
 
-<!-- Declare a parameter entity %XSI.prefix as a prefix to use for XML
-     Schema Instance attributes.
--->
-<!ENTITY % XSI.prefix "xsi" >
-
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!-- Declare a parameter entity %XSI.xmlns.attrib as support for the
-     schemaLocation attribute, since this is legal throughout the DTD.
--->
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;   #FIXED '%XSI.xmlns;'" >
-
 <!-- This is a placeholder for future XLink support.
 -->
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- This is the attribute for the XML Schema namespace - XHTML
-     Modularization is also expressed in XML Schema, and it needs to
-	 be legal to declare the XML Schema namespace and the
-	 schemaLocation attribute on the root element of XHTML family
-	 documents.
--->
-<![%XHTML.xsi.attrs;[
-<!ENTITY % XSI.prefix "xsi" >
-<!ENTITY % XSI.pfx "%XSI.prefix;:" >
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;    #FIXED '%XSI.xmlns;'"
->
-]]>
-<!ENTITY % XSI.prefix "" >
-<!ENTITY % XSI.pfx "" >
-<!ENTITY % XSI.xmlns.attrib "" >
-
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
+<!-- Declare a parameter entity %NS.decl.attrib; containing all 
      XML namespace declaration attributes used by XHTML, including
      a default xmlns attribute when prefixing is inactive.
 -->
 <![%XHTML.prefixed;[
 <!ENTITY % XHTML.xmlns.attrib
      "%NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 ]]>
 <!ENTITY % XHTML.xmlns.attrib
      "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 
@@ -650,14 +650,6 @@
 <!ENTITY % th.qname      "%XHTML.pfx;th" >
 <!ENTITY % td.qname      "%XHTML.pfx;td" >
 
-<!-- module:  xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
 
 <!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
 
@@ -684,13 +676,13 @@
 <!-- file: xhtml-attribs-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-attribs-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-attribs-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-attribs-1.mod"
 
      Revisions:
      (none)
@@ -700,46 +692,20 @@
 
      This module declares many of the common attributes for the XHTML DTD.
      %NS.decl.attrib; is declared in the XHTML Qname module.
-
-	 Note that this file was extended in XHTML Modularization Second Edition to 
-	 include declarations of "global" versions of the attribute collections.
-	 The global versions of the attributes are for use on elements in other 
-	 namespaces.  The global version of "common" includes the xmlns declaration
-	 for the prefixed version of the xhtml namespace.  If you are only using a
-	 specific attribute or an individual attribute collection, you must also
-	 include the XHTML.xmlns.attrib.prefixed PE on your elements.
 -->
 
 <!ENTITY % id.attrib
      "id           ID                       #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.id.attrib
-     "%XHTML.prefix;:id           ID        #IMPLIED"
->
-]]>
-
 <!ENTITY % class.attrib
      "class        NMTOKENS                 #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.class.attrib
-     "%XHTML.prefix;:class        NMTOKENS                 #IMPLIED"
->
-]]>
-
 <!ENTITY % title.attrib
      "title        %Text.datatype;          #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.title.attrib
-     "%XHTML.prefix;:title        %Text.datatype;          #IMPLIED"
->
-]]>
-
 <!ENTITY % Core.extra.attrib "" >
 
 <!ENTITY % Core.attrib
@@ -747,25 +713,9 @@
       %id.attrib;
       %class.attrib;
       %title.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
       %Core.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.core.extra.attrib "" >
-
-<![%XHTML.global.attrs.prefixed;[
-
-<!ENTITY % XHTML.global.core.attrib
-     "%XHTML.global.id.attrib;
-      %XHTML.global.class.attrib;
-      %XHTML.global.title.attrib;
-      %XHTML.global.core.extra.attrib;"
->
-]]>
-
-<!ENTITY % XHTML.global.core.attrib "" >
-
-
 <!ENTITY % lang.attrib
      "xml:lang     %LanguageCode.datatype;  #IMPLIED"
 >
@@ -780,31 +730,17 @@
       %lang.attrib;"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY XHTML.global.i18n.attrib
-     "%XHTML.prefix;:dir          ( ltr | rtl )            #IMPLIED
-      %lang.attrib;"
->
-]]>
-<!ENTITY XHTML.global.i18n.attrib "" >
-
 ]]>
 <!ENTITY % I18n.attrib
      "%lang.attrib;"
 >
-<!ENTITY % XHTML.global.i18n.attrib
-     "%lang.attrib;"
->
 
 <!ENTITY % Common.extra.attrib "" >
-<!ENTITY % XHTML.global.common.extra.attrib "" >
 
 <!-- intrinsic event attributes declared previously
 -->
 <!ENTITY % Events.attrib "" >
 
-<!ENTITY % XHTML.global.events.attrib "" >
-
 <!ENTITY % Common.attrib
      "%Core.attrib;
       %I18n.attrib;
@@ -812,14 +748,6 @@
       %Common.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.common.attrib
-     "%XHTML.xmlns.attrib.prefixed;
-      %XHTML.global.core.attrib;
-	  %XHTML.global.i18n.attrib;
-	  %XHTML.global.events.attrib;
-	  %XHTML.global.common.extra.attrib;"
->
-
 <!-- end of xhtml-attribs-1.mod -->
 ]]>
 
@@ -836,13 +764,13 @@
 <!-- file: xhtml-basic10-model-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-model-1.mod,v 2.8 2000/11/03 14:28:25 mimasa Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic10-model-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-basic/xhtml-basic10-model-1.mod"
 
      Revisions:
      (none)
@@ -991,13 +919,13 @@
 <!-- file: xhtml-charent-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-charent-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-charent-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-charent-1.mod"
 
      Revisions:
      (none)
@@ -1012,6 +940,13 @@
 <!ENTITY % xhtml-lat1
     PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
            "xhtml-lat1.ent" >
+<!ENTITY % xhtml-symbol
+    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
+           "xhtml-symbol.ent" >
+<!ENTITY % xhtml-special
+    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
+           "xhtml-special.ent" >
+
 <!-- Portions (C) International Organization for Standardization 1986
      Permission to copy in any form is granted for use with
      conforming SGML systems and applications as defined in
@@ -1040,7 +975,7 @@
 <!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
 <!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
                                   = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
+<!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
                                   U+00AC ISOnum -->
 <!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
                                   U+00AD ISOnum -->
@@ -1204,16 +1139,12 @@
                                   U+00FC ISOlat1 -->
 <!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
                                   U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn,
+<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
                                   U+00FE ISOlat1 -->
 <!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
                                   U+00FF ISOlat1 -->
 
-
-<!ENTITY % xhtml-symbol
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-           "xhtml-symbol.ent" >
-<!-- Mathematical, Greek and Symbolic characters for XHTML -->
+<!-- Mathematical, Greek and Symbolic characters for HTML -->
 
 <!-- Character entity set. Typical invocation:
      <!ENTITY % HTMLsymbol PUBLIC
@@ -1237,7 +1168,7 @@
 -->
 
 <!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small letter f with hook = function
+<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
                                     = florin, U+0192 ISOtech -->
 
 <!-- Greek -->
@@ -1254,7 +1185,7 @@
                                     U+0398 ISOgrk3 -->
 <!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
 <!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lamda,
+<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
                                     U+039B ISOgrk3 -->
 <!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
 <!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
@@ -1292,7 +1223,7 @@
 <!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
 <!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
                                     U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lamda,
+<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
                                     U+03BB ISOgrk3 -->
 <!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
 <!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
@@ -1312,7 +1243,7 @@
 <!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
 <!ENTITY omega    "&#969;"> <!-- greek small letter omega,
                                     U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek theta symbol,
+<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
                                     U+03D1 NEW -->
 <!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
                                     U+03D2 NEW -->
@@ -1334,9 +1265,9 @@
 <!-- Letterlike Symbols -->
 <!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
                                      = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- black-letter capital I = imaginary part,
+<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
                                      U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- black-letter capital R = real part symbol,
+<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
                                      U+211C ISOamso -->
 <!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
 <!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
@@ -1354,14 +1285,14 @@
                                      = carriage return, U+21B5 NEW -->
 <!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
 <!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So lArr can
+    but also does not have any other character for that function. So ? lArr can
     be used for 'is implied by' as ISOtech suggests -->
 <!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
 <!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
                                      U+21D2 ISOtech -->
 <!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so rArr can be used for 'implies'
-     as ISOtech suggests -->
+     another character with this function so ?
+     rArr can be used for 'implies' as ISOtech suggests -->
 <!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
 <!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
                                      U+21D4 ISOamsa -->
@@ -1370,17 +1301,19 @@
 <!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
 <!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
 <!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set, U+2205 ISOamso -->
+<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
+                                     U+2205 ISOamso -->
 <!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
                                      U+2207 ISOtech -->
 <!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
 <!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
 <!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
+<!-- should there be a more memorable name than 'ni'? -->
 <!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
                                      U+220F ISOamsb -->
 <!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
      the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary summation, U+2211 ISOamsb -->
+<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
 <!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
      though the same glyph might be used for both -->
 <!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
@@ -1410,6 +1343,9 @@
                                      U+2265 ISOtech -->
 <!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
 <!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
+<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
+     font encoding and is not included. Should it be, for symmetry?
+     It is in ISOamsn  --> 
 <!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
 <!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
 <!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
@@ -1424,19 +1360,19 @@
 <!-- dot operator is NOT the same character as U+00B7 middle dot -->
 
 <!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = APL upstile,
+<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
                                      U+2308 ISOamsc  -->
 <!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = APL downstile,
+<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
                                      U+230A ISOamsc  -->
 <!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
 <!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
                                      U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than sign' 
+<!-- lang is NOT the same character as U+003C 'less than' 
      or U+2039 'single left-pointing angle quotation mark' -->
 <!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
                                      U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than sign' 
+<!-- rang is NOT the same character as U+003E 'greater than' 
      or U+203A 'single right-pointing angle quotation mark' -->
 
 <!-- Geometric Shapes -->
@@ -1451,11 +1387,7 @@
                                      U+2665 ISOpub -->
 <!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
 
-
-<!ENTITY % xhtml-special
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-           "xhtml-special.ent" >
-<!-- Special characters for XHTML -->
+<!-- Special characters for HTML -->
 
 <!-- Character entity set. Typical invocation:
      <!ENTITY % HTMLspecial PUBLIC
@@ -1479,11 +1411,12 @@
 -->
 
 <!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark, U+0022 ISOnum -->
+<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
+                                    U+0022 ISOnum -->
 <!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
 <!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
 <!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe = APL quote, U+0027 ISOnum -->
+<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
 
 <!-- Latin Extended-A -->
 <!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
@@ -1532,8 +1465,6 @@
 <!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
                                     U+203A ISO proposed -->
 <!-- rsaquo is proposed but not yet ISO standardized -->
-
-<!-- Currency Symbols -->
 <!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
 
 
@@ -1553,19 +1484,19 @@
 
 <!ENTITY % xhtml-text.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" >
+            "xhtml-text-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Text Module  ................................................... -->
 <!-- file: xhtml-text-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-text-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-text-1.mod"
 
      Revisions:
      (none)
@@ -1573,7 +1504,7 @@
 
 <!-- Textual Content
 
-     The Text module includes declarations for all core
+     The Text module includes declarations for all core 
      text container elements and their attributes.
 -->
 
@@ -1587,13 +1518,13 @@
 <!-- file: xhtml-inlstruct-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-inlstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlstruct-1.mod"
 
      Revisions:
      (none)
@@ -1603,7 +1534,7 @@
 
         br, span
 
-     This module declares the elements and their attributes
+     This module declares the elements and their attributes 
      used to support inline-level structural markup.
 -->
 
@@ -1656,13 +1587,13 @@
 <!-- file: xhtml-inlphras-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-inlphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlphras-1.mod"
 
      Revisions:
      (none)
@@ -1866,13 +1797,13 @@
 <!-- file: xhtml-blkstruct-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-blkstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkstruct-1.mod"
 
      Revisions:
      (none)
@@ -1897,10 +1828,10 @@
 
 <!ENTITY % div.attlist  "INCLUDE" >
 <![%div.attlist;[
+<!-- end of div.attlist -->]]>
 <!ATTLIST %div.qname;
       %Common.attrib;
 >
-<!-- end of div.attlist -->]]>
 
 <!ENTITY % p.element  "INCLUDE" >
 <![%p.element;[
@@ -1930,13 +1861,13 @@
 <!-- file: xhtml-blkphras-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-blkphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkphras-1.mod"
 
      Revisions:
      (none)
@@ -1985,7 +1916,7 @@
 <!ENTITY % pre.element  "INCLUDE" >
 <![%pre.element;[
 <!ENTITY % pre.content
-     "( #PCDATA
+     "( #PCDATA 
       | %InlStruct.class;
       %InlPhras.class;
       | %tt.qname; | %i.qname; | %b.qname;
@@ -2002,6 +1933,7 @@
 <![%pre.attlist;[
 <!ATTLIST %pre.qname;
       %Common.attrib;
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of pre.attlist -->]]>
 
@@ -2095,19 +2027,19 @@
 
 <!ENTITY % xhtml-hypertext.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" >
+            "xhtml-hypertext-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Hypertext Module  .............................................. -->
 <!-- file: xhtml-hypertext-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-hypertext-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-hypertext-1.mod"
 
      Revisions:
      (none)
@@ -2119,7 +2051,7 @@
 
      This module declares the anchor ('a') element type, which
      defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute
+     (or link 'target') is identified via its 'id' attribute 
      rather than the 'name' attribute as was used in HTML.
 -->
 
@@ -2154,19 +2086,19 @@
 
 <!ENTITY % xhtml-list.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" >
+            "xhtml-list-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Lists Module  .................................................. -->
 <!-- file: xhtml-list-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-list-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-list-1.mod"
 
      Revisions:
      (none)
@@ -2293,19 +2225,19 @@
 <![%xhtml-image.module;[
 <!ENTITY % xhtml-image.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" >
+            "xhtml-image-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Images Module  ................................................. -->
 <!-- file: xhtml-image-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-image-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Rovision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-image-1.mod"
 
      Revisions:
      (none)
@@ -2351,19 +2283,19 @@
 <![%xhtml-table.module;[
 <!ENTITY % xhtml-table.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-basic-table-1.mod" >
+            "xhtml-basic-table-1.mod" >
 <!-- ....................................................................... -->
 <!-- XHTML Basic Table Module  ............................................. -->
 <!-- file: xhtml-basic-table-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic-table-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic-table-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-table-1.mod"
 
      Revisions:
      (none)
@@ -2426,7 +2358,6 @@
 <!ATTLIST %table.qname;
       %Common.attrib;
       summary      %Text.datatype;          #IMPLIED
-      width        %Length.datatype;        #IMPLIED
 >
 <!-- end of table.attlist -->]]>
 
@@ -2526,19 +2457,19 @@
 <![%xhtml-form.module;[
 <!ENTITY % xhtml-form.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-basic-form-1.mod" >
+            "xhtml-basic-form-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Simplified Forms Module  ....................................... -->
 <!-- file: xhtml-basic-form-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic-form-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"  
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic-form-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-form-1.mod"
 
      Revisions:
      (none)
@@ -2634,7 +2565,7 @@
 <!ELEMENT %input.qname;  %input.content; >
 <!-- end of input.element -->]]>
 
-<!-- Basic Forms removes 'button', 'image' and 'file' input types.
+<!-- Basic Forms removes 'image' and 'file' input types.
 -->
 <!ENTITY % input.attlist  "INCLUDE" >
 <![%input.attlist;[
@@ -2650,10 +2581,9 @@
       name         CDATA                    #IMPLIED
       value        CDATA                    #IMPLIED
       checked      ( checked )              #IMPLIED
-      size         %Number.datatype;        #IMPLIED
+      size         CDATA                    #IMPLIED
       maxlength    %Number.datatype;        #IMPLIED
       src          %URI.datatype;           #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
 >
 <!-- end of input.attlist -->]]>
@@ -2673,7 +2603,6 @@
       name         CDATA                    #IMPLIED
       size         %Number.datatype;        #IMPLIED
       multiple     ( multiple )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
 >
 <!-- end of select.attlist -->]]>
 
@@ -2709,7 +2638,6 @@
       name         CDATA                    #IMPLIED
       rows         %Number.datatype;        #REQUIRED
       cols         %Number.datatype;        #REQUIRED
-      tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
 >
 <!-- end of textarea.attlist -->]]>
@@ -2722,19 +2650,19 @@
 <![%xhtml-link.module;[
 <!ENTITY % xhtml-link.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" >
+            "xhtml-link-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Link Element Module  ........................................... -->
 <!-- file: xhtml-link-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-link-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-link-1.mod"
 
      Revisions:
      (none)
@@ -2752,7 +2680,7 @@
         previous, next, index, end, help
      b) to link to a separate style sheet (rel="stylesheet")
      c) to make a link to a script (rel="script")
-     d) by style sheets to control how collections of html nodes are
+     d) by stylesheets to control how collections of html nodes are
         rendered into printed documents
      e) to make a link to a printable version of this document
         e.g. a postscript or pdf version (rel="alternate" media="print")
@@ -2789,19 +2717,19 @@
 <![%xhtml-meta.module;[
 <!ENTITY % xhtml-meta.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" >
+            "xhtml-meta-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Document Metainformation Module  ............................... -->
 <!-- file: xhtml-meta-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-meta-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-meta-1.mod"
 
      Revisions:
      (none)
@@ -2844,19 +2772,19 @@
 <![%xhtml-base.module;[
 <!ENTITY % xhtml-base.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" >
+            "xhtml-base-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Base Element Module  ........................................... -->
 <!-- file: xhtml-base-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-base-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-base-1.mod"
 
      Revisions:
      (none)
@@ -2905,19 +2833,19 @@
 <![%xhtml-param.module;[
 <!ENTITY % xhtml-param.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" >
+            "xhtml-param-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Param Element Module  ..................................... -->
 <!-- file: xhtml-param-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-param-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-param-1.mod"
 
      Revisions:
      (none)
@@ -2927,9 +2855,9 @@
 
         param
 
-     This module provides declarations for the param element,
+     This module provides declarations for the param element, 
      used to provide named property values for the applet
-     and object elements.
+     and object elements. 
 -->
 
 <!-- param: Named Property Value ....................... -->
@@ -2944,7 +2872,7 @@
 <!ENTITY % param.attlist  "INCLUDE" >
 <![%param.attlist;[
 <!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %id.attrib;
       name         CDATA                    #REQUIRED
       value        CDATA                    #IMPLIED
@@ -2961,19 +2889,19 @@
 <![%xhtml-object.module;[
 <!ENTITY % xhtml-object.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" >
+            "xhtml-object-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Embedded Object Module  ........................................ -->
 <!-- file: xhtml-object-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-object-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-object-1.mod"
 
      Revisions:
      (none)
@@ -2983,12 +2911,13 @@
 
         object
 
-     This module declares the object element type and its attributes, used
-     to embed external objects as part of XHTML pages. In the document,
-     place param elements prior to other content within the object element.
+     This module declares the object element type and its attributes,
+     used to embed external objects as part of XHTML pages. In the
+     document, place param elements prior to the object elements 
+     that require their content.
 
-     Note that use of this module requires instantiation of the Param
-     Element Module.
+     Note that use of this module requires instantiation of the 
+     Param Element Module prior to this module.
 -->
 
 <!-- object: Generic Embedded Object ................... -->
@@ -3026,19 +2955,19 @@
 
 <!ENTITY % xhtml-struct.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" >
+            "xhtml-struct-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Structure Module  .............................................. -->
 <!-- file: xhtml-struct-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-struct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-struct-1.mod"
 
      Revisions:
      (none)
@@ -3048,13 +2977,13 @@
 
         title, head, body, html
 
-     The Structure Module defines the major structural elements and
+     The Structure Module defines the major structural elements and 
      their attributes.
 
-     Note that the content model of the head element type is redeclared
+     Note that the content model of the head element type is redeclared 
      when the Base Module is included in the DTD.
 
-     The parameter entity containing the XML namespace URI value used
+     The parameter entity containing the XML namespace URI value used 
      for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
 -->
 
@@ -3075,7 +3004,7 @@
 <!ENTITY % title.attlist  "INCLUDE" >
 <![%title.attlist;[
 <!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %I18n.attrib;
 >
 <!-- end of title.attlist -->]]>
@@ -3100,7 +3029,7 @@
 >
 
 <!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %I18n.attrib;
       %profile.attrib;
 >
@@ -3133,14 +3062,6 @@
 <!ELEMENT %html.qname;  %html.content; >
 <!-- end of html.element -->]]>
 
-<![%XHTML.xsi.attrs;[
-<!-- define a parameter for the XSI schemaLocation attribute -->
-<!ENTITY % XSI.schemaLocation.attrib
-     "%XSI.pfx;schemaLocation  %URIs.datatype;    #IMPLIED"
->
-]]>
-<!ENTITY % XSI.schemaLocation.attrib "">
-
 <!ENTITY % html.attlist  "INCLUDE" >
 <![%html.attlist;[
 <!-- version attribute value defined in driver
@@ -3148,18 +3069,12 @@
 <!ENTITY % XHTML.version.attrib
      "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
 >
-<!-- schemaLocation attribute from XML Schema
--->
-<!ENTITY % XSI.schemaLocation.attrib
-     "schemaLocation   %URIs.datatype;      #IMPLIED"
->
 
-<!-- see the Qualified Names module for information
-     on how to extend XHTML using XML namespaces
+<!-- see the Qualified Names module for information 
+     on how to extend XHTML using XML namespaces 
 -->
 <!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib;
-      %XSI.schemaLocation.attrib;
+      %XHTML.xmlns.attrib; 
       %XHTML.version.attrib;
       %I18n.attrib;
 >
@@ -3169,4 +3084,3 @@
 
 
 <!-- end of XHTML Basic 1.0 DTD  ........................................... -->
-
--- xhtml-basic10-model-1.mod	2005-04-13 21:34:25.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic10-model-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-basic10-model-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-model-1.mod,v 2.8 2000/11/03 14:28:25 mimasa Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-model-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic10-model-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-basic/xhtml-basic10-model-1.mod"
 
      Revisions:
      (none)
--- xhtml-basic10.cat	2006-07-06 01:29:09.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic10.cat	2001-05-10 17:41:58.000000000 +0900
@@ -3,7 +3,7 @@
 
 --  XHTML Basic Catalog Data File
 
-    Revision:  $Id: xhtml-basic10.cat,v 1.1 2006/07/05 16:29:09 matthieu Exp $ SMI
+    Revision:  xhtml-basic10.cat,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
     See "Entity Management", SGML Open Technical Resolution 9401 for detailed
     information on supplying and using catalog data. This document is available
--- xhtml-basic10.dtd	2005-04-21 00:56:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic10.dtd	2001-05-10 17:41:58.000000000 +0900
@@ -6,9 +6,9 @@
      This is XHTML Basic, a proper subset of XHTML.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2005 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research Consortium
-         for Informatics and Mathematics, Keio University).
+     Copyright 1998-2000 World Wide Web Consortium
+        (Massachusetts Institute of Technology, Institut National de
+         Recherche en Informatique et en Automatique, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML Basic DTD
@@ -21,7 +21,7 @@
 
         Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
                     Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-        Revision:   $Id: xhtml-basic10.dtd,v 2.13 2000/12/18 12:56:23 mimasa Exp $ SMI
+        Revision:   xhtml-basic10.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
 -->
 <!-- This is the driver file for version 1.0 of the XHTML Basic DTD.
@@ -49,8 +49,8 @@
 <!ENTITY % XLINK.xmlns.attrib "" >
 
 <!-- For example, if you are using XHTML Basic 1.0 directly, use
-     the public identifier in the DOCTYPE declaration, with the namespace
-     declaration on the document element to identify the default namespace:
+     the FPI in the DOCTYPE declaration, with the xmlns attribute
+     on the document element to identify the default namespace:
 
          <?xml version="1.0"?>
          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
--- xhtml-basic11-f.dtd	2007-07-13 23:58:56.000000000 +0900
+++ htdocs/sgml-lib/WD-xhtml-basic-20060705/xhtml-basic11-f.dtd	2007-03-16 13:00:58.000000000 +0900
@@ -21,7 +21,7 @@
 
         Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
                     Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-        Revision:   $Id: xhtml-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+        Revision:   $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
 -->
 <!-- This is the driver file for version 1.1 of the XHTML Basic DTD.
@@ -90,7 +90,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -136,7 +136,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -257,7 +257,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -353,7 +353,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -678,7 +678,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -820,7 +820,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -972,7 +972,7 @@
 
      This is XHTML Basic, a proper subset of XHTML.
      Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -1140,7 +1140,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -1708,7 +1708,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -1736,7 +1736,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -1805,7 +1805,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2015,7 +2015,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2079,7 +2079,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2250,7 +2250,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2309,7 +2309,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2453,7 +2453,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2527,7 +2527,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2582,7 +2582,7 @@
 
      This is XHTML, a reformulation of HTML as a modular XML application.
      Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Rovision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2640,7 +2640,7 @@
 
      This is XHTML Basic, a proper subset of XHTML.
      Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2815,7 +2815,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3114,7 +3114,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3181,7 +3181,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3236,7 +3236,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3297,7 +3297,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3353,7 +3353,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3421,7 +3421,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3468,7 +3468,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3527,7 +3527,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-basic11-model-1.mod	2007-07-13 23:37:51.000000000 +0900
+++ htdocs/sgml-lib/WD-xhtml-basic-20060705/xhtml-basic11-model-1.mod	2007-03-16 13:00:58.000000000 +0900
@@ -3,8 +3,8 @@
 <!-- file: xhtml-basic11-model-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2007 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic11-model-1.mod,v 1.2 2007/07/13 14:37:51 jigsaw Exp $ SMI
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-basic11-model-1.mod,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -53,9 +53,7 @@
       | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
       | %abbr.qname; | %acronym.qname; | %q.qname;" >
 
-<!ENTITY % InlPres.class
-     "| %tt.qname; | %i.qname; | %b.qname; | %big.qname;
-      | %small.qname; | %sub.qname; | %sup.qname;" >
+<!ENTITY % InlPres.class "" >
 
 <!ENTITY % I18n.class "" >
 
@@ -72,7 +70,6 @@
 <!ENTITY % Inline.class
      "%InlStruct.class;
       %InlPhras.class;
-      %InlPres.class;
       %Anchor.class;
       %InlSpecial.class;
       %InlForm.class;
@@ -82,7 +79,6 @@
 <!ENTITY % InlNoAnchor.class
      "%InlStruct.class;
       %InlPhras.class;
-      %InlPres.class;
       %InlSpecial.class;
       %InlForm.class;
       %Inline.extra;"
@@ -110,8 +106,6 @@
 
 <!ENTITY % Form.class  "| %form.qname;" >
 
-<!ENTITY % Fieldset.class  "| %fieldset.qname;" >
-
 <!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
 
 <!ENTITY % BlkPhras.class
@@ -122,8 +116,7 @@
 
 <!ENTITY % BlkSpecial.class
      "%Table.class;
-      %Form.class;
-      %Fieldset.class;"
+      %Form.class;"
 >
 
 <!ENTITY % Block.extra "" >
--- xhtml-basic11.cat	2007-07-13 23:37:17.000000000 +0900
+++ htdocs/sgml-lib/WD-xhtml-basic-20060705/xhtml-basic11.cat	2007-03-16 13:00:58.000000000 +0900
@@ -3,7 +3,7 @@
 
 --  XHTML Basic Catalog Data File
 
-    Revision:  $Id: xhtml-basic11.cat,v 1.2 2007/07/13 14:37:17 jigsaw Exp $ SMI
+    Revision:  $Id: xhtml-basic11.cat,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
     See "Entity Management", SGML Open Technical Resolution 9401 for detailed
     information on supplying and using catalog data. This document is available
--- xhtml-basic11.dtd	2007-07-13 23:37:19.000000000 +0900
+++ htdocs/sgml-lib/WD-xhtml-basic-20060705/xhtml-basic11.dtd	2007-03-16 13:00:58.000000000 +0900
@@ -1,12 +1,12 @@
 <!-- XHTML Basic 1.1 DTD  ...................................................... -->
-<!-- file: xhtml-basic11.dtd -->
+<!-- file: xhtml-basic10.dtd -->
 
 <!-- XHTML Basic 1.1 DTD
 
      This is XHTML Basic, a proper subset of XHTML.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2007 World Wide Web Consortium
+     Copyright 1998-2005 World Wide Web Consortium
         (Massachusetts Institute of Technology, European Research Consortium
          for Informatics and Mathematics, Keio University).
          All Rights Reserved.
@@ -21,8 +21,7 @@
 
         Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
                     Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-					Shane McCarron    <mailto:shane@aptest.com>
-        Revision:   $Id: xhtml-basic11.dtd,v 1.2 2007/07/13 14:37:19 jigsaw Exp $
+        Revision:   $Id: xhtml-basic11.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
 -->
 <!-- This is the driver file for version 1.1 of the XHTML Basic DTD.
@@ -30,7 +29,7 @@
      This DTD is identified by the PUBLIC and SYSTEM identifiers:
 
      PUBLIC: "-//W3C//DTD XHTML Basic 1.1//EN"
-     SYSTEM: "http://www.w3.org/MarkUp/DTD/xhtml-basic11.dtd"
+     SYSTEM: "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"
 -->
 <!ENTITY % XHTML.version  "-//W3C//DTD XHTML Basic 1.1//EN" >
 
@@ -55,7 +54,7 @@
 
          <?xml version="1.0"?>
          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN"
-             "http://www.w3.org/MarkUp/DTD/xhtml-basic11.dtd" >
+             "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd" >
          <html xmlns="http://www.w3.org/1999/xhtml"
                xml:lang="en" >
          ...
@@ -78,15 +77,6 @@
 <!ENTITY % xhtml-events.module   "INCLUDE" >
 <!ENTITY % xhtml-bdo.module      "%XHTML.bidi;" >
 
-<!-- Inline Style Module  ........................................ -->
-<!ENTITY % xhtml-inlstyle.module "INCLUDE" >
-<![%xhtml-inlstyle.module;[
-<!ENTITY % xhtml-inlstyle.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod" >
-%xhtml-inlstyle.mod;]]>
-
-
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML Basic 1.1 Document Model 1.0//EN"
             "http://www.w3.org/MarkUp/DTD/xhtml-basic11-model-1.mod" >
@@ -166,14 +156,6 @@
             "http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod" >
 %xhtml-form.mod;]]>
 
-<!-- Presentation Module  ........................................ -->
-<!ENTITY % xhtml-pres.module "INCLUDE" >
-<![%xhtml-pres.module;[
-<!ENTITY % xhtml-pres.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod" >
-%xhtml-pres.mod;]]>
-
 <!-- Link Element Module  ........................................ -->
 <!ENTITY % xhtml-link.module "INCLUDE" >
 <![%xhtml-link.module;[
--- xhtml-blkphras-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-blkphras-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-blkphras-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-blkphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-blkphras-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkphras-1.mod"
 
      Revisions:
      (none)
@@ -58,7 +58,7 @@
 <!ENTITY % pre.element  "INCLUDE" >
 <![%pre.element;[
 <!ENTITY % pre.content
-     "( #PCDATA
+     "( #PCDATA 
       | %InlStruct.class;
       %InlPhras.class;
       | %tt.qname; | %i.qname; | %b.qname;
@@ -75,6 +75,7 @@
 <![%pre.attlist;[
 <!ATTLIST %pre.qname;
       %Common.attrib;
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of pre.attlist -->]]>
 
--- xhtml-blkpres-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-blkpres-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-blkpres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Revision: $Id: xhtml-blkpres-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-blkstruct-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-blkstruct-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-blkstruct-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-blkstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-blkstruct-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkstruct-1.mod"
 
      Revisions:
      (none)
@@ -34,10 +34,10 @@
 
 <!ENTITY % div.attlist  "INCLUDE" >
 <![%div.attlist;[
+<!-- end of div.attlist -->]]>
 <!ATTLIST %div.qname;
       %Common.attrib;
 >
-<!-- end of div.attlist -->]]>
 
 <!ENTITY % p.element  "INCLUDE" >
 <![%p.element;[
--- xhtml-charent-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-charent-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-charent-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-charent-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-charent-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-charent-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-charent-1.mod"
 
      Revisions:
      (none)
@@ -24,16 +24,15 @@
 <!ENTITY % xhtml-lat1
     PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
            "xhtml-lat1.ent" >
-%xhtml-lat1;
-
 <!ENTITY % xhtml-symbol
     PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
            "xhtml-symbol.ent" >
-%xhtml-symbol;
-
 <!ENTITY % xhtml-special
     PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
            "xhtml-special.ent" >
+
+%xhtml-lat1;
+%xhtml-symbol;
 %xhtml-special;
 
 <!-- end of xhtml-charent-1.mod -->
--- xhtml-datatypes-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-datatypes-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-datatypes-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-datatypes-1.mod,v 4.1 2001/04/06 19:23:32 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-datatypes-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-datatypes-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-datatypes-1.mod"
 
      Revisions:
      (none)
@@ -58,9 +58,6 @@
 <!-- a space separated list of character encodings, as per [RFC2045] -->
 <!ENTITY % Charsets.datatype "CDATA" >
 
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
 <!-- media type, as per [RFC2045] -->
 <!ENTITY % ContentType.datatype "CDATA" >
 
@@ -73,8 +70,8 @@
 <!-- formal public identifier, as per [ISO8879] -->
 <!ENTITY % FPI.datatype "CDATA" >
 
-<!-- a language code, as per [RFC3066] or its successor -->
-<!ENTITY % LanguageCode.datatype "CDATA" >
+<!-- a language code, as per [RFC1766] -->
+<!ENTITY % LanguageCode.datatype "NMTOKEN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
 <!ENTITY % URI.datatype "CDATA" >
--- xhtml-framework-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-framework-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-framework-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-framework-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-framework-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-framework-1.mod"
 
      Revisions:
      (none)
@@ -32,7 +32,7 @@
      prior to Attributes but after Datatypes.
 -->
 
-<!ENTITY % xhtml-arch.module "IGNORE" >
+<!ENTITY % xhtml-arch.module "INCLUDE" >
 <![%xhtml-arch.module;[
 <!ENTITY % xhtml-arch.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
--- xhtml-hypertext-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-hypertext-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-hypertext-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-hypertext-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-hypertext-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-hypertext-1.mod"
 
      Revisions:
      (none)
@@ -21,7 +21,7 @@
 
      This module declares the anchor ('a') element type, which
      defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute
+     (or link 'target') is identified via its 'id' attribute 
      rather than the 'name' attribute as was used in HTML.
 -->
 
--- xhtml-image-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-image-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-image-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-image-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Rovision: xhtml-image-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-image-1.mod"
 
      Revisions:
      (none)
--- xhtml-inlphras-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-inlphras-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-inlphras-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-inlphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-inlphras-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlphras-1.mod"
 
      Revisions:
      (none)
--- xhtml-inlpres-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-inlpres-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-inlpres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Revision: $Id: xhtml-inlpres-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-inlstruct-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-inlstruct-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-inlstruct-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-inlstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-inlstruct-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlstruct-1.mod"
 
      Revisions:
      (none)
@@ -19,7 +19,7 @@
 
         br, span
 
-     This module declares the elements and their attributes
+     This module declares the elements and their attributes 
      used to support inline-level structural markup.
 -->
 
--- xhtml-inlstyle-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-inlstyle-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-inlstyle-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+     Revision: $Id: xhtml-inlstyle-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-link-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-link-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-link-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-link-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-link-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-link-1.mod"
 
      Revisions:
      (none)
@@ -27,7 +27,7 @@
         previous, next, index, end, help
      b) to link to a separate style sheet (rel="stylesheet")
      c) to make a link to a script (rel="script")
-     d) by style sheets to control how collections of html nodes are
+     d) by stylesheets to control how collections of html nodes are
         rendered into printed documents
      e) to make a link to a printable version of this document
         e.g. a postscript or pdf version (rel="alternate" media="print")
--- xhtml-list-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-list-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-list-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-list-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-list-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-list-1.mod"
 
      Revisions:
      (none)
--- xhtml-meta-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-meta-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-meta-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-meta-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-meta-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-meta-1.mod"
 
      Revisions:
      (none)
--- xhtml-notations-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-notations-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-notations-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-notations-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-notations-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-notations-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-notations-1.mod"
 
      Revisions:
      (none)
@@ -17,7 +17,7 @@
 
 <!-- Notations
 
-     defines the following notations, many of these imported from
+     defines the following notations, many of these imported from 
      other specifications and standards. When an existing FPI is
      known, it is incorporated here.
 -->
@@ -26,11 +26,11 @@
 <!-- SGML and XML Notations ............................ -->
 
 <!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
+<!NOTATION w3c-xml 
      PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
 
 <!-- XML 1.0 CDATA -->
-<!NOTATION cdata
+<!NOTATION cdata 
      PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
 
 <!-- SGML Formal Public Identifiers -->
@@ -42,73 +42,73 @@
 <!-- Length defined for cellpadding/cellspacing -->
 
 <!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
+<!NOTATION length 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
 
 <!-- space-separated list of link types -->
-<!NOTATION linkTypes
+<!NOTATION linkTypes 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
 
 <!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
+<!NOTATION mediaDesc 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
 
 <!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
+<!NOTATION multiLength 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
 
 <!-- one or more digits (NUMBER) -->
-<!NOTATION number
+<!NOTATION number 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
 
 <!-- integer representing length in pixels -->
-<!NOTATION pixels
+<!NOTATION pixels 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
 
 <!-- script expression -->
-<!NOTATION script
+<!NOTATION script 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
 
 <!-- textual content -->
-<!NOTATION text
+<!NOTATION text 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
 
 <!-- Imported Notations ................................ -->
 
 <!-- a single character from [ISO10646] -->
-<!NOTATION character
+<!NOTATION character 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
 
 <!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
+<!NOTATION charset 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
 
 <!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
+<!NOTATION charsets 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
 
 <!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
+<!NOTATION contentType 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
 
 <!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
+<!NOTATION contentTypes 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
 
 <!-- date and time information. ISO date format -->
-<!NOTATION datetime
+<!NOTATION datetime 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
 
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
+<!-- a language code, as per [RFC1766] -->
+<!NOTATION languageCode 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
+<!NOTATION uri 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
 
 <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
+<!NOTATION uris 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
 
 <!-- end of xhtml-notations-1.mod -->
--- xhtml-object-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-object-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-object-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-object-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-object-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-object-1.mod"
 
      Revisions:
      (none)
@@ -19,12 +19,13 @@
 
         object
 
-     This module declares the object element type and its attributes, used
-     to embed external objects as part of XHTML pages. In the document,
-     place param elements prior to other content within the object element.
+     This module declares the object element type and its attributes,
+     used to embed external objects as part of XHTML pages. In the
+     document, place param elements prior to the object elements 
+     that require their content.
 
-     Note that use of this module requires instantiation of the Param
-     Element Module.
+     Note that use of this module requires instantiation of the 
+     Param Element Module prior to this module.
 -->
 
 <!-- object: Generic Embedded Object ................... -->
--- xhtml-param-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-param-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-param-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-param-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-param-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-param-1.mod"
 
      Revisions:
      (none)
@@ -19,9 +19,9 @@
 
         param
 
-     This module provides declarations for the param element,
+     This module provides declarations for the param element, 
      used to provide named property values for the applet
-     and object elements.
+     and object elements. 
 -->
 
 <!-- param: Named Property Value ....................... -->
@@ -36,7 +36,7 @@
 <!ENTITY % param.attlist  "INCLUDE" >
 <![%param.attlist;[
 <!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %id.attrib;
       name         CDATA                    #REQUIRED
       value        CDATA                    #IMPLIED
--- xhtml-pres-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-pres-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-pres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Revision: $Id: xhtml-pres-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-print10-model-1.mod	2004-01-21 01:58:36.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10-model-1.mod	2006-10-10 16:19:39.000000000 +0900
@@ -4,7 +4,7 @@
 
      This is XHTML-Print 1.0, a variant of XHTML Basic for printing.
      Copyright 1998-2003 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-print10-model-1.mod,v 1.7 2003/10/24 22:14:40 fujisawa Exp $
+     Revision: $Id: xhtml-print10-model-1.mod,v 1.1 2006/09/25 14:44:04 jean-gui Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-print10.dtd	2004-01-21 01:58:36.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10.dtd	2006-10-10 16:19:39.000000000 +0900
@@ -24,7 +24,7 @@
         Editors: Jim Bigelow <jim.bigelow@hp.com>, 
                  Shane McCarron <shane@aptest.com>,
                  Masayasu Ishikawa <mimasa@w3.org>
-        Revision: $Id: xhtml-print10.dtd,v 1.5 2003/10/24 14:24:40 fujisawa Exp $
+        Revision: $Id: xhtml-print10.dtd,v 1.1 2006/09/25 14:44:04 jean-gui Exp $
 
 -->
 <!-- This is the driver file for version 1.0 of the XHTML-Print DTD.
--- xhtml-qname-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-qname-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,16 +3,16 @@
 <!-- file: xhtml-qname-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-qname-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-qname-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-qname-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-qname-1.mod"
 
      Revisions:
-#2000-10-22: added qname declarations for ruby elements
+     (none)
      ....................................................................... -->
 
 <!-- XHTML Qname (Qualified Name) Module
@@ -20,9 +20,9 @@
      This module is contained in two parts, labeled Section 'A' and 'B':
 
        Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing
+       qualified names, namespace declarations, and name prefixing 
        for XHTML and extensions.
-
+    
        Section B declares parameter entities used to provide
        namespace-qualified names for all XHTML element types:
 
@@ -30,49 +30,40 @@
          %base.qname;     the xmlns-qualified name for <base>
          ...
 
-     XHTML extensions would create a module similar to this one.
-     Included in the XHTML distribution is a template module
+     XHTML extensions would create a module similar to this one. 
+     Included in the XHTML distribution is a template module 
      ('template-qname-1.mod') suitable for this purpose.
 -->
 
 <!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
 
 <!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should
-        inherit '%NS.prefixed;' from the DTD driver, so that unless
-        overridden, the default behaviour follows the overall DTD
+        to activate namespace prefixing. The default value should 
+        inherit '%NS.prefixed;' from the DTD driver, so that unless 
+        overridden, the default behaviour follows the overall DTD 
         prefixing scheme.
 -->
 <!ENTITY % NS.prefixed "IGNORE" >
 <!ENTITY % XHTML.prefixed "%NS.prefixed;" >
 
-<!-- By default, we always permit XHTML attribute collections to have
-     namespace-qualified prefixes as well.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
-<!-- By default, we allow the XML Schema attributes on the root
-     element.
--->
-<!ENTITY % XHTML.xsi.attrs "INCLUDE" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
+<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing 
         the URI reference used to identify the XHTML namespace:
 -->
 <!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
 
 <!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing
+        the default namespace prefix string(s) to use when prefixing 
         is enabled. This may be overridden in the DTD driver or the
         internal subset of an document instance. If no default prefix
         is desired, this may be declared as an empty string.
 
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves
+     NOTE: As specified in [XMLNAMES], the namespace prefix serves 
      as a proxy for the URI reference, and is not in itself significant.
 -->
-<!ENTITY % XHTML.prefix  "xhtml" >
+<!ENTITY % XHTML.prefix  "" >
 
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
+<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the 
+        colonized prefix(es) (eg., '%XHTML.prefix;:') used when 
         prefixing is active, an empty string when it is not.
 -->
 <![%XHTML.prefixed;[
@@ -85,9 +76,9 @@
 %xhtml-qname-extra.mod;
 
 <!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration
-        attributes for namespaces embedded in XHTML. The default
-        is an empty string.  XLink should be included here if used
+        redeclared to contain any non-XHTML namespace declaration 
+        attributes for namespaces embedded in XHTML. The default 
+        is an empty string.  XLink should be included here if used 
         in the DTD.
 -->
 <!ENTITY % XHTML.xmlns.extra.attrib "" >
@@ -96,15 +87,12 @@
 
 <!-- Declare a parameter entity %NS.decl.attrib; containing
      all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether
-     prefixing is active.
+     xmlns declaration for XHTML, its form dependent on whether 
+     prefixing is active. 
 -->
-<!ENTITY % XHTML.xmlns.attrib.prefixed
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'"
->
 <![%XHTML.prefixed;[
 <!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.attrib.prefixed;
+     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
       %XHTML.xmlns.extra.attrib;"
 >
 ]]>
@@ -112,58 +100,22 @@
      "%XHTML.xmlns.extra.attrib;"
 >
 
-<!-- Declare a parameter entity %XSI.prefix as a prefix to use for XML
-     Schema Instance attributes.
--->
-<!ENTITY % XSI.prefix "xsi" >
-
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!-- Declare a parameter entity %XSI.xmlns.attrib as support for the
-     schemaLocation attribute, since this is legal throughout the DTD.
--->
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;   #FIXED '%XSI.xmlns;'" >
-
 <!-- This is a placeholder for future XLink support.
 -->
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- This is the attribute for the XML Schema namespace - XHTML
-     Modularization is also expressed in XML Schema, and it needs to
-	 be legal to declare the XML Schema namespace and the
-	 schemaLocation attribute on the root element of XHTML family
-	 documents.
--->
-<![%XHTML.xsi.attrs;[
-<!ENTITY % XSI.prefix "xsi" >
-<!ENTITY % XSI.pfx "%XSI.prefix;:" >
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;    #FIXED '%XSI.xmlns;'"
->
-]]>
-<!ENTITY % XSI.prefix "" >
-<!ENTITY % XSI.pfx "" >
-<!ENTITY % XSI.xmlns.attrib "" >
-
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
+<!-- Declare a parameter entity %NS.decl.attrib; containing all 
      XML namespace declaration attributes used by XHTML, including
      a default xmlns attribute when prefixing is inactive.
 -->
 <![%XHTML.prefixed;[
 <!ENTITY % XHTML.xmlns.attrib
      "%NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 ]]>
 <!ENTITY % XHTML.xmlns.attrib
      "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 
@@ -301,14 +253,6 @@
 <!ENTITY % th.qname      "%XHTML.pfx;th" >
 <!ENTITY % td.qname      "%XHTML.pfx;td" >
 
-<!-- module:  xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
 
 <!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
 
--- xhtml-script-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-script-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-script-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Revision: $Id: xhtml-script-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-struct-1.mod	2005-04-13 21:49:34.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-struct-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-struct-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-struct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-struct-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-struct-1.mod"
 
      Revisions:
      (none)
@@ -19,13 +19,13 @@
 
         title, head, body, html
 
-     The Structure Module defines the major structural elements and
+     The Structure Module defines the major structural elements and 
      their attributes.
 
-     Note that the content model of the head element type is redeclared
+     Note that the content model of the head element type is redeclared 
      when the Base Module is included in the DTD.
 
-     The parameter entity containing the XML namespace URI value used
+     The parameter entity containing the XML namespace URI value used 
      for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
 -->
 
@@ -46,7 +46,7 @@
 <!ENTITY % title.attlist  "INCLUDE" >
 <![%title.attlist;[
 <!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %I18n.attrib;
 >
 <!-- end of title.attlist -->]]>
@@ -71,7 +71,7 @@
 >
 
 <!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %I18n.attrib;
       %profile.attrib;
 >
@@ -104,14 +104,6 @@
 <!ELEMENT %html.qname;  %html.content; >
 <!-- end of html.element -->]]>
 
-<![%XHTML.xsi.attrs;[
-<!-- define a parameter for the XSI schemaLocation attribute -->
-<!ENTITY % XSI.schemaLocation.attrib
-     "%XSI.pfx;schemaLocation  %URIs.datatype;    #IMPLIED"
->
-]]>
-<!ENTITY % XSI.schemaLocation.attrib "">
-
 <!ENTITY % html.attlist  "INCLUDE" >
 <![%html.attlist;[
 <!-- version attribute value defined in driver
@@ -119,18 +111,12 @@
 <!ENTITY % XHTML.version.attrib
      "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
 >
-<!-- schemaLocation attribute from XML Schema
--->
-<!ENTITY % XSI.schemaLocation.attrib
-     "schemaLocation   %URIs.datatype;      #IMPLIED"
->
 
-<!-- see the Qualified Names module for information
-     on how to extend XHTML using XML namespaces
+<!-- see the Qualified Names module for information 
+     on how to extend XHTML using XML namespaces 
 -->
 <!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib;
-      %XSI.schemaLocation.attrib;
+      %XHTML.xmlns.attrib; 
       %XHTML.version.attrib;
       %I18n.attrib;
 >
--- xhtml-style-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-style-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-style-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Revision: $Id: xhtml-style-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-text-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-text-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-text-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-text-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-text-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-text-1.mod"
 
      Revisions:
      (none)
@@ -17,7 +17,7 @@
 
 <!-- Textual Content
 
-     The Text module includes declarations for all core
+     The Text module includes declarations for all core 
      text container elements and their attributes.
 -->
 
--- xhtml1-frameset.dtd	2003-05-08 02:48:53.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-frameset.dtd	2002-08-20 10:51:30.000000000 +0900
@@ -16,8 +16,8 @@
    PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
 
-   $Revision: 1.26 $
-   $Date: 2002/08/01 18:16:48 $
+   $Revision: 1.1.2.1 $
+   $Date: 2002/08/19 02:07:44 $
 
 -->
 
--- xhtml1-strict.dtd	2003-05-08 02:48:53.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-strict.dtd	2002-08-20 10:51:30.000000000 +0900
@@ -16,8 +16,8 @@
    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
 
-   $Revision: 1.24 $
-   $Date: 2002/07/31 19:34:51 $
+   $Revision: 1.1.2.1 $
+   $Date: 2002/08/19 02:07:44 $
 
 -->
 
--- xhtml1-transitional.dtd	2003-05-08 02:48:53.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-transitional.dtd	2002-08-20 10:51:30.000000000 +0900
@@ -16,8 +16,8 @@
    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
 
-   $Revision: 1.27 $
-   $Date: 2002/08/01 18:16:48 $
+   $Revision: 1.1.2.1 $
+   $Date: 2002/08/19 02:07:44 $
 
 -->
 
--- xhtml11-flat.dtd	2007-11-15 23:31:04.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml11-20010531/xhtml11-flat.dtd	2001-06-06 17:31:47.000000000 +0900
@@ -8,9 +8,9 @@
      This is XHTML, a reformulation of HTML as a modular XML application.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2005 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research Consortium
-         for Informatics and Mathematics, Keio University).
+     Copyright 1998-2000 World Wide Web Consortium
+        (Massachusetts Institute of Technology, Institut National de
+         Recherche en Informatique et en Automatique, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML DTD and its 
@@ -22,12 +22,12 @@
      It is provided "as is" without expressed or implied warranty.
 
         Author:     Murray M. Altheim <altheim@eng.sun.com>
-        Revision:   $Id: xhtml11.dtd,v 1.24 2005/04/13 12:25:40 mimasa Exp $
+        Revision:   $Id: xhtml11.dtd,v 1.20 2001/04/05 14:20:51 ahby Exp $
 
 -->
 <!-- This is the driver file for version 1.1 of the XHTML DTD.
 
-     Please use this public identifier to identify it:
+     Please use this formal public identifier to identify it:
 
          "-//W3C//DTD XHTML 1.1//EN"
 -->
@@ -39,33 +39,21 @@
 
      See the Qualified Names module for information
      on the use of namespace prefixes in the DTD.
-
-	 Note that XHTML namespace elements are not prefixed by default,
-	 but the XHTML namespace prefix is defined as "xhtml" so that
-	 other markup languages can extend this one and use the XHTML
-	 prefixed global attributes if required.
-
 -->
 <!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "xhtml" >
-
-<!-- Be sure to include prefixed global attributes - we don't need
-     them, but languages that extend XHTML 1.1 might.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
+<!ENTITY % XHTML.prefix "" >
 
 <!-- Reserved for use with the XLink namespace:
 -->
 <!ENTITY % XLINK.xmlns "" >
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- For example, if you are using XHTML 1.1 directly, use the public
-     identifier in the DOCTYPE declaration, with the namespace declaration
-     on the document element to identify the default namespace:
+<!-- For example, if you are using XHTML 1.1 directly, use the FPI
+     in the DOCTYPE declaration, with the xmlns attribute on the
+     document element to identify the default namespace:
 
        <?xml version="1.0"?>
-       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-                             "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
        <html xmlns="http://www.w3.org/1999/xhtml"
              xml:lang="en">
        ...
@@ -78,9 +66,6 @@
 <!-- reserved for future use with document profiles -->
 <!ENTITY % XHTML.profile  "" >
 
-<!-- ensure XHTML Notations are disabled -->
-<!ENTITY % xhtml-notations.module "IGNORE" >
-
 <!-- Bidirectional Text features
      This feature-test entity is used to declare elements
      and attributes used for bidirectional text support.
@@ -107,19 +92,19 @@
 <![%xhtml-inlstyle.module;[
 <!ENTITY % xhtml-inlstyle.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Inline Style Module  ........................................... -->
 <!-- file: xhtml-inlstyle-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-inlstyle-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"
 
      Revisions:
      (none)
@@ -148,26 +133,26 @@
 -->
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod" >
+            "xhtml11-model-1.mod" >
 
 <!-- Modular Framework Module (required) ......................... -->
 <!ENTITY % xhtml-framework.module "INCLUDE" >
 <![%xhtml-framework.module;[
 <!ENTITY % xhtml-framework.mod
      PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Modular Framework Module  ...................................... -->
 <!-- file: xhtml-framework-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-framework-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod"
 
      Revisions:
      (none)
@@ -202,7 +187,121 @@
 <!ENTITY % xhtml-notations.mod
      PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
             "xhtml-notations-1.mod" >
-%xhtml-notations.mod;]]>
+<!-- ...................................................................... -->
+<!-- XHTML Notations Module  .............................................. -->
+<!-- file: xhtml-notations-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-notations-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Notations
+
+     defines the following notations, many of these imported from
+     other specifications and standards. When an existing FPI is
+     known, it is incorporated here.
+-->
+
+<!-- XML Notations ..................................... -->
+<!-- SGML and XML Notations ............................ -->
+
+<!-- W3C XML 1.0 Recommendation -->
+<!NOTATION w3c-xml
+     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
+
+<!-- XML 1.0 CDATA -->
+<!NOTATION cdata
+     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
+
+<!-- SGML Formal Public Identifiers -->
+<!NOTATION fpi
+     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
+
+<!-- XHTML Notations ................................... -->
+
+<!-- Length defined for cellpadding/cellspacing -->
+
+<!-- nn for pixels or nn% for percentage length -->
+<!NOTATION length
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
+
+<!-- space-separated list of link types -->
+<!NOTATION linkTypes
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
+
+<!-- single or comma-separated list of media descriptors -->
+<!NOTATION mediaDesc
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
+
+<!-- pixel, percentage, or relative -->
+<!NOTATION multiLength
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
+
+<!-- one or more digits (NUMBER) -->
+<!NOTATION number
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
+
+<!-- integer representing length in pixels -->
+<!NOTATION pixels
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
+
+<!-- script expression -->
+<!NOTATION script
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
+
+<!-- textual content -->
+<!NOTATION text
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
+
+<!-- Imported Notations ................................ -->
+
+<!-- a single character from [ISO10646] -->
+<!NOTATION character
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
+
+<!-- a character encoding, as per [RFC2045] -->
+<!NOTATION charset
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
+
+<!-- a space separated list of character encodings, as per [RFC2045] -->
+<!NOTATION charsets
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
+
+<!-- media type, as per [RFC2045] -->
+<!NOTATION contentType
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
+
+<!-- comma-separated list of media types, as per [RFC2045] -->
+<!NOTATION contentTypes
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
+
+<!-- date and time information. ISO date format -->
+<!NOTATION datetime
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
+
+<!-- a language code, as per [RFC3066] -->
+<!NOTATION languageCode
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
+
+<!-- a Uniform Resource Identifier, see [URI] -->
+<!NOTATION uri
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
+
+<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
+<!NOTATION uris
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
+
+<!-- end of xhtml-notations-1.mod -->
+]]>
 
 <!ENTITY % xhtml-datatypes.module "INCLUDE" >
 <![%xhtml-datatypes.module;[
@@ -214,13 +313,13 @@
 <!-- file: xhtml-datatypes-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-datatypes-1.mod,v 4.1 2001/04/06 19:23:32 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-datatypes-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-datatypes-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
 
      Revisions:
      (none)
@@ -269,9 +368,6 @@
 <!-- a space separated list of character encodings, as per [RFC2045] -->
 <!ENTITY % Charsets.datatype "CDATA" >
 
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
 <!-- media type, as per [RFC2045] -->
 <!ENTITY % ContentType.datatype "CDATA" >
 
@@ -284,8 +380,8 @@
 <!-- formal public identifier, as per [ISO8879] -->
 <!ENTITY % FPI.datatype "CDATA" >
 
-<!-- a language code, as per [RFC3066] or its successor -->
-<!ENTITY % LanguageCode.datatype "CDATA" >
+<!-- a language code, as per [RFC3066] -->
+<!ENTITY % LanguageCode.datatype "NMTOKEN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
 <!ENTITY % URI.datatype "CDATA" >
@@ -310,13 +406,13 @@
 <!-- file: xhtml-qname-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-qname-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-qname-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod"
 
      Revisions:
 #2000-10-22: added qname declarations for ruby elements
@@ -353,15 +449,6 @@
 <!ENTITY % NS.prefixed "IGNORE" >
 <!ENTITY % XHTML.prefixed "%NS.prefixed;" >
 
-<!-- By default, we always permit XHTML attribute collections to have
-     namespace-qualified prefixes as well.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
-<!-- By default, we allow the XML Schema attributes on the root
-     element.
--->
-<!ENTITY % XHTML.xsi.attrs "INCLUDE" >
-
 <!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
         the URI reference used to identify the XHTML namespace:
 -->
@@ -376,7 +463,7 @@
      NOTE: As specified in [XMLNAMES], the namespace prefix serves
      as a proxy for the URI reference, and is not in itself significant.
 -->
-<!ENTITY % XHTML.prefix  "xhtml" >
+<!ENTITY % XHTML.prefix  "" >
 
 <!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
         colonized prefix(es) (eg., '%XHTML.prefix;:') used when
@@ -406,12 +493,9 @@
      xmlns declaration for XHTML, its form dependent on whether
      prefixing is active.
 -->
-<!ENTITY % XHTML.xmlns.attrib.prefixed
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'"
->
 <![%XHTML.prefixed;[
 <!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.attrib.prefixed;
+     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
       %XHTML.xmlns.extra.attrib;"
 >
 ]]>
@@ -419,43 +503,10 @@
      "%XHTML.xmlns.extra.attrib;"
 >
 
-<!-- Declare a parameter entity %XSI.prefix as a prefix to use for XML
-     Schema Instance attributes.
--->
-<!ENTITY % XSI.prefix "xsi" >
-
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!-- Declare a parameter entity %XSI.xmlns.attrib as support for the
-     schemaLocation attribute, since this is legal throughout the DTD.
--->
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;   #FIXED '%XSI.xmlns;'" >
-
 <!-- This is a placeholder for future XLink support.
 -->
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- This is the attribute for the XML Schema namespace - XHTML
-     Modularization is also expressed in XML Schema, and it needs to
-	 be legal to declare the XML Schema namespace and the
-	 schemaLocation attribute on the root element of XHTML family
-	 documents.
--->
-<![%XHTML.xsi.attrs;[
-<!ENTITY % XSI.prefix "xsi" >
-<!ENTITY % XSI.pfx "%XSI.prefix;:" >
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;    #FIXED '%XSI.xmlns;'"
->
-]]>
-<!ENTITY % XSI.prefix "" >
-<!ENTITY % XSI.pfx "" >
-<!ENTITY % XSI.xmlns.attrib "" >
-
-
 <!-- Declare a parameter entity %NS.decl.attrib; containing all
      XML namespace declaration attributes used by XHTML, including
      a default xmlns attribute when prefixing is inactive.
@@ -463,14 +514,11 @@
 <![%XHTML.prefixed;[
 <!ENTITY % XHTML.xmlns.attrib
      "%NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 ]]>
 <!ENTITY % XHTML.xmlns.attrib
      "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 
@@ -635,13 +683,13 @@
 <!-- file: xhtml-events-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-events-1.mod,v 4.1 2001/04/10 09:42:30 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-events-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-events-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod"
 
      Revisions:
      (none)
@@ -649,7 +697,7 @@
 
 <!-- Intrinsic Event Attributes
 
-     These are the event attributes defined in HTML 4,
+     These are the event attributes defined in HTML 4.0,
      Section 18.2.3 "Intrinsic Events". This module must be
      instantiated prior to the Attributes Module but after
      the Datatype Module in the Modular Framework module.
@@ -681,21 +729,6 @@
       onkeyup      %Script.datatype;        #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.events.attrib
-     "%XHTML.prefix;:onclick      %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:ondblclick   %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmousedown  %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmouseup    %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmouseover  %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmousemove  %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmouseout   %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onkeypress   %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onkeydown    %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onkeyup      %Script.datatype;        #IMPLIED"
->
-]]>
-
 <!-- additional attributes on anchor element
 -->
 <!ATTLIST %a.qname;
@@ -777,13 +810,13 @@
 <!-- file: xhtml-attribs-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-attribs-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-attribs-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
 
      Revisions:
      (none)
@@ -793,46 +826,20 @@
 
      This module declares many of the common attributes for the XHTML DTD.
      %NS.decl.attrib; is declared in the XHTML Qname module.
-
-	 Note that this file was extended in XHTML Modularization Second Edition to 
-	 include declarations of "global" versions of the attribute collections.
-	 The global versions of the attributes are for use on elements in other 
-	 namespaces.  The global version of "common" includes the xmlns declaration
-	 for the prefixed version of the xhtml namespace.  If you are only using a
-	 specific attribute or an individual attribute collection, you must also
-	 include the XHTML.xmlns.attrib.prefixed PE on your elements.
 -->
 
 <!ENTITY % id.attrib
      "id           ID                       #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.id.attrib
-     "%XHTML.prefix;:id           ID        #IMPLIED"
->
-]]>
-
 <!ENTITY % class.attrib
      "class        NMTOKENS                 #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.class.attrib
-     "%XHTML.prefix;:class        NMTOKENS                 #IMPLIED"
->
-]]>
-
 <!ENTITY % title.attrib
      "title        %Text.datatype;          #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.title.attrib
-     "%XHTML.prefix;:title        %Text.datatype;          #IMPLIED"
->
-]]>
-
 <!ENTITY % Core.extra.attrib "" >
 
 <!ENTITY % Core.attrib
@@ -840,25 +847,9 @@
       %id.attrib;
       %class.attrib;
       %title.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
       %Core.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.core.extra.attrib "" >
-
-<![%XHTML.global.attrs.prefixed;[
-
-<!ENTITY % XHTML.global.core.attrib
-     "%XHTML.global.id.attrib;
-      %XHTML.global.class.attrib;
-      %XHTML.global.title.attrib;
-      %XHTML.global.core.extra.attrib;"
->
-]]>
-
-<!ENTITY % XHTML.global.core.attrib "" >
-
-
 <!ENTITY % lang.attrib
      "xml:lang     %LanguageCode.datatype;  #IMPLIED"
 >
@@ -873,31 +864,17 @@
       %lang.attrib;"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY XHTML.global.i18n.attrib
-     "%XHTML.prefix;:dir          ( ltr | rtl )            #IMPLIED
-      %lang.attrib;"
->
-]]>
-<!ENTITY XHTML.global.i18n.attrib "" >
-
 ]]>
 <!ENTITY % I18n.attrib
      "%lang.attrib;"
 >
-<!ENTITY % XHTML.global.i18n.attrib
-     "%lang.attrib;"
->
 
 <!ENTITY % Common.extra.attrib "" >
-<!ENTITY % XHTML.global.common.extra.attrib "" >
 
 <!-- intrinsic event attributes declared previously
 -->
 <!ENTITY % Events.attrib "" >
 
-<!ENTITY % XHTML.global.events.attrib "" >
-
 <!ENTITY % Common.attrib
      "%Core.attrib;
       %I18n.attrib;
@@ -905,14 +882,6 @@
       %Common.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.common.attrib
-     "%XHTML.xmlns.attrib.prefixed;
-      %XHTML.global.core.attrib;
-	  %XHTML.global.i18n.attrib;
-	  %XHTML.global.events.attrib;
-	  %XHTML.global.common.extra.attrib;"
->
-
 <!-- end of xhtml-attribs-1.mod -->
 ]]>
 
@@ -929,13 +898,13 @@
 <!-- file: xhtml11-model-1.mod
 
      This is XHTML 1.1, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-model-1.mod,v 1.14 2005/04/13 12:25:16 mimasa Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml11-model-1.mod,v 1.12 2000/11/18 18:20:25 ahby Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml11/DTD/xhtml11-model-1.mod"
 
      Revisions:
      (none)
@@ -1186,13 +1155,13 @@
 <!-- file: xhtml-charent-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-charent-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-charent-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
 
      Revisions:
      (none)
@@ -1235,7 +1204,7 @@
 <!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
 <!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
                                   = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
+<!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
                                   U+00AC ISOnum -->
 <!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
                                   U+00AD ISOnum -->
@@ -1399,7 +1368,7 @@
                                   U+00FC ISOlat1 -->
 <!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
                                   U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn,
+<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
                                   U+00FE ISOlat1 -->
 <!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
                                   U+00FF ISOlat1 -->
@@ -1408,7 +1377,7 @@
 <!ENTITY % xhtml-symbol
     PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
            "xhtml-symbol.ent" >
-<!-- Mathematical, Greek and Symbolic characters for XHTML -->
+<!-- Mathematical, Greek and Symbolic characters for HTML -->
 
 <!-- Character entity set. Typical invocation:
      <!ENTITY % HTMLsymbol PUBLIC
@@ -1432,7 +1401,7 @@
 -->
 
 <!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small letter f with hook = function
+<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
                                     = florin, U+0192 ISOtech -->
 
 <!-- Greek -->
@@ -1449,7 +1418,7 @@
                                     U+0398 ISOgrk3 -->
 <!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
 <!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lamda,
+<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
                                     U+039B ISOgrk3 -->
 <!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
 <!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
@@ -1487,7 +1456,7 @@
 <!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
 <!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
                                     U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lamda,
+<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
                                     U+03BB ISOgrk3 -->
 <!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
 <!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
@@ -1507,7 +1476,7 @@
 <!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
 <!ENTITY omega    "&#969;"> <!-- greek small letter omega,
                                     U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek theta symbol,
+<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
                                     U+03D1 NEW -->
 <!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
                                     U+03D2 NEW -->
@@ -1529,9 +1498,9 @@
 <!-- Letterlike Symbols -->
 <!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
                                      = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- black-letter capital I = imaginary part,
+<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
                                      U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- black-letter capital R = real part symbol,
+<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
                                      U+211C ISOamso -->
 <!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
 <!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
@@ -1549,14 +1518,14 @@
                                      = carriage return, U+21B5 NEW -->
 <!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
 <!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So lArr can
+    but also does not have any other character for that function. So ? lArr can
     be used for 'is implied by' as ISOtech suggests -->
 <!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
 <!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
                                      U+21D2 ISOtech -->
 <!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so rArr can be used for 'implies'
-     as ISOtech suggests -->
+     another character with this function so ?
+     rArr can be used for 'implies' as ISOtech suggests -->
 <!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
 <!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
                                      U+21D4 ISOamsa -->
@@ -1565,17 +1534,19 @@
 <!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
 <!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
 <!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set, U+2205 ISOamso -->
+<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
+                                     U+2205 ISOamso -->
 <!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
                                      U+2207 ISOtech -->
 <!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
 <!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
 <!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
+<!-- should there be a more memorable name than 'ni'? -->
 <!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
                                      U+220F ISOamsb -->
 <!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
      the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary summation, U+2211 ISOamsb -->
+<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
 <!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
      though the same glyph might be used for both -->
 <!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
@@ -1605,6 +1576,9 @@
                                      U+2265 ISOtech -->
 <!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
 <!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
+<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
+     font encoding and is not included. Should it be, for symmetry?
+     It is in ISOamsn  --> 
 <!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
 <!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
 <!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
@@ -1619,19 +1593,19 @@
 <!-- dot operator is NOT the same character as U+00B7 middle dot -->
 
 <!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = APL upstile,
+<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
                                      U+2308 ISOamsc  -->
 <!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = APL downstile,
+<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
                                      U+230A ISOamsc  -->
 <!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
 <!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
                                      U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than sign' 
+<!-- lang is NOT the same character as U+003C 'less than' 
      or U+2039 'single left-pointing angle quotation mark' -->
 <!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
                                      U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than sign' 
+<!-- rang is NOT the same character as U+003E 'greater than' 
      or U+203A 'single right-pointing angle quotation mark' -->
 
 <!-- Geometric Shapes -->
@@ -1650,7 +1624,7 @@
 <!ENTITY % xhtml-special
     PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
            "xhtml-special.ent" >
-<!-- Special characters for XHTML -->
+<!-- Special characters for HTML -->
 
 <!-- Character entity set. Typical invocation:
      <!ENTITY % HTMLspecial PUBLIC
@@ -1674,11 +1648,12 @@
 -->
 
 <!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark, U+0022 ISOnum -->
+<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
+                                    U+0022 ISOnum -->
 <!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
 <!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
 <!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe = APL quote, U+0027 ISOnum -->
+<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
 
 <!-- Latin Extended-A -->
 <!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
@@ -1727,8 +1702,6 @@
 <!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
                                     U+203A ISO proposed -->
 <!-- rsaquo is proposed but not yet ISO standardized -->
-
-<!-- Currency Symbols -->
 <!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
 
 
@@ -1752,19 +1725,19 @@
 <![%xhtml-text.module;[
 <!ENTITY % xhtml-text.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Text Module  ................................................... -->
 <!-- file: xhtml-text-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-text-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"
 
      Revisions:
      (none)
@@ -1786,13 +1759,13 @@
 <!-- file: xhtml-inlstruct-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-inlstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod"
 
      Revisions:
      (none)
@@ -1855,13 +1828,13 @@
 <!-- file: xhtml-inlphras-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-inlphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod"
 
      Revisions:
      (none)
@@ -2065,13 +2038,13 @@
 <!-- file: xhtml-blkstruct-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-blkstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
 
      Revisions:
      (none)
@@ -2129,13 +2102,13 @@
 <!-- file: xhtml-blkphras-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-blkphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
 
      Revisions:
      (none)
@@ -2201,6 +2174,7 @@
 <![%pre.attlist;[
 <!ATTLIST %pre.qname;
       %Common.attrib;
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of pre.attlist -->]]>
 
@@ -2297,19 +2271,19 @@
 <![%xhtml-hypertext.module;[
 <!ENTITY % xhtml-hypertext.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Hypertext Module  .............................................. -->
 <!-- file: xhtml-hypertext-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-hypertext-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"
 
      Revisions:
      (none)
@@ -2359,19 +2333,19 @@
 <![%xhtml-list.module;[
 <!ENTITY % xhtml-list.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Lists Module  .................................................. -->
 <!-- file: xhtml-list-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-list-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"
 
      Revisions:
      (none)
@@ -2498,19 +2472,19 @@
 <![%xhtml-edit.module;[
 <!ENTITY % xhtml-edit.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-edit-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Editing Elements Module  ....................................... -->
 <!-- file: xhtml-edit-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-edit-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-edit-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod"
 
      Revisions:
      (none)
@@ -2572,19 +2546,19 @@
 <![%xhtml-bdo.module;[
 <!ENTITY % xhtml-bdo.mod
      PUBLIC "-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-bdo-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML BDO Element Module ............................................. -->
 <!-- file: xhtml-bdo-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-bdo-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML BDO Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-bdo-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod"
 
      Revisions:
      (none)
@@ -2879,19 +2853,19 @@
 <![%xhtml-pres.module;[
 <!ENTITY % xhtml-pres.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Presentation Module ............................................ -->
 <!-- file: xhtml-pres-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-pres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod"
 
      Revisions:
      (none)
@@ -2913,13 +2887,13 @@
 <!-- file: xhtml-inlpres-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-inlpres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlpres-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod"
 
      Revisions:
      (none)
@@ -3058,13 +3032,13 @@
 <!-- file: xhtml-blkpres-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-blkpres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkpres-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
 
      Revisions:
      (none)
@@ -3103,19 +3077,19 @@
 <![%xhtml-link.module;[
 <!ENTITY % xhtml-link.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Link Element Module  ........................................... -->
 <!-- file: xhtml-link-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-link-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-link-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"
 
      Revisions:
      (none)
@@ -3133,7 +3107,7 @@
         previous, next, index, end, help
      b) to link to a separate style sheet (rel="stylesheet")
      c) to make a link to a script (rel="script")
-     d) by style sheets to control how collections of html nodes are
+     d) by stylesheets to control how collections of html nodes are
         rendered into printed documents
      e) to make a link to a printable version of this document
         e.g. a postscript or pdf version (rel="alternate" media="print")
@@ -3170,19 +3144,19 @@
 <![%xhtml-meta.module;[
 <!ENTITY % xhtml-meta.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Document Metainformation Module  ............................... -->
 <!-- file: xhtml-meta-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-meta-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"
 
      Revisions:
      (none)
@@ -3225,19 +3199,19 @@
 <![%xhtml-base.module;[
 <!ENTITY % xhtml-base.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Base Element Module  ........................................... -->
 <!-- file: xhtml-base-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-base-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
 
      Revisions:
      (none)
@@ -3286,19 +3260,19 @@
 <![%xhtml-script.module;[
 <!ENTITY % xhtml-script.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-script-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Document Scripting Module  ..................................... -->
 <!-- file: xhtml-script-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-script-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-script-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod"
 
      Revisions:
      (none)
@@ -3326,11 +3300,11 @@
 <![%script.attlist;[
 <!ATTLIST %script.qname;
       %XHTML.xmlns.attrib;
-	  %id.attrib;
       charset      %Charset.datatype;       #IMPLIED
       type         %ContentType.datatype;   #REQUIRED
       src          %URI.datatype;           #IMPLIED
       defer        ( defer )                #IMPLIED
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of script.attlist -->]]>
 
@@ -3360,19 +3334,19 @@
 <![%xhtml-style.module;[
 <!ENTITY % xhtml-style.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-style-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod" >
 <!-- ...................................................................... -->
-<!-- XHTML Document Style Sheet Module  ................................... -->
+<!-- XHTML Document Style Sheet Module  .................................... -->
 <!-- file: xhtml-style-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-style-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-style-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-style-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"
 
      Revisions:
      (none)
@@ -3383,10 +3357,10 @@
         style
 
      This module declares the style element type and its attributes,
-     used to embed style sheet information in the document head element.
+     used to embed stylesheet information in the document head element.
 -->
 
-<!-- style: Style Sheet Information .................... -->
+<!-- style: Style Sheet Information ..................... -->
 
 <!ENTITY % style.element  "INCLUDE" >
 <![%style.element;[
@@ -3399,11 +3373,11 @@
 <![%style.attlist;[
 <!ATTLIST %style.qname;
       %XHTML.xmlns.attrib;
-      %id.attrib;
       %title.attrib;
       %I18n.attrib;
       type         %ContentType.datatype;   #REQUIRED
       media        %MediaDesc.datatype;     #IMPLIED
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of style.attlist -->]]>
 
@@ -3415,19 +3389,19 @@
 <![%xhtml-image.module;[
 <!ENTITY % xhtml-image.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Images Module  ................................................. -->
 <!-- file: xhtml-image-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Rovision: $Id: xhtml-image-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"
 
      Revisions:
      (none)
@@ -3473,19 +3447,19 @@
 <![%xhtml-csismap.module;[
 <!ENTITY % xhtml-csismap.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-csismap-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Client-side Image Map Module  .................................. -->
 <!-- file: xhtml-csismap-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-csismap-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-csismap-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod"
 
      Revisions:
      (none)
@@ -3595,19 +3569,19 @@
 <![%xhtml-ssismap.module;[
 <!ENTITY % xhtml-ssismap.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-ssismap-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Server-side Image Map Module  .................................. -->
 <!-- file: xhtml-ssismap-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-ssismap-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-ssismap-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod"
 
      Revisions:
 #2000-10-22: added declaration for 'ismap' on <input>
@@ -3635,19 +3609,19 @@
 <![%xhtml-param.module;[
 <!ENTITY % xhtml-param.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Param Element Module  ..................................... -->
 <!-- file: xhtml-param-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-param-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"
 
      Revisions:
      (none)
@@ -3691,19 +3665,19 @@
 <![%xhtml-object.module;[
 <!ENTITY % xhtml-object.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Embedded Object Module  ........................................ -->
 <!-- file: xhtml-object-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-object-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod"
 
      Revisions:
      (none)
@@ -3759,19 +3733,19 @@
 <![%xhtml-table.module;[
 <!ENTITY % xhtml-table.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-table-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Table Module  .................................................. -->
 <!-- file: xhtml-table-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-table-1.mod,v 4.1 2001/04/10 09:42:30 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-table-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-table-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod"
 
      Revisions:
      (none)
@@ -3782,7 +3756,7 @@
         table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
 
      This module declares element types and attributes used to provide
-     table markup similar to HTML 4, including features that enable
+     table markup similar to HTML 4.0, including features that enable
      better accessibility for non-visual user agents.
 -->
 
@@ -4100,19 +4074,19 @@
 <![%xhtml-form.module;[
 <!ENTITY % xhtml-form.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Forms Module  .................................................. -->
 <!-- file: xhtml-form-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-form-1.mod,v 4.1 2001/04/10 09:42:30 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-form-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod"
 
      Revisions:
      (none)
@@ -4124,7 +4098,7 @@
         textarea, fieldset, legend, button
 
      This module declares markup to provide support for online
-     forms, based on the features found in HTML 4 forms.
+     forms, based on the features found in HTML 4.0 forms.
 -->
 
 <!-- declare qualified element type names:
@@ -4394,73 +4368,12 @@
 <!-- end of xhtml-form-1.mod -->
 ]]>
 
-<!-- Target Attribute Module  .................................... -->
-<!ENTITY % xhtml-target.module "INCLUDE" >
-<![%xhtml-target.module;[
-<!ENTITY % xhtml-target.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-target-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Target Module  ................................................. -->
-<!-- file: xhtml-target-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-target-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-target-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Target 
-
-        target
-
-     This module declares the 'target' attribute used for opening windows
--->
-
-<!-- render in this frame --> 
-<!ENTITY % FrameTarget.datatype "CDATA" >
-
-<!-- add 'target' attribute to 'a' element -->
-<!ATTLIST %a.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- add 'target' attribute to 'area' element -->
-<!ATTLIST %area.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- add 'target' attribute to 'link' element -->
-<!ATTLIST %link.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- add 'target' attribute to 'form' element -->
-<!ATTLIST %form.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- add 'target' attribute to 'base' element -->
-<!ATTLIST %base.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- end of xhtml-target-1.mod -->
-]]>
-
 <!-- Legacy Markup ............................................... -->
 <!ENTITY % xhtml-legacy.module "IGNORE" >
 <![%xhtml-legacy.module;[
 <!ENTITY % xhtml-legacy.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-legacy-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-legacy-1.mod" >
 %xhtml-legacy.mod;]]>
 
 <!-- Document Structure Module (required)  ....................... -->
@@ -4468,19 +4381,19 @@
 <![%xhtml-struct.module;[
 <!ENTITY % xhtml-struct.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Structure Module  .............................................. -->
 <!-- file: xhtml-struct-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-struct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod"
 
      Revisions:
      (none)
@@ -4553,7 +4466,7 @@
 <!ENTITY % body.element  "INCLUDE" >
 <![%body.element;[
 <!ENTITY % body.content
-     "( %Block.mix; )*"
+     "( %Block.mix; )+"
 >
 <!ENTITY % body.qname  "body" >
 <!ELEMENT %body.qname;  %body.content; >
@@ -4575,14 +4488,6 @@
 <!ELEMENT %html.qname;  %html.content; >
 <!-- end of html.element -->]]>
 
-<![%XHTML.xsi.attrs;[
-<!-- define a parameter for the XSI schemaLocation attribute -->
-<!ENTITY % XSI.schemaLocation.attrib
-     "%XSI.pfx;schemaLocation  %URIs.datatype;    #IMPLIED"
->
-]]>
-<!ENTITY % XSI.schemaLocation.attrib "">
-
 <!ENTITY % html.attlist  "INCLUDE" >
 <![%html.attlist;[
 <!-- version attribute value defined in driver
@@ -4590,18 +4495,12 @@
 <!ENTITY % XHTML.version.attrib
      "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
 >
-<!-- schemaLocation attribute from XML Schema
--->
-<!ENTITY % XSI.schemaLocation.attrib
-     "schemaLocation   %URIs.datatype;      #IMPLIED"
->
 
 <!-- see the Qualified Names module for information
      on how to extend XHTML using XML namespaces
 -->
 <!ATTLIST %html.qname;
       %XHTML.xmlns.attrib;
-      %XSI.schemaLocation.attrib;
       %XHTML.version.attrib;
       %I18n.attrib;
 >
--- xhtml11-model-1.mod	2007-02-16 08:16:49.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml11-20010531/xhtml11-model-1.mod	2001-06-23 11:40:38.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml11-model-1.mod
 
      This is XHTML 1.1, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2007 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-model-1.mod,v 1.8 2007/02/15 21:56:54 jigsaw Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml11-model-1.mod,v 1.13 2001/05/29 16:37:01 ahby Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml11/DTD/xhtml11-model-1.mod"
 
      Revisions:
      (none)
--- xhtml11.dtd	2007-02-16 08:16:49.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml11-20010531/xhtml11.dtd	2001-06-23 11:40:38.000000000 +0900
@@ -1,16 +1,15 @@
 <!-- ....................................................................... -->
 <!-- XHTML 1.1 DTD  ........................................................ -->
-<!-- file: xhtml11.dtd
--->
+<!-- $Id$ -->
 
 <!-- XHTML 1.1 DTD
 
      This is XHTML, a reformulation of HTML as a modular XML application.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2007 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research Consortium
-         for Informatics and Mathematics, Keio University).
+     Copyright 1998-2001 World Wide Web Consortium
+        (Massachusetts Institute of Technology, Institut National de
+         Recherche en Informatique et en Automatique, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML DTD and its 
@@ -22,12 +21,12 @@
      It is provided "as is" without expressed or implied warranty.
 
         Author:     Murray M. Altheim <altheim@eng.sun.com>
-        Revision:   $Id: xhtml11.dtd,v 1.8 2007/02/15 21:56:58 jigsaw Exp $
+        Revision:   $Id: xhtml11.dtd,v 1.21 2001/05/29 16:37:01 ahby Exp $
 
 -->
 <!-- This is the driver file for version 1.1 of the XHTML DTD.
 
-     Please use this public identifier to identify it:
+     Please use this formal public identifier to identify it:
 
          "-//W3C//DTD XHTML 1.1//EN"
 -->
@@ -39,33 +38,21 @@
 
      See the Qualified Names module for information
      on the use of namespace prefixes in the DTD.
-
-	 Note that XHTML namespace elements are not prefixed by default,
-	 but the XHTML namespace prefix is defined as "xhtml" so that
-	 other markup languages can extend this one and use the XHTML
-	 prefixed global attributes if required.
-
 -->
 <!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "xhtml" >
-
-<!-- Be sure to include prefixed global attributes - we don't need
-     them, but languages that extend XHTML 1.1 might.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
+<!ENTITY % XHTML.prefix "" >
 
 <!-- Reserved for use with the XLink namespace:
 -->
 <!ENTITY % XLINK.xmlns "" >
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- For example, if you are using XHTML 1.1 directly, use the public
-     identifier in the DOCTYPE declaration, with the namespace declaration
-     on the document element to identify the default namespace:
+<!-- For example, if you are using XHTML 1.1 directly, use the FPI
+     in the DOCTYPE declaration, with the xmlns attribute on the
+     document element to identify the default namespace:
 
        <?xml version="1.0"?>
-       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-                             "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
        <html xmlns="http://www.w3.org/1999/xhtml"
              xml:lang="en">
        ...
@@ -78,9 +65,6 @@
 <!-- reserved for future use with document profiles -->
 <!ENTITY % XHTML.profile  "" >
 
-<!-- ensure XHTML Notations are disabled -->
-<!ENTITY % xhtml-notations.module "IGNORE" >
-
 <!-- Bidirectional Text features
      This feature-test entity is used to declare elements
      and attributes used for bidirectional text support.
@@ -107,21 +91,21 @@
 <![%xhtml-inlstyle.module;[
 <!ENTITY % xhtml-inlstyle.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
 %xhtml-inlstyle.mod;]]>
 
 <!-- declare Document Model module instantiated in framework
 -->
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod" >
+            "xhtml11-model-1.mod" >
 
 <!-- Modular Framework Module (required) ......................... -->
 <!ENTITY % xhtml-framework.module "INCLUDE" >
 <![%xhtml-framework.module;[
 <!ENTITY % xhtml-framework.mod
      PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
 %xhtml-framework.mod;]]>
 
 <!-- Post-Framework Redeclaration placeholder  ................... -->
@@ -138,7 +122,7 @@
 <![%xhtml-text.module;[
 <!ENTITY % xhtml-text.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
 %xhtml-text.mod;]]>
 
 <!-- Hypertext Module (required) ................................. -->
@@ -146,7 +130,7 @@
 <![%xhtml-hypertext.module;[
 <!ENTITY % xhtml-hypertext.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
 %xhtml-hypertext.mod;]]>
 
 <!-- Lists Module (required)  .................................... -->
@@ -154,7 +138,7 @@
 <![%xhtml-list.module;[
 <!ENTITY % xhtml-list.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
 %xhtml-list.mod;]]>
 
 <!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
@@ -164,7 +148,7 @@
 <![%xhtml-edit.module;[
 <!ENTITY % xhtml-edit.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-edit-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod" >
 %xhtml-edit.mod;]]>
 
 <!-- BIDI Override Module  ....................................... -->
@@ -172,7 +156,7 @@
 <![%xhtml-bdo.module;[
 <!ENTITY % xhtml-bdo.mod
      PUBLIC "-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-bdo-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod" >
 %xhtml-bdo.mod;]]>
 
 <!-- Ruby Module  ................................................ -->
@@ -190,7 +174,7 @@
 <![%xhtml-pres.module;[
 <!ENTITY % xhtml-pres.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod" >
 %xhtml-pres.mod;]]>
 
 <!-- Link Element Module  ........................................ -->
@@ -198,7 +182,7 @@
 <![%xhtml-link.module;[
 <!ENTITY % xhtml-link.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
 %xhtml-link.mod;]]>
 
 <!-- Document Metainformation Module  ............................ -->
@@ -206,7 +190,7 @@
 <![%xhtml-meta.module;[
 <!ENTITY % xhtml-meta.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
 %xhtml-meta.mod;]]>
 
 <!-- Base Element Module  ........................................ -->
@@ -214,7 +198,7 @@
 <![%xhtml-base.module;[
 <!ENTITY % xhtml-base.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
 %xhtml-base.mod;]]>
 
 <!-- Scripting Module  ........................................... -->
@@ -222,7 +206,7 @@
 <![%xhtml-script.module;[
 <!ENTITY % xhtml-script.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-script-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod" >
 %xhtml-script.mod;]]>
 
 <!-- Style Sheets Module  ......................................... -->
@@ -230,7 +214,7 @@
 <![%xhtml-style.module;[
 <!ENTITY % xhtml-style.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-style-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod" >
 %xhtml-style.mod;]]>
 
 <!-- Image Module  ............................................... -->
@@ -238,7 +222,7 @@
 <![%xhtml-image.module;[
 <!ENTITY % xhtml-image.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
 %xhtml-image.mod;]]>
 
 <!-- Client-side Image Map Module  ............................... -->
@@ -246,7 +230,7 @@
 <![%xhtml-csismap.module;[
 <!ENTITY % xhtml-csismap.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-csismap-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod" >
 %xhtml-csismap.mod;]]>
 
 <!-- Server-side Image Map Module  ............................... -->
@@ -254,7 +238,7 @@
 <![%xhtml-ssismap.module;[
 <!ENTITY % xhtml-ssismap.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-ssismap-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod" >
 %xhtml-ssismap.mod;]]>
 
 <!-- Param Element Module  ....................................... -->
@@ -262,7 +246,7 @@
 <![%xhtml-param.module;[
 <!ENTITY % xhtml-param.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
 %xhtml-param.mod;]]>
 
 <!-- Embedded Object Module  ..................................... -->
@@ -270,7 +254,7 @@
 <![%xhtml-object.module;[
 <!ENTITY % xhtml-object.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
 %xhtml-object.mod;]]>
 
 <!-- Tables Module ............................................... -->
@@ -278,7 +262,7 @@
 <![%xhtml-table.module;[
 <!ENTITY % xhtml-table.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-table-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod" >
 %xhtml-table.mod;]]>
 
 <!-- Forms Module  ............................................... -->
@@ -286,23 +270,15 @@
 <![%xhtml-form.module;[
 <!ENTITY % xhtml-form.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod" >
 %xhtml-form.mod;]]>
 
-<!-- Target Attribute Module  .................................... -->
-<!ENTITY % xhtml-target.module "INCLUDE" >
-<![%xhtml-target.module;[
-<!ENTITY % xhtml-target.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-target-1.mod" >
-%xhtml-target.mod;]]>
-
 <!-- Legacy Markup ............................................... -->
 <!ENTITY % xhtml-legacy.module "IGNORE" >
 <![%xhtml-legacy.module;[
 <!ENTITY % xhtml-legacy.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-legacy-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-legacy-1.mod" >
 %xhtml-legacy.mod;]]>
 
 <!-- Document Structure Module (required)  ....................... -->
@@ -310,7 +286,7 @@
 <![%xhtml-struct.module;[
 <!ENTITY % xhtml-struct.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
 %xhtml-struct.mod;]]>
 
 <!-- end of XHTML 1.1 DTD  ................................................. -->
--- xml1.dcl	2007-02-16 08:16:49.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml11-20010531/xml1.dcl	2001-06-23 11:40:38.000000000 +0900
@@ -9,6 +9,7 @@
 
         changes made to accommodate validation are noted with 'VALID:'
      --
+     -- $Id: xml1.dcl,v 1.1 2001/06/23 02:40:38 link Exp $ --
 
      CHARSET
          BASESET
@@ -185,8 +186,4 @@
 
      SEEALSO "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN"
 >
-<!-- Id: @(#)xml1.dcl 1.7 2000/12/18 SMI
-     Revisions:
-#1999-04-09  changes for XML validation
-#2000-12-18  fixed the wrong ISO registration number of UCS-4
- -->
+
--- xhtml-arch-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-arch-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-arch-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-arch-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-arch-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-arch-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-arch-1.mod"
 
      Revisions:
      (none)
--- xhtml-attribs-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-attribs-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-attribs-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-attribs-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-attribs-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-attribs-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-attribs-1.mod"
 
      Revisions:
      (none)
@@ -19,46 +19,20 @@
 
      This module declares many of the common attributes for the XHTML DTD.
      %NS.decl.attrib; is declared in the XHTML Qname module.
-
-	 Note that this file was extended in XHTML Modularization Second Edition to 
-	 include declarations of "global" versions of the attribute collections.
-	 The global versions of the attributes are for use on elements in other 
-	 namespaces.  The global version of "common" includes the xmlns declaration
-	 for the prefixed version of the xhtml namespace.  If you are only using a
-	 specific attribute or an individual attribute collection, you must also
-	 include the XHTML.xmlns.attrib.prefixed PE on your elements.
 -->
 
 <!ENTITY % id.attrib
      "id           ID                       #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.id.attrib
-     "%XHTML.prefix;:id           ID        #IMPLIED"
->
-]]>
-
 <!ENTITY % class.attrib
      "class        NMTOKENS                 #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.class.attrib
-     "%XHTML.prefix;:class        NMTOKENS                 #IMPLIED"
->
-]]>
-
 <!ENTITY % title.attrib
      "title        %Text.datatype;          #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.title.attrib
-     "%XHTML.prefix;:title        %Text.datatype;          #IMPLIED"
->
-]]>
-
 <!ENTITY % Core.extra.attrib "" >
 
 <!ENTITY % Core.attrib
@@ -66,25 +40,9 @@
       %id.attrib;
       %class.attrib;
       %title.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
       %Core.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.core.extra.attrib "" >
-
-<![%XHTML.global.attrs.prefixed;[
-
-<!ENTITY % XHTML.global.core.attrib
-     "%XHTML.global.id.attrib;
-      %XHTML.global.class.attrib;
-      %XHTML.global.title.attrib;
-      %XHTML.global.core.extra.attrib;"
->
-]]>
-
-<!ENTITY % XHTML.global.core.attrib "" >
-
-
 <!ENTITY % lang.attrib
      "xml:lang     %LanguageCode.datatype;  #IMPLIED"
 >
@@ -99,31 +57,17 @@
       %lang.attrib;"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY XHTML.global.i18n.attrib
-     "%XHTML.prefix;:dir          ( ltr | rtl )            #IMPLIED
-      %lang.attrib;"
->
-]]>
-<!ENTITY XHTML.global.i18n.attrib "" >
-
 ]]>
 <!ENTITY % I18n.attrib
      "%lang.attrib;"
 >
-<!ENTITY % XHTML.global.i18n.attrib
-     "%lang.attrib;"
->
 
 <!ENTITY % Common.extra.attrib "" >
-<!ENTITY % XHTML.global.common.extra.attrib "" >
 
 <!-- intrinsic event attributes declared previously
 -->
 <!ENTITY % Events.attrib "" >
 
-<!ENTITY % XHTML.global.events.attrib "" >
-
 <!ENTITY % Common.attrib
      "%Core.attrib;
       %I18n.attrib;
@@ -131,12 +75,4 @@
       %Common.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.common.attrib
-     "%XHTML.xmlns.attrib.prefixed;
-      %XHTML.global.core.attrib;
-	  %XHTML.global.i18n.attrib;
-	  %XHTML.global.events.attrib;
-	  %XHTML.global.common.extra.attrib;"
->
-
 <!-- end of xhtml-attribs-1.mod -->
--- xhtml-base-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-base-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-base-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-base-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-base-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-base-1.mod"
 
      Revisions:
      (none)
--- xhtml-basic-form-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic-form-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-basic-form-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic-form-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic-form-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"  
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic-form-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-form-1.mod"
 
      Revisions:
      (none)
@@ -105,7 +105,7 @@
 <!ELEMENT %input.qname;  %input.content; >
 <!-- end of input.element -->]]>
 
-<!-- Basic Forms removes 'button', 'image' and 'file' input types.
+<!-- Basic Forms removes 'image' and 'file' input types.
 -->
 <!ENTITY % input.attlist  "INCLUDE" >
 <![%input.attlist;[
@@ -121,10 +121,9 @@
       name         CDATA                    #IMPLIED
       value        CDATA                    #IMPLIED
       checked      ( checked )              #IMPLIED
-      size         %Number.datatype;        #IMPLIED
+      size         CDATA                    #IMPLIED
       maxlength    %Number.datatype;        #IMPLIED
       src          %URI.datatype;           #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
 >
 <!-- end of input.attlist -->]]>
@@ -144,7 +143,6 @@
       name         CDATA                    #IMPLIED
       size         %Number.datatype;        #IMPLIED
       multiple     ( multiple )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
 >
 <!-- end of select.attlist -->]]>
 
@@ -180,7 +178,6 @@
       name         CDATA                    #IMPLIED
       rows         %Number.datatype;        #REQUIRED
       cols         %Number.datatype;        #REQUIRED
-      tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
 >
 <!-- end of textarea.attlist -->]]>
--- xhtml-basic-table-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic-table-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-basic-table-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic-table-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic-table-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic-table-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-table-1.mod"
 
      Revisions:
      (none)
@@ -72,7 +72,6 @@
 <!ATTLIST %table.qname;
       %Common.attrib;
       summary      %Text.datatype;          #IMPLIED
-      width        %Length.datatype;        #IMPLIED
 >
 <!-- end of table.attlist -->]]>
 
--- xhtml-basic10-f.dtd	2005-04-13 22:13:02.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic10-f.dtd	2001-05-10 17:41:58.000000000 +0900
@@ -6,9 +6,9 @@
      This is XHTML Basic, a proper subset of XHTML.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2005 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research Consortium
-         for Informatics and Mathematics, Keio University).
+     Copyright 1998-2000 World Wide Web Consortium
+        (Massachusetts Institute of Technology, Institut National de
+         Recherche en Informatique et en Automatique, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML Basic DTD
@@ -21,7 +21,7 @@
 
         Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
                     Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-        Revision:   $Id: xhtml-basic10.dtd,v 2.13 2000/12/18 12:56:23 mimasa Exp $ SMI
+        Revision:   xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
 -->
 <!-- This is the driver file for version 1.0 of the XHTML Basic DTD.
@@ -49,8 +49,8 @@
 <!ENTITY % XLINK.xmlns.attrib "" >
 
 <!-- For example, if you are using XHTML Basic 1.0 directly, use
-     the public identifier in the DOCTYPE declaration, with the namespace
-     declaration on the document element to identify the default namespace:
+     the FPI in the DOCTYPE declaration, with the xmlns attribute
+     on the document element to identify the default namespace:
 
          <?xml version="1.0"?>
          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
@@ -79,23 +79,23 @@
 
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-basic10-model-1.mod" >
+            "xhtml-basic10-model-1.mod" >
 
 <!ENTITY % xhtml-framework.mod
      PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" >
+            "xhtml-framework-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Modular Framework Module  ...................................... -->
 <!-- file: xhtml-framework-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-framework-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-framework-1.mod"
 
      Revisions:
      (none)
@@ -118,12 +118,63 @@
      prior to Attributes but after Datatypes.
 -->
 
-<!ENTITY % xhtml-arch.module "IGNORE" >
+<!ENTITY % xhtml-arch.module "INCLUDE" >
 <![%xhtml-arch.module;[
 <!ENTITY % xhtml-arch.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
             "xhtml-arch-1.mod" >
-%xhtml-arch.mod;]]>
+<!-- ...................................................................... -->
+<!-- XHTML Base Architecture Module  ...................................... -->
+<!-- file: xhtml-arch-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-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-arch-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- This optional module includes declarations that enable XHTML to be used
+     as a base architecture according to the 'Architectural Forms Definition
+     Requirements' (Annex A.3, ISO/IEC 10744, 2nd edition). For more information
+     on use of architectural forms, see the HyTime web site at:
+
+         http://www.hytime.org/
+-->
+
+<?IS10744 ArcBase xhtml ?>
+
+<!NOTATION xhtml PUBLIC "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN" >
+
+<!-- Entity declaration for associated Architectural DTD
+-->
+<!ENTITY xhtml-arch.dtd
+      PUBLIC "-//W3C//DTD XHTML Architecture 1.1//EN"
+             "xhtml11-arch.dtd" >
+
+<?IS10744:arch xhtml
+    public-id       =  "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN"
+    dtd-public-id   =  "-//W3C//DTD XHTML 1.1//EN"
+    dtd-system-id   =  "xhtml11.dtd"
+    doc-elem-form   =  "html"
+    form-att        =  "html"
+    renamer-att     =  "htnames"
+    suppressor-att  =  "htsupp"
+    data-ignore-att =  "htign"
+    auto            =  "ArcAuto"
+    options         =  "HtModReq HtModOpt"
+    HtModReq        =  "Framework Text Hypertext Lists Structure"
+    HtModOpt        =  "Standard"
+?>
+
+<!-- end of xhtml-arch-1.mod -->
+]]>
 
 <!ENTITY % xhtml-notations.module "INCLUDE" >
 <![%xhtml-notations.module;[
@@ -135,13 +186,13 @@
 <!-- file: xhtml-notations-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-notations-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-notations-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-notations-1.mod"
 
      Revisions:
      (none)
@@ -149,7 +200,7 @@
 
 <!-- Notations
 
-     defines the following notations, many of these imported from
+     defines the following notations, many of these imported from 
      other specifications and standards. When an existing FPI is
      known, it is incorporated here.
 -->
@@ -158,11 +209,11 @@
 <!-- SGML and XML Notations ............................ -->
 
 <!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
+<!NOTATION w3c-xml 
      PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
 
 <!-- XML 1.0 CDATA -->
-<!NOTATION cdata
+<!NOTATION cdata 
      PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
 
 <!-- SGML Formal Public Identifiers -->
@@ -174,73 +225,73 @@
 <!-- Length defined for cellpadding/cellspacing -->
 
 <!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
+<!NOTATION length 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
 
 <!-- space-separated list of link types -->
-<!NOTATION linkTypes
+<!NOTATION linkTypes 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
 
 <!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
+<!NOTATION mediaDesc 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
 
 <!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
+<!NOTATION multiLength 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
 
 <!-- one or more digits (NUMBER) -->
-<!NOTATION number
+<!NOTATION number 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
 
 <!-- integer representing length in pixels -->
-<!NOTATION pixels
+<!NOTATION pixels 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
 
 <!-- script expression -->
-<!NOTATION script
+<!NOTATION script 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
 
 <!-- textual content -->
-<!NOTATION text
+<!NOTATION text 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
 
 <!-- Imported Notations ................................ -->
 
 <!-- a single character from [ISO10646] -->
-<!NOTATION character
+<!NOTATION character 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
 
 <!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
+<!NOTATION charset 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
 
 <!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
+<!NOTATION charsets 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
 
 <!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
+<!NOTATION contentType 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
 
 <!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
+<!NOTATION contentTypes 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
 
 <!-- date and time information. ISO date format -->
-<!NOTATION datetime
+<!NOTATION datetime 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
 
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
+<!-- a language code, as per [RFC1766] -->
+<!NOTATION languageCode 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
+<!NOTATION uri 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
 
 <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
+<!NOTATION uris 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
 
 <!-- end of xhtml-notations-1.mod -->
@@ -256,13 +307,13 @@
 <!-- file: xhtml-datatypes-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-datatypes-1.mod,v 4.1 2001/04/06 19:23:32 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-datatypes-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-datatypes-1.mod"
 
      Revisions:
      (none)
@@ -311,9 +362,6 @@
 <!-- a space separated list of character encodings, as per [RFC2045] -->
 <!ENTITY % Charsets.datatype "CDATA" >
 
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
 <!-- media type, as per [RFC2045] -->
 <!ENTITY % ContentType.datatype "CDATA" >
 
@@ -326,8 +374,8 @@
 <!-- formal public identifier, as per [ISO8879] -->
 <!ENTITY % FPI.datatype "CDATA" >
 
-<!-- a language code, as per [RFC3066] or its successor -->
-<!ENTITY % LanguageCode.datatype "CDATA" >
+<!-- a language code, as per [RFC1766] -->
+<!ENTITY % LanguageCode.datatype "NMTOKEN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
 <!ENTITY % URI.datatype "CDATA" >
@@ -352,16 +400,16 @@
 <!-- file: xhtml-qname-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-qname-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-qname-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-qname-1.mod"
 
      Revisions:
-#2000-10-22: added qname declarations for ruby elements
+     (none)
      ....................................................................... -->
 
 <!-- XHTML Qname (Qualified Name) Module
@@ -369,9 +417,9 @@
      This module is contained in two parts, labeled Section 'A' and 'B':
 
        Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing
+       qualified names, namespace declarations, and name prefixing 
        for XHTML and extensions.
-
+    
        Section B declares parameter entities used to provide
        namespace-qualified names for all XHTML element types:
 
@@ -379,49 +427,40 @@
          %base.qname;     the xmlns-qualified name for <base>
          ...
 
-     XHTML extensions would create a module similar to this one.
-     Included in the XHTML distribution is a template module
+     XHTML extensions would create a module similar to this one. 
+     Included in the XHTML distribution is a template module 
      ('template-qname-1.mod') suitable for this purpose.
 -->
 
 <!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
 
 <!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should
-        inherit '%NS.prefixed;' from the DTD driver, so that unless
-        overridden, the default behaviour follows the overall DTD
+        to activate namespace prefixing. The default value should 
+        inherit '%NS.prefixed;' from the DTD driver, so that unless 
+        overridden, the default behaviour follows the overall DTD 
         prefixing scheme.
 -->
 <!ENTITY % NS.prefixed "IGNORE" >
 <!ENTITY % XHTML.prefixed "%NS.prefixed;" >
 
-<!-- By default, we always permit XHTML attribute collections to have
-     namespace-qualified prefixes as well.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
-<!-- By default, we allow the XML Schema attributes on the root
-     element.
--->
-<!ENTITY % XHTML.xsi.attrs "INCLUDE" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
+<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing 
         the URI reference used to identify the XHTML namespace:
 -->
 <!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
 
 <!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing
+        the default namespace prefix string(s) to use when prefixing 
         is enabled. This may be overridden in the DTD driver or the
         internal subset of an document instance. If no default prefix
         is desired, this may be declared as an empty string.
 
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves
+     NOTE: As specified in [XMLNAMES], the namespace prefix serves 
      as a proxy for the URI reference, and is not in itself significant.
 -->
-<!ENTITY % XHTML.prefix  "xhtml" >
+<!ENTITY % XHTML.prefix  "" >
 
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
+<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the 
+        colonized prefix(es) (eg., '%XHTML.prefix;:') used when 
         prefixing is active, an empty string when it is not.
 -->
 <![%XHTML.prefixed;[
@@ -434,9 +473,9 @@
 
 
 <!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration
-        attributes for namespaces embedded in XHTML. The default
-        is an empty string.  XLink should be included here if used
+        redeclared to contain any non-XHTML namespace declaration 
+        attributes for namespaces embedded in XHTML. The default 
+        is an empty string.  XLink should be included here if used 
         in the DTD.
 -->
 <!ENTITY % XHTML.xmlns.extra.attrib "" >
@@ -445,15 +484,12 @@
 
 <!-- Declare a parameter entity %NS.decl.attrib; containing
      all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether
-     prefixing is active.
+     xmlns declaration for XHTML, its form dependent on whether 
+     prefixing is active. 
 -->
-<!ENTITY % XHTML.xmlns.attrib.prefixed
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'"
->
 <![%XHTML.prefixed;[
 <!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.attrib.prefixed;
+     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
       %XHTML.xmlns.extra.attrib;"
 >
 ]]>
@@ -461,58 +497,22 @@
      "%XHTML.xmlns.extra.attrib;"
 >
 
-<!-- Declare a parameter entity %XSI.prefix as a prefix to use for XML
-     Schema Instance attributes.
--->
-<!ENTITY % XSI.prefix "xsi" >
-
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!-- Declare a parameter entity %XSI.xmlns.attrib as support for the
-     schemaLocation attribute, since this is legal throughout the DTD.
--->
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;   #FIXED '%XSI.xmlns;'" >
-
 <!-- This is a placeholder for future XLink support.
 -->
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- This is the attribute for the XML Schema namespace - XHTML
-     Modularization is also expressed in XML Schema, and it needs to
-	 be legal to declare the XML Schema namespace and the
-	 schemaLocation attribute on the root element of XHTML family
-	 documents.
--->
-<![%XHTML.xsi.attrs;[
-<!ENTITY % XSI.prefix "xsi" >
-<!ENTITY % XSI.pfx "%XSI.prefix;:" >
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;    #FIXED '%XSI.xmlns;'"
->
-]]>
-<!ENTITY % XSI.prefix "" >
-<!ENTITY % XSI.pfx "" >
-<!ENTITY % XSI.xmlns.attrib "" >
-
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
+<!-- Declare a parameter entity %NS.decl.attrib; containing all 
      XML namespace declaration attributes used by XHTML, including
      a default xmlns attribute when prefixing is inactive.
 -->
 <![%XHTML.prefixed;[
 <!ENTITY % XHTML.xmlns.attrib
      "%NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 ]]>
 <!ENTITY % XHTML.xmlns.attrib
      "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 
@@ -650,14 +650,6 @@
 <!ENTITY % th.qname      "%XHTML.pfx;th" >
 <!ENTITY % td.qname      "%XHTML.pfx;td" >
 
-<!-- module:  xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
 
 <!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
 
@@ -684,13 +676,13 @@
 <!-- file: xhtml-attribs-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-attribs-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-attribs-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-attribs-1.mod"
 
      Revisions:
      (none)
@@ -700,46 +692,20 @@
 
      This module declares many of the common attributes for the XHTML DTD.
      %NS.decl.attrib; is declared in the XHTML Qname module.
-
-	 Note that this file was extended in XHTML Modularization Second Edition to 
-	 include declarations of "global" versions of the attribute collections.
-	 The global versions of the attributes are for use on elements in other 
-	 namespaces.  The global version of "common" includes the xmlns declaration
-	 for the prefixed version of the xhtml namespace.  If you are only using a
-	 specific attribute or an individual attribute collection, you must also
-	 include the XHTML.xmlns.attrib.prefixed PE on your elements.
 -->
 
 <!ENTITY % id.attrib
      "id           ID                       #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.id.attrib
-     "%XHTML.prefix;:id           ID        #IMPLIED"
->
-]]>
-
 <!ENTITY % class.attrib
      "class        NMTOKENS                 #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.class.attrib
-     "%XHTML.prefix;:class        NMTOKENS                 #IMPLIED"
->
-]]>
-
 <!ENTITY % title.attrib
      "title        %Text.datatype;          #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.title.attrib
-     "%XHTML.prefix;:title        %Text.datatype;          #IMPLIED"
->
-]]>
-
 <!ENTITY % Core.extra.attrib "" >
 
 <!ENTITY % Core.attrib
@@ -747,25 +713,9 @@
       %id.attrib;
       %class.attrib;
       %title.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
       %Core.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.core.extra.attrib "" >
-
-<![%XHTML.global.attrs.prefixed;[
-
-<!ENTITY % XHTML.global.core.attrib
-     "%XHTML.global.id.attrib;
-      %XHTML.global.class.attrib;
-      %XHTML.global.title.attrib;
-      %XHTML.global.core.extra.attrib;"
->
-]]>
-
-<!ENTITY % XHTML.global.core.attrib "" >
-
-
 <!ENTITY % lang.attrib
      "xml:lang     %LanguageCode.datatype;  #IMPLIED"
 >
@@ -780,31 +730,17 @@
       %lang.attrib;"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY XHTML.global.i18n.attrib
-     "%XHTML.prefix;:dir          ( ltr | rtl )            #IMPLIED
-      %lang.attrib;"
->
-]]>
-<!ENTITY XHTML.global.i18n.attrib "" >
-
 ]]>
 <!ENTITY % I18n.attrib
      "%lang.attrib;"
 >
-<!ENTITY % XHTML.global.i18n.attrib
-     "%lang.attrib;"
->
 
 <!ENTITY % Common.extra.attrib "" >
-<!ENTITY % XHTML.global.common.extra.attrib "" >
 
 <!-- intrinsic event attributes declared previously
 -->
 <!ENTITY % Events.attrib "" >
 
-<!ENTITY % XHTML.global.events.attrib "" >
-
 <!ENTITY % Common.attrib
      "%Core.attrib;
       %I18n.attrib;
@@ -812,14 +748,6 @@
       %Common.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.common.attrib
-     "%XHTML.xmlns.attrib.prefixed;
-      %XHTML.global.core.attrib;
-	  %XHTML.global.i18n.attrib;
-	  %XHTML.global.events.attrib;
-	  %XHTML.global.common.extra.attrib;"
->
-
 <!-- end of xhtml-attribs-1.mod -->
 ]]>
 
@@ -836,13 +764,13 @@
 <!-- file: xhtml-basic10-model-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-model-1.mod,v 2.8 2000/11/03 14:28:25 mimasa Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic10-model-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-basic/xhtml-basic10-model-1.mod"
 
      Revisions:
      (none)
@@ -991,13 +919,13 @@
 <!-- file: xhtml-charent-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-charent-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-charent-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-charent-1.mod"
 
      Revisions:
      (none)
@@ -1012,6 +940,13 @@
 <!ENTITY % xhtml-lat1
     PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
            "xhtml-lat1.ent" >
+<!ENTITY % xhtml-symbol
+    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
+           "xhtml-symbol.ent" >
+<!ENTITY % xhtml-special
+    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
+           "xhtml-special.ent" >
+
 <!-- Portions (C) International Organization for Standardization 1986
      Permission to copy in any form is granted for use with
      conforming SGML systems and applications as defined in
@@ -1040,7 +975,7 @@
 <!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
 <!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
                                   = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
+<!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
                                   U+00AC ISOnum -->
 <!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
                                   U+00AD ISOnum -->
@@ -1204,16 +1139,12 @@
                                   U+00FC ISOlat1 -->
 <!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
                                   U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn,
+<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
                                   U+00FE ISOlat1 -->
 <!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
                                   U+00FF ISOlat1 -->
 
-
-<!ENTITY % xhtml-symbol
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-           "xhtml-symbol.ent" >
-<!-- Mathematical, Greek and Symbolic characters for XHTML -->
+<!-- Mathematical, Greek and Symbolic characters for HTML -->
 
 <!-- Character entity set. Typical invocation:
      <!ENTITY % HTMLsymbol PUBLIC
@@ -1237,7 +1168,7 @@
 -->
 
 <!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small letter f with hook = function
+<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
                                     = florin, U+0192 ISOtech -->
 
 <!-- Greek -->
@@ -1254,7 +1185,7 @@
                                     U+0398 ISOgrk3 -->
 <!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
 <!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lamda,
+<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
                                     U+039B ISOgrk3 -->
 <!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
 <!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
@@ -1292,7 +1223,7 @@
 <!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
 <!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
                                     U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lamda,
+<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
                                     U+03BB ISOgrk3 -->
 <!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
 <!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
@@ -1312,7 +1243,7 @@
 <!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
 <!ENTITY omega    "&#969;"> <!-- greek small letter omega,
                                     U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek theta symbol,
+<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
                                     U+03D1 NEW -->
 <!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
                                     U+03D2 NEW -->
@@ -1334,9 +1265,9 @@
 <!-- Letterlike Symbols -->
 <!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
                                      = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- black-letter capital I = imaginary part,
+<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
                                      U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- black-letter capital R = real part symbol,
+<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
                                      U+211C ISOamso -->
 <!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
 <!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
@@ -1354,14 +1285,14 @@
                                      = carriage return, U+21B5 NEW -->
 <!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
 <!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So lArr can
+    but also does not have any other character for that function. So ? lArr can
     be used for 'is implied by' as ISOtech suggests -->
 <!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
 <!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
                                      U+21D2 ISOtech -->
 <!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so rArr can be used for 'implies'
-     as ISOtech suggests -->
+     another character with this function so ?
+     rArr can be used for 'implies' as ISOtech suggests -->
 <!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
 <!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
                                      U+21D4 ISOamsa -->
@@ -1370,17 +1301,19 @@
 <!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
 <!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
 <!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set, U+2205 ISOamso -->
+<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
+                                     U+2205 ISOamso -->
 <!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
                                      U+2207 ISOtech -->
 <!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
 <!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
 <!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
+<!-- should there be a more memorable name than 'ni'? -->
 <!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
                                      U+220F ISOamsb -->
 <!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
      the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary summation, U+2211 ISOamsb -->
+<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
 <!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
      though the same glyph might be used for both -->
 <!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
@@ -1410,6 +1343,9 @@
                                      U+2265 ISOtech -->
 <!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
 <!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
+<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
+     font encoding and is not included. Should it be, for symmetry?
+     It is in ISOamsn  --> 
 <!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
 <!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
 <!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
@@ -1424,19 +1360,19 @@
 <!-- dot operator is NOT the same character as U+00B7 middle dot -->
 
 <!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = APL upstile,
+<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
                                      U+2308 ISOamsc  -->
 <!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = APL downstile,
+<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
                                      U+230A ISOamsc  -->
 <!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
 <!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
                                      U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than sign' 
+<!-- lang is NOT the same character as U+003C 'less than' 
      or U+2039 'single left-pointing angle quotation mark' -->
 <!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
                                      U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than sign' 
+<!-- rang is NOT the same character as U+003E 'greater than' 
      or U+203A 'single right-pointing angle quotation mark' -->
 
 <!-- Geometric Shapes -->
@@ -1451,11 +1387,7 @@
                                      U+2665 ISOpub -->
 <!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
 
-
-<!ENTITY % xhtml-special
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-           "xhtml-special.ent" >
-<!-- Special characters for XHTML -->
+<!-- Special characters for HTML -->
 
 <!-- Character entity set. Typical invocation:
      <!ENTITY % HTMLspecial PUBLIC
@@ -1479,11 +1411,12 @@
 -->
 
 <!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark, U+0022 ISOnum -->
+<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
+                                    U+0022 ISOnum -->
 <!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
 <!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
 <!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe = APL quote, U+0027 ISOnum -->
+<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
 
 <!-- Latin Extended-A -->
 <!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
@@ -1532,8 +1465,6 @@
 <!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
                                     U+203A ISO proposed -->
 <!-- rsaquo is proposed but not yet ISO standardized -->
-
-<!-- Currency Symbols -->
 <!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
 
 
@@ -1553,19 +1484,19 @@
 
 <!ENTITY % xhtml-text.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" >
+            "xhtml-text-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Text Module  ................................................... -->
 <!-- file: xhtml-text-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-text-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-text-1.mod"
 
      Revisions:
      (none)
@@ -1573,7 +1504,7 @@
 
 <!-- Textual Content
 
-     The Text module includes declarations for all core
+     The Text module includes declarations for all core 
      text container elements and their attributes.
 -->
 
@@ -1587,13 +1518,13 @@
 <!-- file: xhtml-inlstruct-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-inlstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlstruct-1.mod"
 
      Revisions:
      (none)
@@ -1603,7 +1534,7 @@
 
         br, span
 
-     This module declares the elements and their attributes
+     This module declares the elements and their attributes 
      used to support inline-level structural markup.
 -->
 
@@ -1656,13 +1587,13 @@
 <!-- file: xhtml-inlphras-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-inlphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlphras-1.mod"
 
      Revisions:
      (none)
@@ -1866,13 +1797,13 @@
 <!-- file: xhtml-blkstruct-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-blkstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkstruct-1.mod"
 
      Revisions:
      (none)
@@ -1897,10 +1828,10 @@
 
 <!ENTITY % div.attlist  "INCLUDE" >
 <![%div.attlist;[
+<!-- end of div.attlist -->]]>
 <!ATTLIST %div.qname;
       %Common.attrib;
 >
-<!-- end of div.attlist -->]]>
 
 <!ENTITY % p.element  "INCLUDE" >
 <![%p.element;[
@@ -1930,13 +1861,13 @@
 <!-- file: xhtml-blkphras-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-blkphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkphras-1.mod"
 
      Revisions:
      (none)
@@ -1985,7 +1916,7 @@
 <!ENTITY % pre.element  "INCLUDE" >
 <![%pre.element;[
 <!ENTITY % pre.content
-     "( #PCDATA
+     "( #PCDATA 
       | %InlStruct.class;
       %InlPhras.class;
       | %tt.qname; | %i.qname; | %b.qname;
@@ -2002,6 +1933,7 @@
 <![%pre.attlist;[
 <!ATTLIST %pre.qname;
       %Common.attrib;
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of pre.attlist -->]]>
 
@@ -2095,19 +2027,19 @@
 
 <!ENTITY % xhtml-hypertext.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" >
+            "xhtml-hypertext-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Hypertext Module  .............................................. -->
 <!-- file: xhtml-hypertext-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-hypertext-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-hypertext-1.mod"
 
      Revisions:
      (none)
@@ -2119,7 +2051,7 @@
 
      This module declares the anchor ('a') element type, which
      defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute
+     (or link 'target') is identified via its 'id' attribute 
      rather than the 'name' attribute as was used in HTML.
 -->
 
@@ -2154,19 +2086,19 @@
 
 <!ENTITY % xhtml-list.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" >
+            "xhtml-list-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Lists Module  .................................................. -->
 <!-- file: xhtml-list-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-list-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-list-1.mod"
 
      Revisions:
      (none)
@@ -2293,19 +2225,19 @@
 <![%xhtml-image.module;[
 <!ENTITY % xhtml-image.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" >
+            "xhtml-image-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Images Module  ................................................. -->
 <!-- file: xhtml-image-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-image-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Rovision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-image-1.mod"
 
      Revisions:
      (none)
@@ -2351,19 +2283,19 @@
 <![%xhtml-table.module;[
 <!ENTITY % xhtml-table.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-basic-table-1.mod" >
+            "xhtml-basic-table-1.mod" >
 <!-- ....................................................................... -->
 <!-- XHTML Basic Table Module  ............................................. -->
 <!-- file: xhtml-basic-table-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic-table-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic-table-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-table-1.mod"
 
      Revisions:
      (none)
@@ -2426,7 +2358,6 @@
 <!ATTLIST %table.qname;
       %Common.attrib;
       summary      %Text.datatype;          #IMPLIED
-      width        %Length.datatype;        #IMPLIED
 >
 <!-- end of table.attlist -->]]>
 
@@ -2526,19 +2457,19 @@
 <![%xhtml-form.module;[
 <!ENTITY % xhtml-form.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-basic-form-1.mod" >
+            "xhtml-basic-form-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Simplified Forms Module  ....................................... -->
 <!-- file: xhtml-basic-form-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic-form-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"  
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic-form-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-form-1.mod"
 
      Revisions:
      (none)
@@ -2634,7 +2565,7 @@
 <!ELEMENT %input.qname;  %input.content; >
 <!-- end of input.element -->]]>
 
-<!-- Basic Forms removes 'button', 'image' and 'file' input types.
+<!-- Basic Forms removes 'image' and 'file' input types.
 -->
 <!ENTITY % input.attlist  "INCLUDE" >
 <![%input.attlist;[
@@ -2650,10 +2581,9 @@
       name         CDATA                    #IMPLIED
       value        CDATA                    #IMPLIED
       checked      ( checked )              #IMPLIED
-      size         %Number.datatype;        #IMPLIED
+      size         CDATA                    #IMPLIED
       maxlength    %Number.datatype;        #IMPLIED
       src          %URI.datatype;           #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
 >
 <!-- end of input.attlist -->]]>
@@ -2673,7 +2603,6 @@
       name         CDATA                    #IMPLIED
       size         %Number.datatype;        #IMPLIED
       multiple     ( multiple )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
 >
 <!-- end of select.attlist -->]]>
 
@@ -2709,7 +2638,6 @@
       name         CDATA                    #IMPLIED
       rows         %Number.datatype;        #REQUIRED
       cols         %Number.datatype;        #REQUIRED
-      tabindex     %Number.datatype;        #IMPLIED
       accesskey    %Character.datatype;     #IMPLIED
 >
 <!-- end of textarea.attlist -->]]>
@@ -2722,19 +2650,19 @@
 <![%xhtml-link.module;[
 <!ENTITY % xhtml-link.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" >
+            "xhtml-link-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Link Element Module  ........................................... -->
 <!-- file: xhtml-link-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-link-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-link-1.mod"
 
      Revisions:
      (none)
@@ -2752,7 +2680,7 @@
         previous, next, index, end, help
      b) to link to a separate style sheet (rel="stylesheet")
      c) to make a link to a script (rel="script")
-     d) by style sheets to control how collections of html nodes are
+     d) by stylesheets to control how collections of html nodes are
         rendered into printed documents
      e) to make a link to a printable version of this document
         e.g. a postscript or pdf version (rel="alternate" media="print")
@@ -2789,19 +2717,19 @@
 <![%xhtml-meta.module;[
 <!ENTITY % xhtml-meta.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" >
+            "xhtml-meta-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Document Metainformation Module  ............................... -->
 <!-- file: xhtml-meta-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-meta-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-meta-1.mod"
 
      Revisions:
      (none)
@@ -2844,19 +2772,19 @@
 <![%xhtml-base.module;[
 <!ENTITY % xhtml-base.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" >
+            "xhtml-base-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Base Element Module  ........................................... -->
 <!-- file: xhtml-base-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-base-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-base-1.mod"
 
      Revisions:
      (none)
@@ -2905,19 +2833,19 @@
 <![%xhtml-param.module;[
 <!ENTITY % xhtml-param.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" >
+            "xhtml-param-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Param Element Module  ..................................... -->
 <!-- file: xhtml-param-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-param-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-param-1.mod"
 
      Revisions:
      (none)
@@ -2927,9 +2855,9 @@
 
         param
 
-     This module provides declarations for the param element,
+     This module provides declarations for the param element, 
      used to provide named property values for the applet
-     and object elements.
+     and object elements. 
 -->
 
 <!-- param: Named Property Value ....................... -->
@@ -2944,7 +2872,7 @@
 <!ENTITY % param.attlist  "INCLUDE" >
 <![%param.attlist;[
 <!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %id.attrib;
       name         CDATA                    #REQUIRED
       value        CDATA                    #IMPLIED
@@ -2961,19 +2889,19 @@
 <![%xhtml-object.module;[
 <!ENTITY % xhtml-object.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" >
+            "xhtml-object-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Embedded Object Module  ........................................ -->
 <!-- file: xhtml-object-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-object-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-object-1.mod"
 
      Revisions:
      (none)
@@ -2983,12 +2911,13 @@
 
         object
 
-     This module declares the object element type and its attributes, used
-     to embed external objects as part of XHTML pages. In the document,
-     place param elements prior to other content within the object element.
+     This module declares the object element type and its attributes,
+     used to embed external objects as part of XHTML pages. In the
+     document, place param elements prior to the object elements 
+     that require their content.
 
-     Note that use of this module requires instantiation of the Param
-     Element Module.
+     Note that use of this module requires instantiation of the 
+     Param Element Module prior to this module.
 -->
 
 <!-- object: Generic Embedded Object ................... -->
@@ -3026,19 +2955,19 @@
 
 <!ENTITY % xhtml-struct.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" >
+            "xhtml-struct-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Structure Module  .............................................. -->
 <!-- file: xhtml-struct-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-struct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-f.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-struct-1.mod"
 
      Revisions:
      (none)
@@ -3048,13 +2977,13 @@
 
         title, head, body, html
 
-     The Structure Module defines the major structural elements and
+     The Structure Module defines the major structural elements and 
      their attributes.
 
-     Note that the content model of the head element type is redeclared
+     Note that the content model of the head element type is redeclared 
      when the Base Module is included in the DTD.
 
-     The parameter entity containing the XML namespace URI value used
+     The parameter entity containing the XML namespace URI value used 
      for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
 -->
 
@@ -3075,7 +3004,7 @@
 <!ENTITY % title.attlist  "INCLUDE" >
 <![%title.attlist;[
 <!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %I18n.attrib;
 >
 <!-- end of title.attlist -->]]>
@@ -3100,7 +3029,7 @@
 >
 
 <!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %I18n.attrib;
       %profile.attrib;
 >
@@ -3133,14 +3062,6 @@
 <!ELEMENT %html.qname;  %html.content; >
 <!-- end of html.element -->]]>
 
-<![%XHTML.xsi.attrs;[
-<!-- define a parameter for the XSI schemaLocation attribute -->
-<!ENTITY % XSI.schemaLocation.attrib
-     "%XSI.pfx;schemaLocation  %URIs.datatype;    #IMPLIED"
->
-]]>
-<!ENTITY % XSI.schemaLocation.attrib "">
-
 <!ENTITY % html.attlist  "INCLUDE" >
 <![%html.attlist;[
 <!-- version attribute value defined in driver
@@ -3148,18 +3069,12 @@
 <!ENTITY % XHTML.version.attrib
      "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
 >
-<!-- schemaLocation attribute from XML Schema
--->
-<!ENTITY % XSI.schemaLocation.attrib
-     "schemaLocation   %URIs.datatype;      #IMPLIED"
->
 
-<!-- see the Qualified Names module for information
-     on how to extend XHTML using XML namespaces
+<!-- see the Qualified Names module for information 
+     on how to extend XHTML using XML namespaces 
 -->
 <!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib;
-      %XSI.schemaLocation.attrib;
+      %XHTML.xmlns.attrib; 
       %XHTML.version.attrib;
       %I18n.attrib;
 >
@@ -3169,4 +3084,3 @@
 
 
 <!-- end of XHTML Basic 1.0 DTD  ........................................... -->
-
--- xhtml-basic10-model-1.mod	2005-04-13 21:34:25.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic10-model-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-basic10-model-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-model-1.mod,v 2.8 2000/11/03 14:28:25 mimasa Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-basic10-model-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-basic10-model-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-basic/xhtml-basic10-model-1.mod"
 
      Revisions:
      (none)
--- xhtml-basic10.cat	2006-07-06 01:29:09.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic10.cat	2001-05-10 17:41:58.000000000 +0900
@@ -3,7 +3,7 @@
 
 --  XHTML Basic Catalog Data File
 
-    Revision:  $Id: xhtml-basic10.cat,v 1.1 2006/07/05 16:29:09 matthieu Exp $ SMI
+    Revision:  xhtml-basic10.cat,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
     See "Entity Management", SGML Open Technical Resolution 9401 for detailed
     information on supplying and using catalog data. This document is available
--- xhtml-basic10.dtd	2005-04-21 00:56:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-basic10.dtd	2001-05-10 17:41:58.000000000 +0900
@@ -6,9 +6,9 @@
      This is XHTML Basic, a proper subset of XHTML.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2005 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research Consortium
-         for Informatics and Mathematics, Keio University).
+     Copyright 1998-2000 World Wide Web Consortium
+        (Massachusetts Institute of Technology, Institut National de
+         Recherche en Informatique et en Automatique, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML Basic DTD
@@ -21,7 +21,7 @@
 
         Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
                     Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-        Revision:   $Id: xhtml-basic10.dtd,v 2.13 2000/12/18 12:56:23 mimasa Exp $ SMI
+        Revision:   xhtml-basic10.dtd,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
 -->
 <!-- This is the driver file for version 1.0 of the XHTML Basic DTD.
@@ -49,8 +49,8 @@
 <!ENTITY % XLINK.xmlns.attrib "" >
 
 <!-- For example, if you are using XHTML Basic 1.0 directly, use
-     the public identifier in the DOCTYPE declaration, with the namespace
-     declaration on the document element to identify the default namespace:
+     the FPI in the DOCTYPE declaration, with the xmlns attribute
+     on the document element to identify the default namespace:
 
          <?xml version="1.0"?>
          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
--- xhtml-basic11-f.dtd	2007-07-13 23:58:56.000000000 +0900
+++ htdocs/sgml-lib/WD-xhtml-basic-20060705/xhtml-basic11-f.dtd	2007-03-16 13:00:58.000000000 +0900
@@ -21,7 +21,7 @@
 
         Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
                     Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-        Revision:   $Id: xhtml-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+        Revision:   $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
 -->
 <!-- This is the driver file for version 1.1 of the XHTML Basic DTD.
@@ -90,7 +90,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -136,7 +136,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -257,7 +257,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -353,7 +353,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -678,7 +678,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -820,7 +820,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -972,7 +972,7 @@
 
      This is XHTML Basic, a proper subset of XHTML.
      Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -1140,7 +1140,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -1708,7 +1708,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -1736,7 +1736,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -1805,7 +1805,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2015,7 +2015,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2079,7 +2079,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2250,7 +2250,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2309,7 +2309,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2453,7 +2453,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2527,7 +2527,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2582,7 +2582,7 @@
 
      This is XHTML, a reformulation of HTML as a modular XML application.
      Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Rovision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2640,7 +2640,7 @@
 
      This is XHTML Basic, a proper subset of XHTML.
      Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -2815,7 +2815,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3114,7 +3114,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3181,7 +3181,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3236,7 +3236,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3297,7 +3297,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3353,7 +3353,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3421,7 +3421,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3468,7 +3468,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -3527,7 +3527,7 @@
 
      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-basic11-f.dtd,v 1.2 2007/07/13 14:58:56 jigsaw Exp $ SMI
+     Revision: $Id: xhtml-basic11-f.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-basic11-model-1.mod	2007-07-13 23:37:51.000000000 +0900
+++ htdocs/sgml-lib/WD-xhtml-basic-20060705/xhtml-basic11-model-1.mod	2007-03-16 13:00:58.000000000 +0900
@@ -3,8 +3,8 @@
 <!-- file: xhtml-basic11-model-1.mod
 
      This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2007 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic11-model-1.mod,v 1.2 2007/07/13 14:37:51 jigsaw Exp $ SMI
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-basic11-model-1.mod,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
@@ -53,9 +53,7 @@
       | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
       | %abbr.qname; | %acronym.qname; | %q.qname;" >
 
-<!ENTITY % InlPres.class
-     "| %tt.qname; | %i.qname; | %b.qname; | %big.qname;
-      | %small.qname; | %sub.qname; | %sup.qname;" >
+<!ENTITY % InlPres.class "" >
 
 <!ENTITY % I18n.class "" >
 
@@ -72,7 +70,6 @@
 <!ENTITY % Inline.class
      "%InlStruct.class;
       %InlPhras.class;
-      %InlPres.class;
       %Anchor.class;
       %InlSpecial.class;
       %InlForm.class;
@@ -82,7 +79,6 @@
 <!ENTITY % InlNoAnchor.class
      "%InlStruct.class;
       %InlPhras.class;
-      %InlPres.class;
       %InlSpecial.class;
       %InlForm.class;
       %Inline.extra;"
@@ -110,8 +106,6 @@
 
 <!ENTITY % Form.class  "| %form.qname;" >
 
-<!ENTITY % Fieldset.class  "| %fieldset.qname;" >
-
 <!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
 
 <!ENTITY % BlkPhras.class
@@ -122,8 +116,7 @@
 
 <!ENTITY % BlkSpecial.class
      "%Table.class;
-      %Form.class;
-      %Fieldset.class;"
+      %Form.class;"
 >
 
 <!ENTITY % Block.extra "" >
--- xhtml-basic11.cat	2007-07-13 23:37:17.000000000 +0900
+++ htdocs/sgml-lib/WD-xhtml-basic-20060705/xhtml-basic11.cat	2007-03-16 13:00:58.000000000 +0900
@@ -3,7 +3,7 @@
 
 --  XHTML Basic Catalog Data File
 
-    Revision:  $Id: xhtml-basic11.cat,v 1.2 2007/07/13 14:37:17 jigsaw Exp $ SMI
+    Revision:  $Id: xhtml-basic11.cat,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
     See "Entity Management", SGML Open Technical Resolution 9401 for detailed
     information on supplying and using catalog data. This document is available
--- xhtml-basic11.dtd	2007-07-13 23:37:19.000000000 +0900
+++ htdocs/sgml-lib/WD-xhtml-basic-20060705/xhtml-basic11.dtd	2007-03-16 13:00:58.000000000 +0900
@@ -1,12 +1,12 @@
 <!-- XHTML Basic 1.1 DTD  ...................................................... -->
-<!-- file: xhtml-basic11.dtd -->
+<!-- file: xhtml-basic10.dtd -->
 
 <!-- XHTML Basic 1.1 DTD
 
      This is XHTML Basic, a proper subset of XHTML.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2007 World Wide Web Consortium
+     Copyright 1998-2005 World Wide Web Consortium
         (Massachusetts Institute of Technology, European Research Consortium
          for Informatics and Mathematics, Keio University).
          All Rights Reserved.
@@ -21,8 +21,7 @@
 
         Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
                     Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-					Shane McCarron    <mailto:shane@aptest.com>
-        Revision:   $Id: xhtml-basic11.dtd,v 1.2 2007/07/13 14:37:19 jigsaw Exp $
+        Revision:   $Id: xhtml-basic11.dtd,v 1.1 2007/03/16 04:00:58 ot Exp $ SMI
 
 -->
 <!-- This is the driver file for version 1.1 of the XHTML Basic DTD.
@@ -30,7 +29,7 @@
      This DTD is identified by the PUBLIC and SYSTEM identifiers:
 
      PUBLIC: "-//W3C//DTD XHTML Basic 1.1//EN"
-     SYSTEM: "http://www.w3.org/MarkUp/DTD/xhtml-basic11.dtd"
+     SYSTEM: "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"
 -->
 <!ENTITY % XHTML.version  "-//W3C//DTD XHTML Basic 1.1//EN" >
 
@@ -55,7 +54,7 @@
 
          <?xml version="1.0"?>
          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN"
-             "http://www.w3.org/MarkUp/DTD/xhtml-basic11.dtd" >
+             "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd" >
          <html xmlns="http://www.w3.org/1999/xhtml"
                xml:lang="en" >
          ...
@@ -78,15 +77,6 @@
 <!ENTITY % xhtml-events.module   "INCLUDE" >
 <!ENTITY % xhtml-bdo.module      "%XHTML.bidi;" >
 
-<!-- Inline Style Module  ........................................ -->
-<!ENTITY % xhtml-inlstyle.module "INCLUDE" >
-<![%xhtml-inlstyle.module;[
-<!ENTITY % xhtml-inlstyle.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod" >
-%xhtml-inlstyle.mod;]]>
-
-
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML Basic 1.1 Document Model 1.0//EN"
             "http://www.w3.org/MarkUp/DTD/xhtml-basic11-model-1.mod" >
@@ -166,14 +156,6 @@
             "http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod" >
 %xhtml-form.mod;]]>
 
-<!-- Presentation Module  ........................................ -->
-<!ENTITY % xhtml-pres.module "INCLUDE" >
-<![%xhtml-pres.module;[
-<!ENTITY % xhtml-pres.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod" >
-%xhtml-pres.mod;]]>
-
 <!-- Link Element Module  ........................................ -->
 <!ENTITY % xhtml-link.module "INCLUDE" >
 <![%xhtml-link.module;[
--- xhtml-blkphras-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-blkphras-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-blkphras-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-blkphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-blkphras-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkphras-1.mod"
 
      Revisions:
      (none)
@@ -58,7 +58,7 @@
 <!ENTITY % pre.element  "INCLUDE" >
 <![%pre.element;[
 <!ENTITY % pre.content
-     "( #PCDATA
+     "( #PCDATA 
       | %InlStruct.class;
       %InlPhras.class;
       | %tt.qname; | %i.qname; | %b.qname;
@@ -75,6 +75,7 @@
 <![%pre.attlist;[
 <!ATTLIST %pre.qname;
       %Common.attrib;
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of pre.attlist -->]]>
 
--- xhtml-blkpres-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-blkpres-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-blkpres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Revision: $Id: xhtml-blkpres-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-blkstruct-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-blkstruct-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-blkstruct-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-blkstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-blkstruct-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkstruct-1.mod"
 
      Revisions:
      (none)
@@ -34,10 +34,10 @@
 
 <!ENTITY % div.attlist  "INCLUDE" >
 <![%div.attlist;[
+<!-- end of div.attlist -->]]>
 <!ATTLIST %div.qname;
       %Common.attrib;
 >
-<!-- end of div.attlist -->]]>
 
 <!ENTITY % p.element  "INCLUDE" >
 <![%p.element;[
--- xhtml-charent-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-charent-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-charent-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-charent-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-charent-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-charent-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-charent-1.mod"
 
      Revisions:
      (none)
@@ -24,16 +24,15 @@
 <!ENTITY % xhtml-lat1
     PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
            "xhtml-lat1.ent" >
-%xhtml-lat1;
-
 <!ENTITY % xhtml-symbol
     PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
            "xhtml-symbol.ent" >
-%xhtml-symbol;
-
 <!ENTITY % xhtml-special
     PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
            "xhtml-special.ent" >
+
+%xhtml-lat1;
+%xhtml-symbol;
 %xhtml-special;
 
 <!-- end of xhtml-charent-1.mod -->
--- xhtml-datatypes-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-datatypes-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-datatypes-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-datatypes-1.mod,v 4.1 2001/04/06 19:23:32 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-datatypes-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-datatypes-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-datatypes-1.mod"
 
      Revisions:
      (none)
@@ -58,9 +58,6 @@
 <!-- a space separated list of character encodings, as per [RFC2045] -->
 <!ENTITY % Charsets.datatype "CDATA" >
 
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
 <!-- media type, as per [RFC2045] -->
 <!ENTITY % ContentType.datatype "CDATA" >
 
@@ -73,8 +70,8 @@
 <!-- formal public identifier, as per [ISO8879] -->
 <!ENTITY % FPI.datatype "CDATA" >
 
-<!-- a language code, as per [RFC3066] or its successor -->
-<!ENTITY % LanguageCode.datatype "CDATA" >
+<!-- a language code, as per [RFC1766] -->
+<!ENTITY % LanguageCode.datatype "NMTOKEN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
 <!ENTITY % URI.datatype "CDATA" >
--- xhtml-framework-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-framework-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-framework-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-framework-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-framework-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-framework-1.mod"
 
      Revisions:
      (none)
@@ -32,7 +32,7 @@
      prior to Attributes but after Datatypes.
 -->
 
-<!ENTITY % xhtml-arch.module "IGNORE" >
+<!ENTITY % xhtml-arch.module "INCLUDE" >
 <![%xhtml-arch.module;[
 <!ENTITY % xhtml-arch.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
--- xhtml-hypertext-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-hypertext-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-hypertext-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-hypertext-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-hypertext-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-hypertext-1.mod"
 
      Revisions:
      (none)
@@ -21,7 +21,7 @@
 
      This module declares the anchor ('a') element type, which
      defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute
+     (or link 'target') is identified via its 'id' attribute 
      rather than the 'name' attribute as was used in HTML.
 -->
 
--- xhtml-image-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-image-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-image-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-image-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Rovision: xhtml-image-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-image-1.mod"
 
      Revisions:
      (none)
--- xhtml-inlphras-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-inlphras-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-inlphras-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-inlphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-inlphras-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlphras-1.mod"
 
      Revisions:
      (none)
--- xhtml-inlpres-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-inlpres-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-inlpres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Revision: $Id: xhtml-inlpres-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-inlstruct-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-inlstruct-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-inlstruct-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-inlstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-inlstruct-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlstruct-1.mod"
 
      Revisions:
      (none)
@@ -19,7 +19,7 @@
 
         br, span
 
-     This module declares the elements and their attributes
+     This module declares the elements and their attributes 
      used to support inline-level structural markup.
 -->
 
--- xhtml-inlstyle-1.mod	2005-04-13 21:22:56.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-inlstyle-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-inlstyle-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+     Revision: $Id: xhtml-inlstyle-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-link-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-link-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-link-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-link-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-link-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-link-1.mod"
 
      Revisions:
      (none)
@@ -27,7 +27,7 @@
         previous, next, index, end, help
      b) to link to a separate style sheet (rel="stylesheet")
      c) to make a link to a script (rel="script")
-     d) by style sheets to control how collections of html nodes are
+     d) by stylesheets to control how collections of html nodes are
         rendered into printed documents
      e) to make a link to a printable version of this document
         e.g. a postscript or pdf version (rel="alternate" media="print")
--- xhtml-list-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-list-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-list-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-list-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-list-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-list-1.mod"
 
      Revisions:
      (none)
--- xhtml-meta-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-meta-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-meta-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-meta-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-meta-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-meta-1.mod"
 
      Revisions:
      (none)
--- xhtml-notations-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-notations-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-notations-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-notations-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-notations-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-notations-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-notations-1.mod"
 
      Revisions:
      (none)
@@ -17,7 +17,7 @@
 
 <!-- Notations
 
-     defines the following notations, many of these imported from
+     defines the following notations, many of these imported from 
      other specifications and standards. When an existing FPI is
      known, it is incorporated here.
 -->
@@ -26,11 +26,11 @@
 <!-- SGML and XML Notations ............................ -->
 
 <!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
+<!NOTATION w3c-xml 
      PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
 
 <!-- XML 1.0 CDATA -->
-<!NOTATION cdata
+<!NOTATION cdata 
      PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
 
 <!-- SGML Formal Public Identifiers -->
@@ -42,73 +42,73 @@
 <!-- Length defined for cellpadding/cellspacing -->
 
 <!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
+<!NOTATION length 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
 
 <!-- space-separated list of link types -->
-<!NOTATION linkTypes
+<!NOTATION linkTypes 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
 
 <!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
+<!NOTATION mediaDesc 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
 
 <!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
+<!NOTATION multiLength 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
 
 <!-- one or more digits (NUMBER) -->
-<!NOTATION number
+<!NOTATION number 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
 
 <!-- integer representing length in pixels -->
-<!NOTATION pixels
+<!NOTATION pixels 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
 
 <!-- script expression -->
-<!NOTATION script
+<!NOTATION script 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
 
 <!-- textual content -->
-<!NOTATION text
+<!NOTATION text 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
 
 <!-- Imported Notations ................................ -->
 
 <!-- a single character from [ISO10646] -->
-<!NOTATION character
+<!NOTATION character 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
 
 <!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
+<!NOTATION charset 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
 
 <!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
+<!NOTATION charsets 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
 
 <!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
+<!NOTATION contentType 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
 
 <!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
+<!NOTATION contentTypes 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
 
 <!-- date and time information. ISO date format -->
-<!NOTATION datetime
+<!NOTATION datetime 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
 
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
+<!-- a language code, as per [RFC1766] -->
+<!NOTATION languageCode 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
+<!NOTATION uri 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
 
 <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
+<!NOTATION uris 
     PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
 
 <!-- end of xhtml-notations-1.mod -->
--- xhtml-object-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-object-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-object-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-object-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-object-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-object-1.mod"
 
      Revisions:
      (none)
@@ -19,12 +19,13 @@
 
         object
 
-     This module declares the object element type and its attributes, used
-     to embed external objects as part of XHTML pages. In the document,
-     place param elements prior to other content within the object element.
+     This module declares the object element type and its attributes,
+     used to embed external objects as part of XHTML pages. In the
+     document, place param elements prior to the object elements 
+     that require their content.
 
-     Note that use of this module requires instantiation of the Param
-     Element Module.
+     Note that use of this module requires instantiation of the 
+     Param Element Module prior to this module.
 -->
 
 <!-- object: Generic Embedded Object ................... -->
--- xhtml-param-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-param-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-param-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-param-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-param-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-param-1.mod"
 
      Revisions:
      (none)
@@ -19,9 +19,9 @@
 
         param
 
-     This module provides declarations for the param element,
+     This module provides declarations for the param element, 
      used to provide named property values for the applet
-     and object elements.
+     and object elements. 
 -->
 
 <!-- param: Named Property Value ....................... -->
@@ -36,7 +36,7 @@
 <!ENTITY % param.attlist  "INCLUDE" >
 <![%param.attlist;[
 <!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %id.attrib;
       name         CDATA                    #REQUIRED
       value        CDATA                    #IMPLIED
--- xhtml-pres-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-pres-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-pres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Revision: $Id: xhtml-pres-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-print10-model-1.mod	2004-01-21 01:58:36.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10-model-1.mod	2006-10-10 16:19:39.000000000 +0900
@@ -4,7 +4,7 @@
 
      This is XHTML-Print 1.0, a variant of XHTML Basic for printing.
      Copyright 1998-2003 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-print10-model-1.mod,v 1.7 2003/10/24 22:14:40 fujisawa Exp $
+     Revision: $Id: xhtml-print10-model-1.mod,v 1.1 2006/09/25 14:44:04 jean-gui Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-print10.dtd	2004-01-21 01:58:36.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10.dtd	2006-10-10 16:19:39.000000000 +0900
@@ -24,7 +24,7 @@
         Editors: Jim Bigelow <jim.bigelow@hp.com>, 
                  Shane McCarron <shane@aptest.com>,
                  Masayasu Ishikawa <mimasa@w3.org>
-        Revision: $Id: xhtml-print10.dtd,v 1.5 2003/10/24 14:24:40 fujisawa Exp $
+        Revision: $Id: xhtml-print10.dtd,v 1.1 2006/09/25 14:44:04 jean-gui Exp $
 
 -->
 <!-- This is the driver file for version 1.0 of the XHTML-Print DTD.
--- xhtml-qname-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-qname-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,16 +3,16 @@
 <!-- file: xhtml-qname-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-qname-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-qname-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-qname-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-qname-1.mod"
 
      Revisions:
-#2000-10-22: added qname declarations for ruby elements
+     (none)
      ....................................................................... -->
 
 <!-- XHTML Qname (Qualified Name) Module
@@ -20,9 +20,9 @@
      This module is contained in two parts, labeled Section 'A' and 'B':
 
        Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing
+       qualified names, namespace declarations, and name prefixing 
        for XHTML and extensions.
-
+    
        Section B declares parameter entities used to provide
        namespace-qualified names for all XHTML element types:
 
@@ -30,49 +30,40 @@
          %base.qname;     the xmlns-qualified name for <base>
          ...
 
-     XHTML extensions would create a module similar to this one.
-     Included in the XHTML distribution is a template module
+     XHTML extensions would create a module similar to this one. 
+     Included in the XHTML distribution is a template module 
      ('template-qname-1.mod') suitable for this purpose.
 -->
 
 <!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
 
 <!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should
-        inherit '%NS.prefixed;' from the DTD driver, so that unless
-        overridden, the default behaviour follows the overall DTD
+        to activate namespace prefixing. The default value should 
+        inherit '%NS.prefixed;' from the DTD driver, so that unless 
+        overridden, the default behaviour follows the overall DTD 
         prefixing scheme.
 -->
 <!ENTITY % NS.prefixed "IGNORE" >
 <!ENTITY % XHTML.prefixed "%NS.prefixed;" >
 
-<!-- By default, we always permit XHTML attribute collections to have
-     namespace-qualified prefixes as well.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
-<!-- By default, we allow the XML Schema attributes on the root
-     element.
--->
-<!ENTITY % XHTML.xsi.attrs "INCLUDE" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
+<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing 
         the URI reference used to identify the XHTML namespace:
 -->
 <!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
 
 <!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing
+        the default namespace prefix string(s) to use when prefixing 
         is enabled. This may be overridden in the DTD driver or the
         internal subset of an document instance. If no default prefix
         is desired, this may be declared as an empty string.
 
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves
+     NOTE: As specified in [XMLNAMES], the namespace prefix serves 
      as a proxy for the URI reference, and is not in itself significant.
 -->
-<!ENTITY % XHTML.prefix  "xhtml" >
+<!ENTITY % XHTML.prefix  "" >
 
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
+<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the 
+        colonized prefix(es) (eg., '%XHTML.prefix;:') used when 
         prefixing is active, an empty string when it is not.
 -->
 <![%XHTML.prefixed;[
@@ -85,9 +76,9 @@
 %xhtml-qname-extra.mod;
 
 <!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration
-        attributes for namespaces embedded in XHTML. The default
-        is an empty string.  XLink should be included here if used
+        redeclared to contain any non-XHTML namespace declaration 
+        attributes for namespaces embedded in XHTML. The default 
+        is an empty string.  XLink should be included here if used 
         in the DTD.
 -->
 <!ENTITY % XHTML.xmlns.extra.attrib "" >
@@ -96,15 +87,12 @@
 
 <!-- Declare a parameter entity %NS.decl.attrib; containing
      all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether
-     prefixing is active.
+     xmlns declaration for XHTML, its form dependent on whether 
+     prefixing is active. 
 -->
-<!ENTITY % XHTML.xmlns.attrib.prefixed
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'"
->
 <![%XHTML.prefixed;[
 <!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.attrib.prefixed;
+     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
       %XHTML.xmlns.extra.attrib;"
 >
 ]]>
@@ -112,58 +100,22 @@
      "%XHTML.xmlns.extra.attrib;"
 >
 
-<!-- Declare a parameter entity %XSI.prefix as a prefix to use for XML
-     Schema Instance attributes.
--->
-<!ENTITY % XSI.prefix "xsi" >
-
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!-- Declare a parameter entity %XSI.xmlns.attrib as support for the
-     schemaLocation attribute, since this is legal throughout the DTD.
--->
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;   #FIXED '%XSI.xmlns;'" >
-
 <!-- This is a placeholder for future XLink support.
 -->
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- This is the attribute for the XML Schema namespace - XHTML
-     Modularization is also expressed in XML Schema, and it needs to
-	 be legal to declare the XML Schema namespace and the
-	 schemaLocation attribute on the root element of XHTML family
-	 documents.
--->
-<![%XHTML.xsi.attrs;[
-<!ENTITY % XSI.prefix "xsi" >
-<!ENTITY % XSI.pfx "%XSI.prefix;:" >
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;    #FIXED '%XSI.xmlns;'"
->
-]]>
-<!ENTITY % XSI.prefix "" >
-<!ENTITY % XSI.pfx "" >
-<!ENTITY % XSI.xmlns.attrib "" >
-
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
+<!-- Declare a parameter entity %NS.decl.attrib; containing all 
      XML namespace declaration attributes used by XHTML, including
      a default xmlns attribute when prefixing is inactive.
 -->
 <![%XHTML.prefixed;[
 <!ENTITY % XHTML.xmlns.attrib
      "%NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 ]]>
 <!ENTITY % XHTML.xmlns.attrib
      "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 
@@ -301,14 +253,6 @@
 <!ENTITY % th.qname      "%XHTML.pfx;th" >
 <!ENTITY % td.qname      "%XHTML.pfx;td" >
 
-<!-- module:  xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
 
 <!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
 
--- xhtml-script-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-script-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-script-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Revision: $Id: xhtml-script-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-struct-1.mod	2005-04-13 21:49:34.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-struct-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-struct-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-struct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-struct-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-struct-1.mod"
 
      Revisions:
      (none)
@@ -19,13 +19,13 @@
 
         title, head, body, html
 
-     The Structure Module defines the major structural elements and
+     The Structure Module defines the major structural elements and 
      their attributes.
 
-     Note that the content model of the head element type is redeclared
+     Note that the content model of the head element type is redeclared 
      when the Base Module is included in the DTD.
 
-     The parameter entity containing the XML namespace URI value used
+     The parameter entity containing the XML namespace URI value used 
      for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
 -->
 
@@ -46,7 +46,7 @@
 <!ENTITY % title.attlist  "INCLUDE" >
 <![%title.attlist;[
 <!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %I18n.attrib;
 >
 <!-- end of title.attlist -->]]>
@@ -71,7 +71,7 @@
 >
 
 <!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib;
+      %XHTML.xmlns.attrib; 
       %I18n.attrib;
       %profile.attrib;
 >
@@ -104,14 +104,6 @@
 <!ELEMENT %html.qname;  %html.content; >
 <!-- end of html.element -->]]>
 
-<![%XHTML.xsi.attrs;[
-<!-- define a parameter for the XSI schemaLocation attribute -->
-<!ENTITY % XSI.schemaLocation.attrib
-     "%XSI.pfx;schemaLocation  %URIs.datatype;    #IMPLIED"
->
-]]>
-<!ENTITY % XSI.schemaLocation.attrib "">
-
 <!ENTITY % html.attlist  "INCLUDE" >
 <![%html.attlist;[
 <!-- version attribute value defined in driver
@@ -119,18 +111,12 @@
 <!ENTITY % XHTML.version.attrib
      "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
 >
-<!-- schemaLocation attribute from XML Schema
--->
-<!ENTITY % XSI.schemaLocation.attrib
-     "schemaLocation   %URIs.datatype;      #IMPLIED"
->
 
-<!-- see the Qualified Names module for information
-     on how to extend XHTML using XML namespaces
+<!-- see the Qualified Names module for information 
+     on how to extend XHTML using XML namespaces 
 -->
 <!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib;
-      %XSI.schemaLocation.attrib;
+      %XHTML.xmlns.attrib; 
       %XHTML.version.attrib;
       %I18n.attrib;
 >
--- xhtml-style-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-style-1.mod	2007-10-24 15:00:44.000000000 +0900
@@ -4,7 +4,7 @@
 
      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-style-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Revision: $Id: xhtml-style-1.mod,v 1.1 2007/10/24 06:00:44 ot Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
--- xhtml-text-1.mod	2005-04-13 21:22:57.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-text-1.mod	2001-05-10 17:41:58.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml-text-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-text-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: xhtml-text-1.mod,v 1.1 2001/05/10 08:41:58 gerald Exp SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-text-1.mod"
 
      Revisions:
      (none)
@@ -17,7 +17,7 @@
 
 <!-- Textual Content
 
-     The Text module includes declarations for all core
+     The Text module includes declarations for all core 
      text container elements and their attributes.
 -->
 
--- xhtml1-frameset.dtd	2003-05-08 02:48:53.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-frameset.dtd	2002-08-20 10:51:30.000000000 +0900
@@ -16,8 +16,8 @@
    PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
 
-   $Revision: 1.26 $
-   $Date: 2002/08/01 18:16:48 $
+   $Revision: 1.1.2.1 $
+   $Date: 2002/08/19 02:07:44 $
 
 -->
 
--- xhtml1-strict.dtd	2003-05-08 02:48:53.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-strict.dtd	2002-08-20 10:51:30.000000000 +0900
@@ -16,8 +16,8 @@
    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
 
-   $Revision: 1.24 $
-   $Date: 2002/07/31 19:34:51 $
+   $Revision: 1.1.2.1 $
+   $Date: 2002/08/19 02:07:44 $
 
 -->
 
--- xhtml1-transitional.dtd	2003-05-08 02:48:53.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-transitional.dtd	2002-08-20 10:51:30.000000000 +0900
@@ -16,8 +16,8 @@
    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
 
-   $Revision: 1.27 $
-   $Date: 2002/08/01 18:16:48 $
+   $Revision: 1.1.2.1 $
+   $Date: 2002/08/19 02:07:44 $
 
 -->
 
--- xhtml11-flat.dtd	2007-11-15 23:31:04.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml11-20010531/xhtml11-flat.dtd	2001-06-06 17:31:47.000000000 +0900
@@ -8,9 +8,9 @@
      This is XHTML, a reformulation of HTML as a modular XML application.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2005 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research Consortium
-         for Informatics and Mathematics, Keio University).
+     Copyright 1998-2000 World Wide Web Consortium
+        (Massachusetts Institute of Technology, Institut National de
+         Recherche en Informatique et en Automatique, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML DTD and its 
@@ -22,12 +22,12 @@
      It is provided "as is" without expressed or implied warranty.
 
         Author:     Murray M. Altheim <altheim@eng.sun.com>
-        Revision:   $Id: xhtml11.dtd,v 1.24 2005/04/13 12:25:40 mimasa Exp $
+        Revision:   $Id: xhtml11.dtd,v 1.20 2001/04/05 14:20:51 ahby Exp $
 
 -->
 <!-- This is the driver file for version 1.1 of the XHTML DTD.
 
-     Please use this public identifier to identify it:
+     Please use this formal public identifier to identify it:
 
          "-//W3C//DTD XHTML 1.1//EN"
 -->
@@ -39,33 +39,21 @@
 
      See the Qualified Names module for information
      on the use of namespace prefixes in the DTD.
-
-	 Note that XHTML namespace elements are not prefixed by default,
-	 but the XHTML namespace prefix is defined as "xhtml" so that
-	 other markup languages can extend this one and use the XHTML
-	 prefixed global attributes if required.
-
 -->
 <!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "xhtml" >
-
-<!-- Be sure to include prefixed global attributes - we don't need
-     them, but languages that extend XHTML 1.1 might.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
+<!ENTITY % XHTML.prefix "" >
 
 <!-- Reserved for use with the XLink namespace:
 -->
 <!ENTITY % XLINK.xmlns "" >
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- For example, if you are using XHTML 1.1 directly, use the public
-     identifier in the DOCTYPE declaration, with the namespace declaration
-     on the document element to identify the default namespace:
+<!-- For example, if you are using XHTML 1.1 directly, use the FPI
+     in the DOCTYPE declaration, with the xmlns attribute on the
+     document element to identify the default namespace:
 
        <?xml version="1.0"?>
-       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-                             "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
        <html xmlns="http://www.w3.org/1999/xhtml"
              xml:lang="en">
        ...
@@ -78,9 +66,6 @@
 <!-- reserved for future use with document profiles -->
 <!ENTITY % XHTML.profile  "" >
 
-<!-- ensure XHTML Notations are disabled -->
-<!ENTITY % xhtml-notations.module "IGNORE" >
-
 <!-- Bidirectional Text features
      This feature-test entity is used to declare elements
      and attributes used for bidirectional text support.
@@ -107,19 +92,19 @@
 <![%xhtml-inlstyle.module;[
 <!ENTITY % xhtml-inlstyle.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Inline Style Module  ........................................... -->
 <!-- file: xhtml-inlstyle-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-inlstyle-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"
 
      Revisions:
      (none)
@@ -148,26 +133,26 @@
 -->
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod" >
+            "xhtml11-model-1.mod" >
 
 <!-- Modular Framework Module (required) ......................... -->
 <!ENTITY % xhtml-framework.module "INCLUDE" >
 <![%xhtml-framework.module;[
 <!ENTITY % xhtml-framework.mod
      PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Modular Framework Module  ...................................... -->
 <!-- file: xhtml-framework-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-framework-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod"
 
      Revisions:
      (none)
@@ -202,7 +187,121 @@
 <!ENTITY % xhtml-notations.mod
      PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
             "xhtml-notations-1.mod" >
-%xhtml-notations.mod;]]>
+<!-- ...................................................................... -->
+<!-- XHTML Notations Module  .............................................. -->
+<!-- file: xhtml-notations-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-notations-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Notations
+
+     defines the following notations, many of these imported from
+     other specifications and standards. When an existing FPI is
+     known, it is incorporated here.
+-->
+
+<!-- XML Notations ..................................... -->
+<!-- SGML and XML Notations ............................ -->
+
+<!-- W3C XML 1.0 Recommendation -->
+<!NOTATION w3c-xml
+     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
+
+<!-- XML 1.0 CDATA -->
+<!NOTATION cdata
+     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
+
+<!-- SGML Formal Public Identifiers -->
+<!NOTATION fpi
+     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
+
+<!-- XHTML Notations ................................... -->
+
+<!-- Length defined for cellpadding/cellspacing -->
+
+<!-- nn for pixels or nn% for percentage length -->
+<!NOTATION length
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
+
+<!-- space-separated list of link types -->
+<!NOTATION linkTypes
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
+
+<!-- single or comma-separated list of media descriptors -->
+<!NOTATION mediaDesc
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
+
+<!-- pixel, percentage, or relative -->
+<!NOTATION multiLength
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
+
+<!-- one or more digits (NUMBER) -->
+<!NOTATION number
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
+
+<!-- integer representing length in pixels -->
+<!NOTATION pixels
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
+
+<!-- script expression -->
+<!NOTATION script
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
+
+<!-- textual content -->
+<!NOTATION text
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
+
+<!-- Imported Notations ................................ -->
+
+<!-- a single character from [ISO10646] -->
+<!NOTATION character
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
+
+<!-- a character encoding, as per [RFC2045] -->
+<!NOTATION charset
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
+
+<!-- a space separated list of character encodings, as per [RFC2045] -->
+<!NOTATION charsets
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
+
+<!-- media type, as per [RFC2045] -->
+<!NOTATION contentType
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
+
+<!-- comma-separated list of media types, as per [RFC2045] -->
+<!NOTATION contentTypes
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
+
+<!-- date and time information. ISO date format -->
+<!NOTATION datetime
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
+
+<!-- a language code, as per [RFC3066] -->
+<!NOTATION languageCode
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
+
+<!-- a Uniform Resource Identifier, see [URI] -->
+<!NOTATION uri
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
+
+<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
+<!NOTATION uris
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
+
+<!-- end of xhtml-notations-1.mod -->
+]]>
 
 <!ENTITY % xhtml-datatypes.module "INCLUDE" >
 <![%xhtml-datatypes.module;[
@@ -214,13 +313,13 @@
 <!-- file: xhtml-datatypes-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-datatypes-1.mod,v 4.1 2001/04/06 19:23:32 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-datatypes-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-datatypes-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
 
      Revisions:
      (none)
@@ -269,9 +368,6 @@
 <!-- a space separated list of character encodings, as per [RFC2045] -->
 <!ENTITY % Charsets.datatype "CDATA" >
 
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
 <!-- media type, as per [RFC2045] -->
 <!ENTITY % ContentType.datatype "CDATA" >
 
@@ -284,8 +380,8 @@
 <!-- formal public identifier, as per [ISO8879] -->
 <!ENTITY % FPI.datatype "CDATA" >
 
-<!-- a language code, as per [RFC3066] or its successor -->
-<!ENTITY % LanguageCode.datatype "CDATA" >
+<!-- a language code, as per [RFC3066] -->
+<!ENTITY % LanguageCode.datatype "NMTOKEN" >
 
 <!-- a Uniform Resource Identifier, see [URI] -->
 <!ENTITY % URI.datatype "CDATA" >
@@ -310,13 +406,13 @@
 <!-- file: xhtml-qname-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-qname-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-qname-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod"
 
      Revisions:
 #2000-10-22: added qname declarations for ruby elements
@@ -353,15 +449,6 @@
 <!ENTITY % NS.prefixed "IGNORE" >
 <!ENTITY % XHTML.prefixed "%NS.prefixed;" >
 
-<!-- By default, we always permit XHTML attribute collections to have
-     namespace-qualified prefixes as well.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
-<!-- By default, we allow the XML Schema attributes on the root
-     element.
--->
-<!ENTITY % XHTML.xsi.attrs "INCLUDE" >
-
 <!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
         the URI reference used to identify the XHTML namespace:
 -->
@@ -376,7 +463,7 @@
      NOTE: As specified in [XMLNAMES], the namespace prefix serves
      as a proxy for the URI reference, and is not in itself significant.
 -->
-<!ENTITY % XHTML.prefix  "xhtml" >
+<!ENTITY % XHTML.prefix  "" >
 
 <!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
         colonized prefix(es) (eg., '%XHTML.prefix;:') used when
@@ -406,12 +493,9 @@
      xmlns declaration for XHTML, its form dependent on whether
      prefixing is active.
 -->
-<!ENTITY % XHTML.xmlns.attrib.prefixed
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'"
->
 <![%XHTML.prefixed;[
 <!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.attrib.prefixed;
+     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
       %XHTML.xmlns.extra.attrib;"
 >
 ]]>
@@ -419,43 +503,10 @@
      "%XHTML.xmlns.extra.attrib;"
 >
 
-<!-- Declare a parameter entity %XSI.prefix as a prefix to use for XML
-     Schema Instance attributes.
--->
-<!ENTITY % XSI.prefix "xsi" >
-
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!-- Declare a parameter entity %XSI.xmlns.attrib as support for the
-     schemaLocation attribute, since this is legal throughout the DTD.
--->
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;   #FIXED '%XSI.xmlns;'" >
-
 <!-- This is a placeholder for future XLink support.
 -->
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- This is the attribute for the XML Schema namespace - XHTML
-     Modularization is also expressed in XML Schema, and it needs to
-	 be legal to declare the XML Schema namespace and the
-	 schemaLocation attribute on the root element of XHTML family
-	 documents.
--->
-<![%XHTML.xsi.attrs;[
-<!ENTITY % XSI.prefix "xsi" >
-<!ENTITY % XSI.pfx "%XSI.prefix;:" >
-<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
-
-<!ENTITY % XSI.xmlns.attrib
-     "xmlns:%XSI.prefix;  %URI.datatype;    #FIXED '%XSI.xmlns;'"
->
-]]>
-<!ENTITY % XSI.prefix "" >
-<!ENTITY % XSI.pfx "" >
-<!ENTITY % XSI.xmlns.attrib "" >
-
-
 <!-- Declare a parameter entity %NS.decl.attrib; containing all
      XML namespace declaration attributes used by XHTML, including
      a default xmlns attribute when prefixing is inactive.
@@ -463,14 +514,11 @@
 <![%XHTML.prefixed;[
 <!ENTITY % XHTML.xmlns.attrib
      "%NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 ]]>
 <!ENTITY % XHTML.xmlns.attrib
      "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %NS.decl.attrib;
-      %XSI.xmlns.attrib;
       %XLINK.xmlns.attrib;"
 >
 
@@ -635,13 +683,13 @@
 <!-- file: xhtml-events-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-events-1.mod,v 4.1 2001/04/10 09:42:30 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-events-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-events-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod"
 
      Revisions:
      (none)
@@ -649,7 +697,7 @@
 
 <!-- Intrinsic Event Attributes
 
-     These are the event attributes defined in HTML 4,
+     These are the event attributes defined in HTML 4.0,
      Section 18.2.3 "Intrinsic Events". This module must be
      instantiated prior to the Attributes Module but after
      the Datatype Module in the Modular Framework module.
@@ -681,21 +729,6 @@
       onkeyup      %Script.datatype;        #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.events.attrib
-     "%XHTML.prefix;:onclick      %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:ondblclick   %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmousedown  %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmouseup    %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmouseover  %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmousemove  %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onmouseout   %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onkeypress   %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onkeydown    %Script.datatype;        #IMPLIED
-      %XHTML.prefix;:onkeyup      %Script.datatype;        #IMPLIED"
->
-]]>
-
 <!-- additional attributes on anchor element
 -->
 <!ATTLIST %a.qname;
@@ -777,13 +810,13 @@
 <!-- file: xhtml-attribs-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-attribs-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-attribs-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
 
      Revisions:
      (none)
@@ -793,46 +826,20 @@
 
      This module declares many of the common attributes for the XHTML DTD.
      %NS.decl.attrib; is declared in the XHTML Qname module.
-
-	 Note that this file was extended in XHTML Modularization Second Edition to 
-	 include declarations of "global" versions of the attribute collections.
-	 The global versions of the attributes are for use on elements in other 
-	 namespaces.  The global version of "common" includes the xmlns declaration
-	 for the prefixed version of the xhtml namespace.  If you are only using a
-	 specific attribute or an individual attribute collection, you must also
-	 include the XHTML.xmlns.attrib.prefixed PE on your elements.
 -->
 
 <!ENTITY % id.attrib
      "id           ID                       #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.id.attrib
-     "%XHTML.prefix;:id           ID        #IMPLIED"
->
-]]>
-
 <!ENTITY % class.attrib
      "class        NMTOKENS                 #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.class.attrib
-     "%XHTML.prefix;:class        NMTOKENS                 #IMPLIED"
->
-]]>
-
 <!ENTITY % title.attrib
      "title        %Text.datatype;          #IMPLIED"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY % XHTML.global.title.attrib
-     "%XHTML.prefix;:title        %Text.datatype;          #IMPLIED"
->
-]]>
-
 <!ENTITY % Core.extra.attrib "" >
 
 <!ENTITY % Core.attrib
@@ -840,25 +847,9 @@
       %id.attrib;
       %class.attrib;
       %title.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
       %Core.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.core.extra.attrib "" >
-
-<![%XHTML.global.attrs.prefixed;[
-
-<!ENTITY % XHTML.global.core.attrib
-     "%XHTML.global.id.attrib;
-      %XHTML.global.class.attrib;
-      %XHTML.global.title.attrib;
-      %XHTML.global.core.extra.attrib;"
->
-]]>
-
-<!ENTITY % XHTML.global.core.attrib "" >
-
-
 <!ENTITY % lang.attrib
      "xml:lang     %LanguageCode.datatype;  #IMPLIED"
 >
@@ -873,31 +864,17 @@
       %lang.attrib;"
 >
 
-<![%XHTML.global.attrs.prefixed;[
-<!ENTITY XHTML.global.i18n.attrib
-     "%XHTML.prefix;:dir          ( ltr | rtl )            #IMPLIED
-      %lang.attrib;"
->
-]]>
-<!ENTITY XHTML.global.i18n.attrib "" >
-
 ]]>
 <!ENTITY % I18n.attrib
      "%lang.attrib;"
 >
-<!ENTITY % XHTML.global.i18n.attrib
-     "%lang.attrib;"
->
 
 <!ENTITY % Common.extra.attrib "" >
-<!ENTITY % XHTML.global.common.extra.attrib "" >
 
 <!-- intrinsic event attributes declared previously
 -->
 <!ENTITY % Events.attrib "" >
 
-<!ENTITY % XHTML.global.events.attrib "" >
-
 <!ENTITY % Common.attrib
      "%Core.attrib;
       %I18n.attrib;
@@ -905,14 +882,6 @@
       %Common.extra.attrib;"
 >
 
-<!ENTITY % XHTML.global.common.attrib
-     "%XHTML.xmlns.attrib.prefixed;
-      %XHTML.global.core.attrib;
-	  %XHTML.global.i18n.attrib;
-	  %XHTML.global.events.attrib;
-	  %XHTML.global.common.extra.attrib;"
->
-
 <!-- end of xhtml-attribs-1.mod -->
 ]]>
 
@@ -929,13 +898,13 @@
 <!-- file: xhtml11-model-1.mod
 
      This is XHTML 1.1, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-model-1.mod,v 1.14 2005/04/13 12:25:16 mimasa Exp $ SMI
+     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml11-model-1.mod,v 1.12 2000/11/18 18:20:25 ahby Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml11/DTD/xhtml11-model-1.mod"
 
      Revisions:
      (none)
@@ -1186,13 +1155,13 @@
 <!-- file: xhtml-charent-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-charent-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-charent-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
 
      Revisions:
      (none)
@@ -1235,7 +1204,7 @@
 <!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
 <!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
                                   = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
+<!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
                                   U+00AC ISOnum -->
 <!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
                                   U+00AD ISOnum -->
@@ -1399,7 +1368,7 @@
                                   U+00FC ISOlat1 -->
 <!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
                                   U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn,
+<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
                                   U+00FE ISOlat1 -->
 <!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
                                   U+00FF ISOlat1 -->
@@ -1408,7 +1377,7 @@
 <!ENTITY % xhtml-symbol
     PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
            "xhtml-symbol.ent" >
-<!-- Mathematical, Greek and Symbolic characters for XHTML -->
+<!-- Mathematical, Greek and Symbolic characters for HTML -->
 
 <!-- Character entity set. Typical invocation:
      <!ENTITY % HTMLsymbol PUBLIC
@@ -1432,7 +1401,7 @@
 -->
 
 <!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small letter f with hook = function
+<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
                                     = florin, U+0192 ISOtech -->
 
 <!-- Greek -->
@@ -1449,7 +1418,7 @@
                                     U+0398 ISOgrk3 -->
 <!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
 <!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lamda,
+<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
                                     U+039B ISOgrk3 -->
 <!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
 <!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
@@ -1487,7 +1456,7 @@
 <!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
 <!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
                                     U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lamda,
+<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
                                     U+03BB ISOgrk3 -->
 <!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
 <!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
@@ -1507,7 +1476,7 @@
 <!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
 <!ENTITY omega    "&#969;"> <!-- greek small letter omega,
                                     U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek theta symbol,
+<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
                                     U+03D1 NEW -->
 <!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
                                     U+03D2 NEW -->
@@ -1529,9 +1498,9 @@
 <!-- Letterlike Symbols -->
 <!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
                                      = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- black-letter capital I = imaginary part,
+<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
                                      U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- black-letter capital R = real part symbol,
+<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
                                      U+211C ISOamso -->
 <!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
 <!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
@@ -1549,14 +1518,14 @@
                                      = carriage return, U+21B5 NEW -->
 <!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
 <!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So lArr can
+    but also does not have any other character for that function. So ? lArr can
     be used for 'is implied by' as ISOtech suggests -->
 <!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
 <!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
                                      U+21D2 ISOtech -->
 <!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so rArr can be used for 'implies'
-     as ISOtech suggests -->
+     another character with this function so ?
+     rArr can be used for 'implies' as ISOtech suggests -->
 <!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
 <!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
                                      U+21D4 ISOamsa -->
@@ -1565,17 +1534,19 @@
 <!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
 <!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
 <!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set, U+2205 ISOamso -->
+<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
+                                     U+2205 ISOamso -->
 <!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
                                      U+2207 ISOtech -->
 <!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
 <!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
 <!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
+<!-- should there be a more memorable name than 'ni'? -->
 <!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
                                      U+220F ISOamsb -->
 <!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
      the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary summation, U+2211 ISOamsb -->
+<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
 <!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
      though the same glyph might be used for both -->
 <!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
@@ -1605,6 +1576,9 @@
                                      U+2265 ISOtech -->
 <!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
 <!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
+<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
+     font encoding and is not included. Should it be, for symmetry?
+     It is in ISOamsn  --> 
 <!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
 <!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
 <!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
@@ -1619,19 +1593,19 @@
 <!-- dot operator is NOT the same character as U+00B7 middle dot -->
 
 <!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = APL upstile,
+<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
                                      U+2308 ISOamsc  -->
 <!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = APL downstile,
+<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
                                      U+230A ISOamsc  -->
 <!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
 <!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
                                      U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than sign' 
+<!-- lang is NOT the same character as U+003C 'less than' 
      or U+2039 'single left-pointing angle quotation mark' -->
 <!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
                                      U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than sign' 
+<!-- rang is NOT the same character as U+003E 'greater than' 
      or U+203A 'single right-pointing angle quotation mark' -->
 
 <!-- Geometric Shapes -->
@@ -1650,7 +1624,7 @@
 <!ENTITY % xhtml-special
     PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
            "xhtml-special.ent" >
-<!-- Special characters for XHTML -->
+<!-- Special characters for HTML -->
 
 <!-- Character entity set. Typical invocation:
      <!ENTITY % HTMLspecial PUBLIC
@@ -1674,11 +1648,12 @@
 -->
 
 <!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark, U+0022 ISOnum -->
+<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
+                                    U+0022 ISOnum -->
 <!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
 <!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
 <!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe = APL quote, U+0027 ISOnum -->
+<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
 
 <!-- Latin Extended-A -->
 <!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
@@ -1727,8 +1702,6 @@
 <!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
                                     U+203A ISO proposed -->
 <!-- rsaquo is proposed but not yet ISO standardized -->
-
-<!-- Currency Symbols -->
 <!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
 
 
@@ -1752,19 +1725,19 @@
 <![%xhtml-text.module;[
 <!ENTITY % xhtml-text.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Text Module  ................................................... -->
 <!-- file: xhtml-text-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-text-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"
 
      Revisions:
      (none)
@@ -1786,13 +1759,13 @@
 <!-- file: xhtml-inlstruct-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-inlstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod"
 
      Revisions:
      (none)
@@ -1855,13 +1828,13 @@
 <!-- file: xhtml-inlphras-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-inlphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod"
 
      Revisions:
      (none)
@@ -2065,13 +2038,13 @@
 <!-- file: xhtml-blkstruct-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-blkstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkstruct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
 
      Revisions:
      (none)
@@ -2129,13 +2102,13 @@
 <!-- file: xhtml-blkphras-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-blkphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkphras-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
 
      Revisions:
      (none)
@@ -2201,6 +2174,7 @@
 <![%pre.attlist;[
 <!ATTLIST %pre.qname;
       %Common.attrib;
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of pre.attlist -->]]>
 
@@ -2297,19 +2271,19 @@
 <![%xhtml-hypertext.module;[
 <!ENTITY % xhtml-hypertext.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Hypertext Module  .............................................. -->
 <!-- file: xhtml-hypertext-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-hypertext-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"
 
      Revisions:
      (none)
@@ -2359,19 +2333,19 @@
 <![%xhtml-list.module;[
 <!ENTITY % xhtml-list.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Lists Module  .................................................. -->
 <!-- file: xhtml-list-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-list-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"
 
      Revisions:
      (none)
@@ -2498,19 +2472,19 @@
 <![%xhtml-edit.module;[
 <!ENTITY % xhtml-edit.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-edit-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Editing Elements Module  ....................................... -->
 <!-- file: xhtml-edit-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-edit-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-edit-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod"
 
      Revisions:
      (none)
@@ -2572,19 +2546,19 @@
 <![%xhtml-bdo.module;[
 <!ENTITY % xhtml-bdo.mod
      PUBLIC "-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-bdo-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML BDO Element Module ............................................. -->
 <!-- file: xhtml-bdo-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-bdo-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML BDO Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-bdo-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod"
 
      Revisions:
      (none)
@@ -2879,19 +2853,19 @@
 <![%xhtml-pres.module;[
 <!ENTITY % xhtml-pres.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Presentation Module ............................................ -->
 <!-- file: xhtml-pres-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-pres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod"
 
      Revisions:
      (none)
@@ -2913,13 +2887,13 @@
 <!-- file: xhtml-inlpres-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-inlpres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-inlpres-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod"
 
      Revisions:
      (none)
@@ -3058,13 +3032,13 @@
 <!-- file: xhtml-blkpres-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-blkpres-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-blkpres-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
 
      Revisions:
      (none)
@@ -3103,19 +3077,19 @@
 <![%xhtml-link.module;[
 <!ENTITY % xhtml-link.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Link Element Module  ........................................... -->
 <!-- file: xhtml-link-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-link-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-link-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"
 
      Revisions:
      (none)
@@ -3133,7 +3107,7 @@
         previous, next, index, end, help
      b) to link to a separate style sheet (rel="stylesheet")
      c) to make a link to a script (rel="script")
-     d) by style sheets to control how collections of html nodes are
+     d) by stylesheets to control how collections of html nodes are
         rendered into printed documents
      e) to make a link to a printable version of this document
         e.g. a postscript or pdf version (rel="alternate" media="print")
@@ -3170,19 +3144,19 @@
 <![%xhtml-meta.module;[
 <!ENTITY % xhtml-meta.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Document Metainformation Module  ............................... -->
 <!-- file: xhtml-meta-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-meta-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"
 
      Revisions:
      (none)
@@ -3225,19 +3199,19 @@
 <![%xhtml-base.module;[
 <!ENTITY % xhtml-base.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Base Element Module  ........................................... -->
 <!-- file: xhtml-base-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-base-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
 
      Revisions:
      (none)
@@ -3286,19 +3260,19 @@
 <![%xhtml-script.module;[
 <!ENTITY % xhtml-script.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-script-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Document Scripting Module  ..................................... -->
 <!-- file: xhtml-script-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-script-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-script-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod"
 
      Revisions:
      (none)
@@ -3326,11 +3300,11 @@
 <![%script.attlist;[
 <!ATTLIST %script.qname;
       %XHTML.xmlns.attrib;
-	  %id.attrib;
       charset      %Charset.datatype;       #IMPLIED
       type         %ContentType.datatype;   #REQUIRED
       src          %URI.datatype;           #IMPLIED
       defer        ( defer )                #IMPLIED
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of script.attlist -->]]>
 
@@ -3360,19 +3334,19 @@
 <![%xhtml-style.module;[
 <!ENTITY % xhtml-style.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-style-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod" >
 <!-- ...................................................................... -->
-<!-- XHTML Document Style Sheet Module  ................................... -->
+<!-- XHTML Document Style Sheet Module  .................................... -->
 <!-- file: xhtml-style-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-style-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-style-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-style-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"
 
      Revisions:
      (none)
@@ -3383,10 +3357,10 @@
         style
 
      This module declares the style element type and its attributes,
-     used to embed style sheet information in the document head element.
+     used to embed stylesheet information in the document head element.
 -->
 
-<!-- style: Style Sheet Information .................... -->
+<!-- style: Style Sheet Information ..................... -->
 
 <!ENTITY % style.element  "INCLUDE" >
 <![%style.element;[
@@ -3399,11 +3373,11 @@
 <![%style.attlist;[
 <!ATTLIST %style.qname;
       %XHTML.xmlns.attrib;
-      %id.attrib;
       %title.attrib;
       %I18n.attrib;
       type         %ContentType.datatype;   #REQUIRED
       media        %MediaDesc.datatype;     #IMPLIED
+      xml:space    ( preserve )             #FIXED 'preserve'
 >
 <!-- end of style.attlist -->]]>
 
@@ -3415,19 +3389,19 @@
 <![%xhtml-image.module;[
 <!ENTITY % xhtml-image.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Images Module  ................................................. -->
 <!-- file: xhtml-image-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Rovision: $Id: xhtml-image-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"
 
      Revisions:
      (none)
@@ -3473,19 +3447,19 @@
 <![%xhtml-csismap.module;[
 <!ENTITY % xhtml-csismap.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-csismap-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Client-side Image Map Module  .................................. -->
 <!-- file: xhtml-csismap-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-csismap-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-csismap-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod"
 
      Revisions:
      (none)
@@ -3595,19 +3569,19 @@
 <![%xhtml-ssismap.module;[
 <!ENTITY % xhtml-ssismap.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-ssismap-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Server-side Image Map Module  .................................. -->
 <!-- file: xhtml-ssismap-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-ssismap-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-ssismap-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod"
 
      Revisions:
 #2000-10-22: added declaration for 'ismap' on <input>
@@ -3635,19 +3609,19 @@
 <![%xhtml-param.module;[
 <!ENTITY % xhtml-param.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Param Element Module  ..................................... -->
 <!-- file: xhtml-param-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-param-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"
 
      Revisions:
      (none)
@@ -3691,19 +3665,19 @@
 <![%xhtml-object.module;[
 <!ENTITY % xhtml-object.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Embedded Object Module  ........................................ -->
 <!-- file: xhtml-object-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-object-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod"
 
      Revisions:
      (none)
@@ -3759,19 +3733,19 @@
 <![%xhtml-table.module;[
 <!ENTITY % xhtml-table.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-table-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Table Module  .................................................. -->
 <!-- file: xhtml-table-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-table-1.mod,v 4.1 2001/04/10 09:42:30 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-table-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-table-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod"
 
      Revisions:
      (none)
@@ -3782,7 +3756,7 @@
         table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
 
      This module declares element types and attributes used to provide
-     table markup similar to HTML 4, including features that enable
+     table markup similar to HTML 4.0, including features that enable
      better accessibility for non-visual user agents.
 -->
 
@@ -4100,19 +4074,19 @@
 <![%xhtml-form.module;[
 <!ENTITY % xhtml-form.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Forms Module  .................................................. -->
 <!-- file: xhtml-form-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-form-1.mod,v 4.1 2001/04/10 09:42:30 altheim Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-form-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod"
 
      Revisions:
      (none)
@@ -4124,7 +4098,7 @@
         textarea, fieldset, legend, button
 
      This module declares markup to provide support for online
-     forms, based on the features found in HTML 4 forms.
+     forms, based on the features found in HTML 4.0 forms.
 -->
 
 <!-- declare qualified element type names:
@@ -4394,73 +4368,12 @@
 <!-- end of xhtml-form-1.mod -->
 ]]>
 
-<!-- Target Attribute Module  .................................... -->
-<!ENTITY % xhtml-target.module "INCLUDE" >
-<![%xhtml-target.module;[
-<!ENTITY % xhtml-target.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-target-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Target Module  ................................................. -->
-<!-- file: xhtml-target-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-target-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-target-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Target 
-
-        target
-
-     This module declares the 'target' attribute used for opening windows
--->
-
-<!-- render in this frame --> 
-<!ENTITY % FrameTarget.datatype "CDATA" >
-
-<!-- add 'target' attribute to 'a' element -->
-<!ATTLIST %a.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- add 'target' attribute to 'area' element -->
-<!ATTLIST %area.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- add 'target' attribute to 'link' element -->
-<!ATTLIST %link.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- add 'target' attribute to 'form' element -->
-<!ATTLIST %form.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- add 'target' attribute to 'base' element -->
-<!ATTLIST %base.qname;
-      target       %FrameTarget.datatype;   #IMPLIED
->
-
-<!-- end of xhtml-target-1.mod -->
-]]>
-
 <!-- Legacy Markup ............................................... -->
 <!ENTITY % xhtml-legacy.module "IGNORE" >
 <![%xhtml-legacy.module;[
 <!ENTITY % xhtml-legacy.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-legacy-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-legacy-1.mod" >
 %xhtml-legacy.mod;]]>
 
 <!-- Document Structure Module (required)  ....................... -->
@@ -4468,19 +4381,19 @@
 <![%xhtml-struct.module;[
 <!ENTITY % xhtml-struct.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
 <!-- ...................................................................... -->
 <!-- XHTML Structure Module  .............................................. -->
 <!-- file: xhtml-struct-1.mod
 
      This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
      Revision: $Id: xhtml-struct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod"
 
      Revisions:
      (none)
@@ -4553,7 +4466,7 @@
 <!ENTITY % body.element  "INCLUDE" >
 <![%body.element;[
 <!ENTITY % body.content
-     "( %Block.mix; )*"
+     "( %Block.mix; )+"
 >
 <!ENTITY % body.qname  "body" >
 <!ELEMENT %body.qname;  %body.content; >
@@ -4575,14 +4488,6 @@
 <!ELEMENT %html.qname;  %html.content; >
 <!-- end of html.element -->]]>
 
-<![%XHTML.xsi.attrs;[
-<!-- define a parameter for the XSI schemaLocation attribute -->
-<!ENTITY % XSI.schemaLocation.attrib
-     "%XSI.pfx;schemaLocation  %URIs.datatype;    #IMPLIED"
->
-]]>
-<!ENTITY % XSI.schemaLocation.attrib "">
-
 <!ENTITY % html.attlist  "INCLUDE" >
 <![%html.attlist;[
 <!-- version attribute value defined in driver
@@ -4590,18 +4495,12 @@
 <!ENTITY % XHTML.version.attrib
      "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
 >
-<!-- schemaLocation attribute from XML Schema
--->
-<!ENTITY % XSI.schemaLocation.attrib
-     "schemaLocation   %URIs.datatype;      #IMPLIED"
->
 
 <!-- see the Qualified Names module for information
      on how to extend XHTML using XML namespaces
 -->
 <!ATTLIST %html.qname;
       %XHTML.xmlns.attrib;
-      %XSI.schemaLocation.attrib;
       %XHTML.version.attrib;
       %I18n.attrib;
 >
--- xhtml11-model-1.mod	2007-02-16 08:16:49.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml11-20010531/xhtml11-model-1.mod	2001-06-23 11:40:38.000000000 +0900
@@ -3,13 +3,13 @@
 <!-- file: xhtml11-model-1.mod
 
      This is XHTML 1.1, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2007 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-model-1.mod,v 1.8 2007/02/15 21:56:54 jigsaw Exp $ SMI
+     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+     Revision: $Id: xhtml11-model-1.mod,v 1.13 2001/05/29 16:37:01 ahby Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
        PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod"
+       SYSTEM "http://www.w3.org/TR/xhtml11/DTD/xhtml11-model-1.mod"
 
      Revisions:
      (none)
--- xhtml11.dtd	2007-02-16 08:16:49.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml11-20010531/xhtml11.dtd	2001-06-23 11:40:38.000000000 +0900
@@ -1,16 +1,15 @@
 <!-- ....................................................................... -->
 <!-- XHTML 1.1 DTD  ........................................................ -->
-<!-- file: xhtml11.dtd
--->
+<!-- $Id$ -->
 
 <!-- XHTML 1.1 DTD
 
      This is XHTML, a reformulation of HTML as a modular XML application.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2007 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research Consortium
-         for Informatics and Mathematics, Keio University).
+     Copyright 1998-2001 World Wide Web Consortium
+        (Massachusetts Institute of Technology, Institut National de
+         Recherche en Informatique et en Automatique, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML DTD and its 
@@ -22,12 +21,12 @@
      It is provided "as is" without expressed or implied warranty.
 
         Author:     Murray M. Altheim <altheim@eng.sun.com>
-        Revision:   $Id: xhtml11.dtd,v 1.8 2007/02/15 21:56:58 jigsaw Exp $
+        Revision:   $Id: xhtml11.dtd,v 1.21 2001/05/29 16:37:01 ahby Exp $
 
 -->
 <!-- This is the driver file for version 1.1 of the XHTML DTD.
 
-     Please use this public identifier to identify it:
+     Please use this formal public identifier to identify it:
 
          "-//W3C//DTD XHTML 1.1//EN"
 -->
@@ -39,33 +38,21 @@
 
      See the Qualified Names module for information
      on the use of namespace prefixes in the DTD.
-
-	 Note that XHTML namespace elements are not prefixed by default,
-	 but the XHTML namespace prefix is defined as "xhtml" so that
-	 other markup languages can extend this one and use the XHTML
-	 prefixed global attributes if required.
-
 -->
 <!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "xhtml" >
-
-<!-- Be sure to include prefixed global attributes - we don't need
-     them, but languages that extend XHTML 1.1 might.
--->
-<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
+<!ENTITY % XHTML.prefix "" >
 
 <!-- Reserved for use with the XLink namespace:
 -->
 <!ENTITY % XLINK.xmlns "" >
 <!ENTITY % XLINK.xmlns.attrib "" >
 
-<!-- For example, if you are using XHTML 1.1 directly, use the public
-     identifier in the DOCTYPE declaration, with the namespace declaration
-     on the document element to identify the default namespace:
+<!-- For example, if you are using XHTML 1.1 directly, use the FPI
+     in the DOCTYPE declaration, with the xmlns attribute on the
+     document element to identify the default namespace:
 
        <?xml version="1.0"?>
-       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-                             "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
        <html xmlns="http://www.w3.org/1999/xhtml"
              xml:lang="en">
        ...
@@ -78,9 +65,6 @@
 <!-- reserved for future use with document profiles -->
 <!ENTITY % XHTML.profile  "" >
 
-<!-- ensure XHTML Notations are disabled -->
-<!ENTITY % xhtml-notations.module "IGNORE" >
-
 <!-- Bidirectional Text features
      This feature-test entity is used to declare elements
      and attributes used for bidirectional text support.
@@ -107,21 +91,21 @@
 <![%xhtml-inlstyle.module;[
 <!ENTITY % xhtml-inlstyle.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
 %xhtml-inlstyle.mod;]]>
 
 <!-- declare Document Model module instantiated in framework
 -->
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod" >
+            "xhtml11-model-1.mod" >
 
 <!-- Modular Framework Module (required) ......................... -->
 <!ENTITY % xhtml-framework.module "INCLUDE" >
 <![%xhtml-framework.module;[
 <!ENTITY % xhtml-framework.mod
      PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
 %xhtml-framework.mod;]]>
 
 <!-- Post-Framework Redeclaration placeholder  ................... -->
@@ -138,7 +122,7 @@
 <![%xhtml-text.module;[
 <!ENTITY % xhtml-text.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
 %xhtml-text.mod;]]>
 
 <!-- Hypertext Module (required) ................................. -->
@@ -146,7 +130,7 @@
 <![%xhtml-hypertext.module;[
 <!ENTITY % xhtml-hypertext.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
 %xhtml-hypertext.mod;]]>
 
 <!-- Lists Module (required)  .................................... -->
@@ -154,7 +138,7 @@
 <![%xhtml-list.module;[
 <!ENTITY % xhtml-list.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
 %xhtml-list.mod;]]>
 
 <!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
@@ -164,7 +148,7 @@
 <![%xhtml-edit.module;[
 <!ENTITY % xhtml-edit.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-edit-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod" >
 %xhtml-edit.mod;]]>
 
 <!-- BIDI Override Module  ....................................... -->
@@ -172,7 +156,7 @@
 <![%xhtml-bdo.module;[
 <!ENTITY % xhtml-bdo.mod
      PUBLIC "-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-bdo-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod" >
 %xhtml-bdo.mod;]]>
 
 <!-- Ruby Module  ................................................ -->
@@ -190,7 +174,7 @@
 <![%xhtml-pres.module;[
 <!ENTITY % xhtml-pres.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod" >
 %xhtml-pres.mod;]]>
 
 <!-- Link Element Module  ........................................ -->
@@ -198,7 +182,7 @@
 <![%xhtml-link.module;[
 <!ENTITY % xhtml-link.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
 %xhtml-link.mod;]]>
 
 <!-- Document Metainformation Module  ............................ -->
@@ -206,7 +190,7 @@
 <![%xhtml-meta.module;[
 <!ENTITY % xhtml-meta.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
 %xhtml-meta.mod;]]>
 
 <!-- Base Element Module  ........................................ -->
@@ -214,7 +198,7 @@
 <![%xhtml-base.module;[
 <!ENTITY % xhtml-base.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
 %xhtml-base.mod;]]>
 
 <!-- Scripting Module  ........................................... -->
@@ -222,7 +206,7 @@
 <![%xhtml-script.module;[
 <!ENTITY % xhtml-script.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-script-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod" >
 %xhtml-script.mod;]]>
 
 <!-- Style Sheets Module  ......................................... -->
@@ -230,7 +214,7 @@
 <![%xhtml-style.module;[
 <!ENTITY % xhtml-style.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-style-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod" >
 %xhtml-style.mod;]]>
 
 <!-- Image Module  ............................................... -->
@@ -238,7 +222,7 @@
 <![%xhtml-image.module;[
 <!ENTITY % xhtml-image.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
 %xhtml-image.mod;]]>
 
 <!-- Client-side Image Map Module  ............................... -->
@@ -246,7 +230,7 @@
 <![%xhtml-csismap.module;[
 <!ENTITY % xhtml-csismap.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-csismap-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod" >
 %xhtml-csismap.mod;]]>
 
 <!-- Server-side Image Map Module  ............................... -->
@@ -254,7 +238,7 @@
 <![%xhtml-ssismap.module;[
 <!ENTITY % xhtml-ssismap.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-ssismap-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod" >
 %xhtml-ssismap.mod;]]>
 
 <!-- Param Element Module  ....................................... -->
@@ -262,7 +246,7 @@
 <![%xhtml-param.module;[
 <!ENTITY % xhtml-param.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
 %xhtml-param.mod;]]>
 
 <!-- Embedded Object Module  ..................................... -->
@@ -270,7 +254,7 @@
 <![%xhtml-object.module;[
 <!ENTITY % xhtml-object.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
 %xhtml-object.mod;]]>
 
 <!-- Tables Module ............................................... -->
@@ -278,7 +262,7 @@
 <![%xhtml-table.module;[
 <!ENTITY % xhtml-table.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-table-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod" >
 %xhtml-table.mod;]]>
 
 <!-- Forms Module  ............................................... -->
@@ -286,23 +270,15 @@
 <![%xhtml-form.module;[
 <!ENTITY % xhtml-form.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod" >
 %xhtml-form.mod;]]>
 
-<!-- Target Attribute Module  .................................... -->
-<!ENTITY % xhtml-target.module "INCLUDE" >
-<![%xhtml-target.module;[
-<!ENTITY % xhtml-target.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-target-1.mod" >
-%xhtml-target.mod;]]>
-
 <!-- Legacy Markup ............................................... -->
 <!ENTITY % xhtml-legacy.module "IGNORE" >
 <![%xhtml-legacy.module;[
 <!ENTITY % xhtml-legacy.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-legacy-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-legacy-1.mod" >
 %xhtml-legacy.mod;]]>
 
 <!-- Document Structure Module (required)  ....................... -->
@@ -310,7 +286,7 @@
 <![%xhtml-struct.module;[
 <!ENTITY % xhtml-struct.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" >
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
 %xhtml-struct.mod;]]>
 
 <!-- end of XHTML 1.1 DTD  ................................................. -->
--- xml1.dcl	2007-02-16 08:16:49.000000000 +0900
+++ htdocs/sgml-lib/REC-xhtml11-20010531/xml1.dcl	2001-06-23 11:40:38.000000000 +0900
@@ -9,6 +9,7 @@
 
         changes made to accommodate validation are noted with 'VALID:'
      --
+     -- $Id: xml1.dcl,v 1.1 2001/06/23 02:40:38 link Exp $ --
 
      CHARSET
          BASESET
@@ -185,8 +186,4 @@
 
      SEEALSO "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN"
 >
-<!-- Id: @(#)xml1.dcl 1.7 2000/12/18 SMI
-     Revisions:
-#1999-04-09  changes for XML validation
-#2000-12-18  fixed the wrong ISO registration number of UCS-4
- -->
+