mmidy 99/12/10 10:42:29
Modified: src/org/apache/xalan/xpath/res XPATHErrorResources.java
XPATHErrorResources_en.java
src/org/apache/xalan/xpath/xml FormatterToHTML.java
Log:
Do not ouput XML declaration for HTML method
Revision Changes Path
1.6 +1 -1
xml-xalan/src/org/apache/xalan/xpath/res/XPATHErrorResources.java
Index: XPATHErrorResources.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/res/XPATHErrorResources.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPATHErrorResources.java 1999/12/03 01:37:16 1.5
+++ XPATHErrorResources.java 1999/12/10 18:42:29 1.6
@@ -238,7 +238,7 @@
{"WR0001", "locale name in the format-number function not yet handled!"},
{"WR0002", "XSL Property not supported: {0}"},
-{"WR0003", "Don't currently do anything with namespace {0} in property:
{1}"},
+{"WR0003", "Do not currently do anything with namespace {0} in property:
{1}"},
{"WR0004", "SecurityException when trying to access XSL system property:
{0}"},
{"WR0005", "Old syntax: quo(...) is no longer defined in XPath."},
{"WR0006", "VariableReference given for variable out of context or without
definition! Name = {0}"},
1.6 +1 -1
xml-xalan/src/org/apache/xalan/xpath/res/XPATHErrorResources_en.java
Index: XPATHErrorResources_en.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/res/XPATHErrorResources_en.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPATHErrorResources_en.java 1999/12/03 01:37:16 1.5
+++ XPATHErrorResources_en.java 1999/12/10 18:42:29 1.6
@@ -66,7 +66,7 @@
{"WR0001", "locale name in the format-number function not yet handled!"},
{"WR0002", "XSL Property not supported: {0}"},
-{"WR0003", "Don't currently do anything with namespace {0} in property:
{1}"},
+{"WR0003", "Do not currently do anything with namespace {0} in property:
{1}"},
{"WR0004", "SecurityException when trying to access XSL system property:
{0}"},
{"WR0005", "Old syntax: quo(...) is no longer defined in XPath."},
{"WR0006", "VariableReference given for variable out of context or without
definition! Name = {0}"},
1.8 +5 -22
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java
Index: FormatterToHTML.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormatterToHTML.java 1999/12/02 06:04:07 1.7
+++ FormatterToHTML.java 1999/12/10 18:42:29 1.8
@@ -259,34 +259,17 @@
*/
public void startDocument ()
throws SAXException
- {
- try
- {
- m_needToOutputDocTypeDecl = true;
- m_startNewLine = false;
-
- if(m_shouldNotWriteXMLHeader == false)
- {
- String encoding = getMimeEncoding(this.m_encoding);
-
- String version = (null == m_version) ? "1.0" : m_version;
-
- m_writer.write("<?xml version=\""+version+"\" encoding=\""+
- encoding + "\"?>");
- m_writer.write(m_lineSep);
- }
- }
- catch(IOException ioe)
- {
- throw new SAXException("IO error", ioe);
- }
+ {
+ m_needToOutputDocTypeDecl = true;
+ m_startNewLine = false;
+
if(true == m_needToOutputDocTypeDecl)
{
try
{
if((null != m_doctypeSystem) || (null != m_doctypePublic))
{
- m_writer.write("<!DOCTYPE ");
+ m_writer.write("<!DOCTYPE HTML ");
if(null != m_doctypePublic)
{
m_writer.write(" PUBLIC \"");
