markup-validator commit: Update XHTML-Print to 2nd edition (cosmetic changes only).

changeset:   3169:95b91fd92b33
tag:         tip
user:        Ville Skyttä <ville.skytta@iki.fi>
date:        Thu Nov 25 23:45:04 2010 +0200
files:       htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10-model-1.mod htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10.dtd htdocs/sgml-lib/REC-xhtml-print-20101123/xhtml-print10-model-1.mod htdocs/sgml-lib/REC-xhtml-print-20101123/xhtml-print10.dtd htdocs/sgml-lib/catalog.xml htdocs/sgml-lib/xml.soc
description:
Update XHTML-Print to 2nd edition (cosmetic changes only).


diff -r 09bfd038e766 -r 95b91fd92b33 htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10-model-1.mod
--- a/htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10-model-1.mod	Thu Nov 25 23:39:49 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-<!-- ....................................................................... -->
-<!-- XHTML-Print 1.0 Document Model Module ................................. -->
-<!-- file: xhtml-print10-model-1.mod
-
-     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 $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-        PUBLIC "-//W3C//ENTITIES XHTML-Print 1.0 Document Model 1.0//EN"
-        SYSTEM "http://www.w3c.org/MarkUp/DTD/xhtml-print10-model-1.mod
-
-     ....................................................................... -->
-
-<!-- XHTML-Print 1.0 Document Model
-
-     This module describes the groupings of elements that make up
-     common content models for XHTML-Print elements.
--->
-
-<!-- Optional Elements in head ......................... -->
-
-<!ENTITY % HeadOpts.mix
-     "( %script.qname; | %style.qname; | %meta.qname; | %link.qname;
-      | %object.qname; )*" >
-
-<!-- Miscellaneous Elements ............................ -->
-
-<!ENTITY % Script.class "| %script.qname; | %noscript.qname;" >
-
-<!ENTITY % Misc.extra "" >
-
-<!ENTITY % Misc.class
-     "%Script.class;
-      %Misc.extra;"
->
-
-<!-- Inline Elements ................................... -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
-     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
-      | %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 % I18n.class "" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
-
-<!ENTITY % InlForm.class
-     "| %input.qname; | %select.qname; | %textarea.qname;
-      | %label.qname;"
->
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Inline.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.mix
-     "%InlNoAnchor.class;
-      %Misc.class;"
->
-
-<!ENTITY % Inline.mix
-     "%Inline.class;
-      %Misc.class;"
->
-
-<!-- Block Elements .................................... -->
-
-<!ENTITY % Heading.class
-     "%h1.qname; | %h2.qname; | %h3.qname;
-      | %h4.qname; | %h5.qname; | %h6.qname;"
->
-<!ENTITY % List.class  "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class  "| %form.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
-     "| %pre.qname; | %blockquote.qname; | %address.qname;"
->
-
-<!ENTITY % BlkPres.class "| %hr.qname;" >
-
-<!ENTITY % BlkSpecial.class
-     "%Table.class;
-      %Form.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!ENTITY % Block.class
-     "%BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %BlkSpecial.class;
-      %Block.extra;"
->
-
-<!ENTITY % Block.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      %Misc.class;"
->
-
-<!-- All Content Elements .............................. -->
-
-<!ENTITY % FlowNoTable.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %Form.class;
-      %Block.extra;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!ENTITY % Flow.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!-- end of xhtml-print10-model-1.mod -->
diff -r 09bfd038e766 -r 95b91fd92b33 htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10.dtd
--- a/htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10.dtd	Thu Nov 25 23:39:49 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-<!-- ....................................................................... -->
-<!-- XHTML-Print 1.0 DTD ................................................... -->
-<!-- file: xhtml-print10.dtd
--->
-
-<!-- XHTML-Print 1.0 DTD
-
-     This is XHTML-Print 1.0, a variant of XHTML Basic for printing.
-
-     Copyright 1998-2003 World Wide Web Consortium
-        (Massachusetts Institute of Technology, European Research
-         Consortium for Informatics and Mathematics, Keio University).
-         All Rights Reserved.
-
-     Permission to use, copy, modify and distribute the XHTML-Print DTD and
-     its accompanying documentation for any purpose and without fee is hereby
-     granted in perpetuity, provided that the above copyright notice and
-     this paragraph appear in all copies.  The copyright holders make no
-     representation about the suitability of the DTD for any purpose.
-
-     It is provided "as is" without expressed or implied warranty.
-
-        Primary Author: Jun Fujisawa <fujisawa.jun@canon.co.jp>
-        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 $
-
--->
-<!-- This is the driver file for version 1.0 of the XHTML-Print DTD.
-
-     This DTD is identified by the PUBLIC and SYSTEM identifiers:
-
-        PUBLIC "-//W3C//DTD XHTML-Print 1.0//EN"
-        SYSTEM "http://www.w3c.org/MarkUp/DTD/xhtml-print10.dtd"
--->
-<!ENTITY % XHTML.version "-//W3C//DTD XHTML-Print 1.0//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
-         "http://www.w3.org/1999/xhtml"
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "" >
-
-<!-- Reserved for use with the XLink namespace:
--->
-<!ENTITY % XLINK.xmlns "" >
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile "" >
-
-<!-- Bidirectional Text features
-     This feature-test entity is used to declare elements
-     and attributes used for bidirectional text support.
--->
-<!ENTITY % XHTML.bidi "IGNORE" >
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!ENTITY % xhtml-events.module "IGNORE" >
-<!ENTITY % xhtml-bdo.module "%XHTML.bidi;" >
-
-<!-- Style Attribute Module ............................ -->
-<!ENTITY % xhtml-inlstyle.module "INCLUDE" >
-<![%xhtml-inlstyle.module;[
-<!ENTITY % xhtml-inlstyle.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
-%xhtml-inlstyle.mod;]]>
-
-<!-- Document Model Module ............................. -->
-<!ENTITY % xhtml-model.mod
-     PUBLIC "-//W3C//ENTITIES XHTML-Print 1.0 Document Model 1.0//EN"
-            "xhtml-print10-model-1.mod" >
-
-<!-- Modular Framework Module (required) ............... -->
-<!ENTITY % xhtml-framework.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
-%xhtml-framework.mod;
-
-<!-- Text Module (required) ............................ -->
-<!ENTITY % xhtml-text.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
-%xhtml-text.mod;
-
-<!-- Hypertext Module (required) ....................... -->
-<!ENTITY % xhtml-hypertext.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
-%xhtml-hypertext.mod;
-
-<!-- Lists Module (required) ........................... -->
-<!ENTITY % xhtml-list.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
-%xhtml-list.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/TR/xhtml-modularization/DTD/xhtml-pres-1.mod" >
-%xhtml-pres.mod;]]>
-
-<!-- Image Module ...................................... -->
-<!ENTITY % xhtml-image.module "INCLUDE" >
-<![%xhtml-image.module;[
-<!ENTITY % xhtml-image.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
-%xhtml-image.mod;]]>
-
-<!-- Tables Module ..................................... -->
-<!ENTITY % xhtml-table.module "INCLUDE" >
-<![%xhtml-table.module;[
-<!ENTITY % xhtml-table.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod" >
-%xhtml-table.mod;]]>
-
-<!-- Forms Module ...................................... -->
-<!ENTITY % xhtml-form.module "INCLUDE" >
-<![%xhtml-form.module;[
-<!ENTITY % xhtml-form.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod" >
-%xhtml-form.mod;]]>
-
-<!-- Scripting Module  ................................. -->
-<!ENTITY % xhtml-script.module "INCLUDE" >
-<![%xhtml-script.module;[
-<!ENTITY % xhtml-script.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod" >
-%xhtml-script.mod;]]>
-
-<!-- Style Sheet Module ................................ -->
-<!ENTITY % xhtml-style.module "INCLUDE" >
-<![%xhtml-style.module;[
-<!ENTITY % xhtml-style.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod" >
-%xhtml-style.mod;]]>
-
-<!-- Link Module ....................................... -->
-<!ENTITY % xhtml-link.module "INCLUDE" >
-<![%xhtml-link.module;[
-<!ENTITY % xhtml-link.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
-%xhtml-link.mod;]]>
-
-<!-- Metainformation Module ............................ -->
-<!ENTITY % xhtml-meta.module "INCLUDE" >
-<![%xhtml-meta.module;[
-<!ENTITY % xhtml-meta.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
-%xhtml-meta.mod;]]>
-
-<!-- Base Module ....................................... -->
-<!ENTITY % xhtml-base.module "INCLUDE" >
-<![%xhtml-base.module;[
-<!ENTITY % xhtml-base.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
-%xhtml-base.mod;]]>
-
-<!-- Param Module ...................................... -->
-<!ENTITY % xhtml-param.module "INCLUDE" >
-<![%xhtml-param.module;[
-<!ENTITY % xhtml-param.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
-%xhtml-param.mod;]]>
-
-<!-- Object Module ..................................... -->
-<!ENTITY % xhtml-object.module "INCLUDE" >
-<![%xhtml-object.module;[
-<!ENTITY % xhtml-object.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
-%xhtml-object.mod;]]>
-
-<!-- Structure Module (required) ....................... -->
-<!ENTITY % xhtml-struct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
-%xhtml-struct.mod;
-
-<!-- end of XHTML-Print 1.0 DTD ............................................ -->
-<!-- ....................................................................... -->
diff -r 09bfd038e766 -r 95b91fd92b33 htdocs/sgml-lib/REC-xhtml-print-20101123/xhtml-print10-model-1.mod
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/sgml-lib/REC-xhtml-print-20101123/xhtml-print10-model-1.mod	Thu Nov 25 23:45:04 2010 +0200
@@ -0,0 +1,158 @@
+<!-- ....................................................................... -->
+<!-- XHTML-Print 1.0 Document Model Module ................................. -->
+<!-- file: xhtml-print10-model-1.mod
+
+     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 $
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+        PUBLIC "-//W3C//ENTITIES XHTML-Print 1.0 Document Model 1.0//EN"
+        SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-print10-model-1.mod"
+
+     ....................................................................... -->
+
+<!-- XHTML-Print 1.0 Document Model
+
+     This module describes the groupings of elements that make up
+     common content models for XHTML-Print elements.
+-->
+
+<!-- Optional Elements in head ......................... -->
+
+<!ENTITY % HeadOpts.mix
+     "( %script.qname; | %style.qname; | %meta.qname; | %link.qname;
+      | %object.qname; )*" >
+
+<!-- Miscellaneous Elements ............................ -->
+
+<!ENTITY % Script.class "| %script.qname; | %noscript.qname;" >
+
+<!ENTITY % Misc.extra "" >
+
+<!ENTITY % Misc.class
+     "%Script.class;
+      %Misc.extra;"
+>
+
+<!-- Inline Elements ................................... -->
+
+<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
+
+<!ENTITY % InlPhras.class
+     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
+      | %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 % I18n.class "" >
+
+<!ENTITY % Anchor.class "| %a.qname;" >
+
+<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
+
+<!ENTITY % InlForm.class
+     "| %input.qname; | %select.qname; | %textarea.qname;
+      | %label.qname;"
+>
+
+<!ENTITY % Inline.extra "" >
+
+<!ENTITY % Inline.class
+     "%InlStruct.class;
+      %InlPhras.class;
+      %InlPres.class;
+      %Anchor.class;
+      %InlSpecial.class;
+      %InlForm.class;
+      %Inline.extra;"
+>
+
+<!ENTITY % InlNoAnchor.class
+     "%InlStruct.class;
+      %InlPhras.class;
+      %InlPres.class;
+      %InlSpecial.class;
+      %InlForm.class;
+      %Inline.extra;"
+>
+
+<!ENTITY % InlNoAnchor.mix
+     "%InlNoAnchor.class;
+      %Misc.class;"
+>
+
+<!ENTITY % Inline.mix
+     "%Inline.class;
+      %Misc.class;"
+>
+
+<!-- Block Elements .................................... -->
+
+<!ENTITY % Heading.class
+     "%h1.qname; | %h2.qname; | %h3.qname;
+      | %h4.qname; | %h5.qname; | %h6.qname;"
+>
+<!ENTITY % List.class  "%ul.qname; | %ol.qname; | %dl.qname;" >
+
+<!ENTITY % Table.class "| %table.qname;" >
+
+<!ENTITY % Form.class  "| %form.qname;" >
+
+<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
+
+<!ENTITY % BlkPhras.class
+     "| %pre.qname; | %blockquote.qname; | %address.qname;"
+>
+
+<!ENTITY % BlkPres.class "| %hr.qname;" >
+
+<!ENTITY % BlkSpecial.class
+     "%Table.class;
+      %Form.class;"
+>
+
+<!ENTITY % Block.extra "" >
+
+<!ENTITY % Block.class
+     "%BlkStruct.class;
+      %BlkPhras.class;
+      %BlkPres.class;
+      %BlkSpecial.class;
+      %Block.extra;"
+>
+
+<!ENTITY % Block.mix
+     "%Heading.class;
+      | %List.class;
+      | %Block.class;
+      %Misc.class;"
+>
+
+<!-- All Content Elements .............................. -->
+
+<!ENTITY % FlowNoTable.mix
+     "%Heading.class;
+      | %List.class;
+      | %BlkStruct.class;
+      %BlkPhras.class;
+      %BlkPres.class;
+      %Form.class;
+      %Block.extra;
+      | %Inline.class;
+      %Misc.class;"
+>
+
+<!ENTITY % Flow.mix
+     "%Heading.class;
+      | %List.class;
+      | %Block.class;
+      | %Inline.class;
+      %Misc.class;"
+>
+
+<!-- end of xhtml-print10-model-1.mod -->
diff -r 09bfd038e766 -r 95b91fd92b33 htdocs/sgml-lib/REC-xhtml-print-20101123/xhtml-print10.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/sgml-lib/REC-xhtml-print-20101123/xhtml-print10.dtd	Thu Nov 25 23:45:04 2010 +0200
@@ -0,0 +1,199 @@
+<!-- ....................................................................... -->
+<!-- XHTML-Print 1.0 DTD ................................................... -->
+<!-- file: xhtml-print10.dtd
+-->
+
+<!-- XHTML-Print 1.0 DTD
+
+     This is XHTML-Print 1.0, a variant of XHTML Basic for printing.
+
+     Copyright 1998-2003 World Wide Web Consortium
+        (Massachusetts Institute of Technology, European Research
+         Consortium for Informatics and Mathematics, Keio University).
+         All Rights Reserved.
+
+     Permission to use, copy, modify and distribute the XHTML-Print DTD and
+     its accompanying documentation for any purpose and without fee is hereby
+     granted in perpetuity, provided that the above copyright notice and
+     this paragraph appear in all copies.  The copyright holders make no
+     representation about the suitability of the DTD for any purpose.
+
+     It is provided "as is" without expressed or implied warranty.
+
+        Primary Author: Jun Fujisawa <fujisawa.jun@canon.co.jp>
+        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 $
+
+-->
+<!-- This is the driver file for version 1.0 of the XHTML-Print DTD.
+
+     This DTD is identified by the PUBLIC and SYSTEM identifiers:
+
+        PUBLIC "-//W3C//DTD XHTML-Print 1.0//EN"
+        SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-print10.dtd"
+-->
+<!ENTITY % XHTML.version "-//W3C//DTD XHTML-Print 1.0//EN" >
+
+<!-- Use this URI to identify the default namespace:
+
+         "http://www.w3.org/1999/xhtml"
+-->
+<!ENTITY % NS.prefixed "IGNORE" >
+<!ENTITY % XHTML.prefix "" >
+
+<!-- Reserved for use with the XLink namespace:
+-->
+<!ENTITY % XLINK.xmlns "" >
+<!ENTITY % XLINK.xmlns.attrib "" >
+
+<!-- reserved for future use with document profiles -->
+<!ENTITY % XHTML.profile "" >
+
+<!-- Bidirectional Text features
+     This feature-test entity is used to declare elements
+     and attributes used for bidirectional text support.
+-->
+<!ENTITY % XHTML.bidi "IGNORE" >
+
+<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
+
+<!ENTITY % xhtml-events.module "IGNORE" >
+<!ENTITY % xhtml-bdo.module "%XHTML.bidi;" >
+
+<!-- Style Attribute Module ............................ -->
+<!ENTITY % xhtml-inlstyle.module "INCLUDE" >
+<![%xhtml-inlstyle.module;[
+<!ENTITY % xhtml-inlstyle.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
+%xhtml-inlstyle.mod;]]>
+
+<!-- Document Model Module ............................. -->
+<!ENTITY % xhtml-model.mod
+     PUBLIC "-//W3C//ENTITIES XHTML-Print 1.0 Document Model 1.0//EN"
+            "xhtml-print10-model-1.mod" >
+
+<!-- Modular Framework Module (required) ............... -->
+<!ENTITY % xhtml-framework.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
+%xhtml-framework.mod;
+
+<!-- Text Module (required) ............................ -->
+<!ENTITY % xhtml-text.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
+%xhtml-text.mod;
+
+<!-- Hypertext Module (required) ....................... -->
+<!ENTITY % xhtml-hypertext.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
+%xhtml-hypertext.mod;
+
+<!-- Lists Module (required) ........................... -->
+<!ENTITY % xhtml-list.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
+%xhtml-list.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/TR/xhtml-modularization/DTD/xhtml-pres-1.mod" >
+%xhtml-pres.mod;]]>
+
+<!-- Image Module ...................................... -->
+<!ENTITY % xhtml-image.module "INCLUDE" >
+<![%xhtml-image.module;[
+<!ENTITY % xhtml-image.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
+%xhtml-image.mod;]]>
+
+<!-- Tables Module ..................................... -->
+<!ENTITY % xhtml-table.module "INCLUDE" >
+<![%xhtml-table.module;[
+<!ENTITY % xhtml-table.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod" >
+%xhtml-table.mod;]]>
+
+<!-- Forms Module ...................................... -->
+<!ENTITY % xhtml-form.module "INCLUDE" >
+<![%xhtml-form.module;[
+<!ENTITY % xhtml-form.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod" >
+%xhtml-form.mod;]]>
+
+<!-- Scripting Module  ................................. -->
+<!ENTITY % xhtml-script.module "INCLUDE" >
+<![%xhtml-script.module;[
+<!ENTITY % xhtml-script.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod" >
+%xhtml-script.mod;]]>
+
+<!-- Style Sheet Module ................................ -->
+<!ENTITY % xhtml-style.module "INCLUDE" >
+<![%xhtml-style.module;[
+<!ENTITY % xhtml-style.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod" >
+%xhtml-style.mod;]]>
+
+<!-- Link Module ....................................... -->
+<!ENTITY % xhtml-link.module "INCLUDE" >
+<![%xhtml-link.module;[
+<!ENTITY % xhtml-link.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
+%xhtml-link.mod;]]>
+
+<!-- Metainformation Module ............................ -->
+<!ENTITY % xhtml-meta.module "INCLUDE" >
+<![%xhtml-meta.module;[
+<!ENTITY % xhtml-meta.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
+%xhtml-meta.mod;]]>
+
+<!-- Base Module ....................................... -->
+<!ENTITY % xhtml-base.module "INCLUDE" >
+<![%xhtml-base.module;[
+<!ENTITY % xhtml-base.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
+%xhtml-base.mod;]]>
+
+<!-- Param Module ...................................... -->
+<!ENTITY % xhtml-param.module "INCLUDE" >
+<![%xhtml-param.module;[
+<!ENTITY % xhtml-param.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
+%xhtml-param.mod;]]>
+
+<!-- Object Module ..................................... -->
+<!ENTITY % xhtml-object.module "INCLUDE" >
+<![%xhtml-object.module;[
+<!ENTITY % xhtml-object.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
+%xhtml-object.mod;]]>
+
+<!-- Structure Module (required) ....................... -->
+<!ENTITY % xhtml-struct.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
+%xhtml-struct.mod;
+
+<!-- end of XHTML-Print 1.0 DTD ............................................ -->
+<!-- ....................................................................... -->
diff -r 09bfd038e766 -r 95b91fd92b33 htdocs/sgml-lib/catalog.xml
--- a/htdocs/sgml-lib/catalog.xml	Thu Nov 25 23:39:49 2010 +0200
+++ b/htdocs/sgml-lib/catalog.xml	Thu Nov 25 23:45:04 2010 +0200
@@ -96,8 +96,8 @@
   <public publicId="-//W3C//DTD XHTML Basic 1.1//EN" uri="REC-xhtml-basic-20101123/xhtml-basic11.dtd" />
   <public publicId="-//W3C//ENTITIES XHTML Basic 1.1 Document Model 1.0//EN" uri="REC-xhtml-basic-20101123/xhtml-basic11-model-1.mod" />
   <public publicId="-//W3C//ELEMENTS XHTML Inputmode 1.0//EN" uri="REC-xhtml-basic-20101123/xhtml-inputmode-1.mod" />
