mrglavas 2003/12/10 09:14:17
Modified: java/src/org/apache/xml/serialize HTMLdtd.java
OutputFormat.java
Log:
The default values for HTML/XHTML system IDs and public IDs were
out of date (reported on xerces-j-dev by Michael Smith). The old
location for the XHTML DTD is actually a broken link.
Replacing these out of date system/public IDs with valid pairs. The
user has always been able to override them in the serializer and
they are still able to if they do not like the default values.
Revision Changes Path
1.16 +9 -8 xml-xerces/java/src/org/apache/xml/serialize/HTMLdtd.java
Index: HTMLdtd.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xml/serialize/HTMLdtd.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HTMLdtd.java 25 Apr 2003 20:22:02 -0000 1.15
+++ HTMLdtd.java 10 Dec 2003 17:14:17 -0000 1.16
@@ -89,27 +89,28 @@
{
/**
- * Public identifier for HTML document type.
+ * Public identifier for HTML 4.01 (Strict) document type.
*/
- public static final String HTMLPublicId = "-//W3C//DTD HTML 4.0//EN";
+ public static final String HTMLPublicId = "-//W3C//DTD HTML 4.01//EN";
/**
- * System identifier for HTML document type.
+ * System identifier for HTML 4.01 (Strict) document type.
*/
public static final String HTMLSystemId =
- "http://www.w3.org/TR/WD-html-in-xml/DTD/xhtml1-strict.dtd";;
+ "http://www.w3.org/TR/html4/strict.dtd";;
/**
- * Public identifier for XHTML document type.
+ * Public identifier for XHTML 1.0 (Strict) document type.
*/
public static final String XHTMLPublicId =
"-//W3C//DTD XHTML 1.0 Strict//EN";
/**
- * System identifier for XHTML document type.
+ * System identifier for XHTML 1.0 (Strict) document type.
*/
public static final String XHTMLSystemId =
- "http://www.w3.org/TR/WD-html-in-xml/DTD/xhtml1-strict.dtd";;
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";;
+
/**
* Table of reverse character reference mapping. Character codes are held
* as single-character strings, mapped to their reference name.
1.20 +8 -8 xml-xerces/java/src/org/apache/xml/serialize/OutputFormat.java
Index: OutputFormat.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xml/serialize/OutputFormat.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- OutputFormat.java 13 May 2003 13:23:48 -0000 1.19
+++ OutputFormat.java 10 Dec 2003 17:14:17 -0000 1.20
@@ -106,27 +106,27 @@
{
/**
- * Public identifier for HTML document type.
+ * Public identifier for HTML 4.01 (Strict) document type.
*/
- public static final String HTMLPublicId = "-//W3C//DTD HTML 4.0//EN";
+ public static final String HTMLPublicId = "-//W3C//DTD HTML 4.01//EN";
/**
- * System identifier for HTML document type.
+ * System identifier for HTML 4.01 (Strict) document type.
*/
public static final String HTMLSystemId =
- "http://www.w3.org/TR/WD-html-in-xml/DTD/xhtml1-strict.dtd";;
+ "http://www.w3.org/TR/html4/strict.dtd";;
/**
- * Public identifier for XHTML document type.
+ * Public identifier for XHTML 1.0 (Strict) document type.
*/
public static final String XHTMLPublicId =
"-//W3C//DTD XHTML 1.0 Strict//EN";
/**
- * System identifier for XHTML document type.
+ * System identifier for XHTML 1.0 (Strict) document type.
*/
public static final String XHTMLSystemId =
- "http://www.w3.org/TR/WD-html-in-xml/DTD/xhtml1-strict.dtd";;
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
