mmidy 00/02/09 13:09:02
Modified: src/org/apache/xalan/xpath/xml FormatterToHTML.java
FormatterToXML.java
src/org/apache/xalan/xslt StylesheetRoot.java
Log:
Indent non HTML tags and make sure can set indent amount
Revision Changes Path
1.21 +1 -1
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FormatterToHTML.java 2000/01/21 20:47:31 1.20
+++ FormatterToHTML.java 2000/02/09 21:09:01 1.21
@@ -303,7 +303,7 @@
/**
* Dummy element for elements not found.
*/
- static private ElemDesc m_dummy = new ElemDesc(0);
+ static private ElemDesc m_dummy = new ElemDesc(0|ElemDesc.BLOCK);
/**
* Get a description of the given element.
1.20 +2 -1
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java
Index: FormatterToXML.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FormatterToXML.java 2000/02/03 17:21:31 1.19
+++ FormatterToXML.java 2000/02/09 21:09:01 1.20
@@ -381,8 +381,9 @@
public synchronized void init( Writer writer, OutputFormat format )
{
this.m_writer = writer;
- this.m_doIndent = format.getIndenting();
+ //this.m_doIndent = format.getIndenting();
this.indent = format.getIndent();
+ this.m_doIndent = ( indent >= 0 );
this.m_shouldNotWriteXMLHeader = format.getOmitXMLDeclaration();
this.m_doctypeSystem = format.getDoctypeSystem();
this.m_doctypePublic = format.getDoctypePublic();
1.20 +12 -0 xml-xalan/src/org/apache/xalan/xslt/StylesheetRoot.java
Index: StylesheetRoot.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/StylesheetRoot.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StylesheetRoot.java 2000/01/31 07:57:47 1.19
+++ StylesheetRoot.java 2000/02/09 21:09:02 1.20
@@ -330,18 +330,30 @@
else if(null != outputTarget.getByteStream())
{
OutputFormat formatter = getOutputFormat();
+ if (!(processor.m_parserLiaison.getIndent() < 0))
+ {
+ formatter.setIndent(processor.m_parserLiaison.getIndent());
+ }
processor.m_flistener =
makeSAXSerializer(outputTarget.getByteStream(),
formatter);
}
else if(null != outputTarget.getCharacterStream())
{
OutputFormat formatter = getOutputFormat();
+ if (!(processor.m_parserLiaison.getIndent() < 0))
+ {
+ formatter.setIndent(processor.m_parserLiaison.getIndent());
+ }
processor.m_flistener =
makeSAXSerializer(outputTarget.getCharacterStream(),
formatter);
}
else if(null != outputTarget.getFileName())
{
OutputFormat formatter = getOutputFormat();
+ if (!(processor.m_parserLiaison.getIndent() < 0))
+ {
+ formatter.setIndent(processor.m_parserLiaison.getIndent());
+ }
ostream = new FileOutputStream(outputTarget.getFileName());
processor.m_flistener = makeSAXSerializer(ostream, formatter);
}
