santiagopg 02/05/28 13:57:13
Modified: java/src/org/apache/xalan/xsltc/runtime/output
StreamHTMLOutput.java
Log:
Revision Changes Path
1.4 +27 -16
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamHTMLOutput.java
Index: StreamHTMLOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamHTMLOutput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StreamHTMLOutput.java 23 May 2002 18:13:04 -0000 1.3
+++ StreamHTMLOutput.java 28 May 2002 20:57:13 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StreamHTMLOutput.java,v 1.3 2002/05/23 18:13:04 santiagopg Exp $
+ * @(#)$Id: StreamHTMLOutput.java,v 1.4 2002/05/28 20:57:13 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -95,6 +95,14 @@
public StreamHTMLOutput(StreamOutput output) {
super(output);
+
+ // Transfer output settings
+ setDoctype(output._doctypeSystem, output._doctypePublic);
+ omitHeader(output._omitHeader);
+ setStandalone(output._standalone);
+
+ // Indentation turned on for HTML
+ setIndent(true);
}
public StreamHTMLOutput(Writer writer, String encoding) {
@@ -122,7 +130,7 @@
public void startElement(String elementName) throws TransletException {
if (_startTagOpen) {
- _buffer.append('>');
+ closeStartTag();
}
// Handle document type declaration (for first element only)
@@ -158,8 +166,7 @@
public void endElement(String elementName) throws TransletException {
if (_startTagOpen) {
- _startTagOpen = false;
- _buffer.append(">");
+ closeStartTag();
}
if (_indent) {
@@ -173,10 +180,7 @@
// Empty elements may not have closing tags
if (!_emptyElements.containsKey(elementName.toLowerCase())) {
_buffer.append("</").append(elementName).append('>');
- }
- else if (_headTagOpen) {
- appendHeader(); // Insert <META> tag after <HEAD>
- _headTagOpen = false;
+ _indentNextEndTag = true;
}
else if (_inStyleScript &&
(elementName.equalsIgnoreCase("style") ||
@@ -190,8 +194,7 @@
throws TransletException
{
if (_startTagOpen) {
- _buffer.append('>');
- _startTagOpen = false;
+ closeStartTag();
}
if (_escaping && !_inStyleScript) {
@@ -206,8 +209,7 @@
throws TransletException
{
if (_startTagOpen) {
- _buffer.append('>');
- _startTagOpen = false;
+ closeStartTag();
}
if (_escaping && !_inStyleScript) {
@@ -238,8 +240,7 @@
public void comment(String comment) throws TransletException {
if (_startTagOpen) {
- _buffer.append('>');
- _startTagOpen = false;
+ closeStartTag();
}
_buffer.append("<!--").append(comment).append("-->");
}
@@ -248,8 +249,7 @@
throws TransletException
{
if (_startTagOpen) {
- _buffer.append('>');
- _startTagOpen = false;
+ closeStartTag();
}
// A PI in HTML ends with ">" instead of "?>"
_buffer.append("<?").append(target).append(' ')
@@ -341,5 +341,16 @@
.append(_mediaType).append(" charset=\"")
.append(_encoding).append("/>");
}
+
+ private void closeStartTag() {
+ _buffer.append('>');
+ _startTagOpen = false;
+
+ // Insert <META> tag directly after <HEAD> element in HTML output
+ if (_headTagOpen) {
+ appendHeader();
+ _headTagOpen = false;
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
