morten 01/09/19 05:08:26
Modified: java/src/org/apache/xalan/xsltc/runtime
DefaultSAXOutputHandler.java TextOutput.java
Log:
Modified the output handler and SAX handler to produce proper HTML output.
Special characters in <script> and <style> elements are no longer escaped,
and end-tags are properly produced (sometimes we would forget the last '>').
PR: bugzilla 2517
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.19 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java
Index: DefaultSAXOutputHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultSAXOutputHandler.java 2001/09/12 12:23:04 1.18
+++ DefaultSAXOutputHandler.java 2001/09/19 12:08:26 1.19
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DefaultSAXOutputHandler.java,v 1.18 2001/09/12 12:23:04 morten Exp $
+ * @(#)$Id: DefaultSAXOutputHandler.java,v 1.19 2001/09/19 12:08:26 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -508,6 +508,7 @@
if (!_emptyElements.containsKey(_element.toLowerCase())){
_writer.write(GT_LT_SL);
_writer.write(_element);
+ _writer.write('>');
}
else {
_writer.write(GT_CR);
@@ -519,7 +520,7 @@
}
}
else {
- _writer.write('>');
+ _writer.write('>');
}
_startTagOpen = false;
}
1.29 +5 -4
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java
Index: TextOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- TextOutput.java 2001/09/17 08:20:55 1.28
+++ TextOutput.java 2001/09/19 12:08:26 1.29
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TextOutput.java,v 1.28 2001/09/17 08:20:55 morten Exp $
+ * @(#)$Id: TextOutput.java,v 1.29 2001/09/19 12:08:26 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,6 @@
package org.apache.xalan.xsltc.runtime;
import java.io.*;
-import java.net.URLEncoder;
import java.util.Stack;
import java.util.Enumeration;
@@ -350,14 +349,14 @@
*/
private void characters(String str) throws SAXException {
final char[] ch = str.toCharArray();
- _saxHandler.characters(ch, 0, ch.length);
+ characters(ch, 0, ch.length);
}
/**
* Utility method - pass a whole character array to the SAX handler
*/
private void characters(char[] ch) throws SAXException {
- _saxHandler.characters(ch, 0, ch.length);
+ characters(ch, 0, ch.length);
}
/**
@@ -595,6 +594,7 @@
if (_startTagOpen) {
// URL-encode href attributes in HTML output
+ /* Nope, does not work properly - find other solution
if (_outputType == HTML) {
if (name.toLowerCase().equals("href")) {
if (value.startsWith("http")) {
@@ -603,6 +603,7 @@
}
}
}
+ */
// Intercept namespace declarations and handle them separately
if (name.startsWith("xml")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