-  <public publicId="-//W3C//DTD XHTML-Print 1.0//EN" uri="REC-xhtml-print-20060920/xhtml-print10.dtd" />
-  <public publicId="-//W3C//ENTITIES XHTML-Print 1.0 Document Model 1.0//EN" uri="REC-xhtml-print-20060920/xhtml-print10-model-1.mod" />
+  <public publicId="-//W3C//DTD XHTML-Print 1.0//EN" uri="REC-xhtml-print-20101123/xhtml-print10.dtd" />
+  <public publicId="-//W3C//ENTITIES XHTML-Print 1.0 Document Model 1.0//EN" uri="REC-xhtml-print-20101123/xhtml-print10-model-1.mod" />
   <public publicId="-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" uri="WD-XHTMLplusMathMLplusSVG-20020809/xhtml-math-svg.dtd" />
   <public publicId="-//W3C//DTD XHTML Basic plus SVG Tiny//EN" uri="WD-XHTMLplusMathMLplusSVG-20020809/xhtml-basic-svg-tiny.dtd" />
   <public publicId="-//W3C//DTD XHTML+RDFa 1.0//EN" uri="REC-rdfa-syntax-20081014/xhtml-rdfa-1.dtd" />
diff -r 09bfd038e766 -r 95b91fd92b33 htdocs/sgml-lib/xml.soc
--- a/htdocs/sgml-lib/xml.soc	Thu Nov 25 23:39:49 2010 +0200
+++ b/htdocs/sgml-lib/xml.soc	Thu Nov 25 23:45:04 2010 +0200
@@ -232,9 +232,9 @@
 -- XHTML Print 1.0 --
 
 PUBLIC "-//W3C//DTD XHTML-Print 1.0//EN"
-       "REC-xhtml-print-20060920/xhtml-print10.dtd"
+       "REC-xhtml-print-20101123/xhtml-print10.dtd"
 PUBLIC "-//W3C//ENTITIES XHTML-Print 1.0 Document Model 1.0//EN"
-       "REC-xhtml-print-20060920/xhtml-print10-model-1.mod"
+       "REC-xhtml-print-20101123/xhtml-print10-model-1.mod"
 
 
 -- XHTML + MathML + SVG --

Received on Thursday, 25 November 2010 21:45:15 UTC