cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces - New directory
bdelacretaz2003/06/25 01:53:31 xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools - New directory
bdelacretaz2003/06/25 01:53:39 xml-fop/src/java/org/apache/fop/rtf/rtflib/tools - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs CreateTestDocuments.java DummyTableColumnsInfo.java TestDocument.java
bdelacretaz2003/06/25 01:54:26 Modified:src/java/org/apache/fop/rtf/rtflib/rtfdoc IRtfTableContainer.java RtfAfterBeforeBase.java RtfElement.java RtfExternalGraphic.java RtfExtraRowSet.java RtfFile.java RtfHeader.java RtfListTable.java RtfSection.java RtfTable.java RtfTableCell.java src/java/org/apache/fop/rtf/rtflib/testdocs CreateTestDocuments.java DummyTableColumnsInfo.java TestDocument.java Log: additional jfor packages donated to the FOP project Revision ChangesPath 1.3 +2 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java Index: IRtfTableContainer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- IRtfTableContainer.java 24 Jun 2003 17:47:14 - 1.2 +++ IRtfTableContainer.java 25 Jun 2003 08:54:25 - 1.3 @@ -53,7 +53,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.IOException; -import org.jfor.jfor.interfaces.ITableColumnsInfo; +import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; /** Interface for RtfElements that can contain RtfTables * @author Bertrand Delacretaz [EMAIL PROTECTED] 1.3 +2 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java Index: RtfAfterBeforeBase.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RtfAfterBeforeBase.java 24 Jun 2003 17:47:14 - 1.2 +++ RtfAfterBeforeBase.java 25 Jun 2003 08:54:25 - 1.3 @@ -56,7 +56,7 @@ import java.io.*; import java.util.*; import java.io.IOException; -import org.jfor.jfor.interfaces.ITableColumnsInfo; +import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; /** Common code for RtfAfter and RtfBefore * @author Andreas Lambert [EMAIL PROTECTED] 1.2 +2 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java Index: RtfElement.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RtfElement.java 20 Jun 2003 16:08:21 - 1.1 +++ RtfElement.java 25 Jun 2003 08:54:25 - 1.2 @@ -54,7 +54,7 @@ import java.io.*; import java.util.*; -import org.jfor.jfor.main.JForVersionInfo; +import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo; import org.xml.sax.Attributes; /** Base class for all elements of an RTF file. 1.2 +5 -5 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java Index: RtfExternalGraphic.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RtfExternalGraphic.java 20 Jun 2003 16:08:21 - 1.1 +++ RtfExternalGraphic.java 25 Jun 2003 08:54:25 - 1.2 @@ -56,10 +56,10 @@ import org.apache.fop.rtf.rtflib.rtfdoc.RtfContainer; import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; -import org.jfor.jfor.tools.ImageConstants; -import org.jfor.jfor.tools.ImageUtil; -import org.jfor.jfor.tools.jpeg.Encoder; -import org.jfor.jfor.tools.jpeg.JPEGException; +import org.apache.fop.rtf.rtflib.tools.ImageConstants; +import org.apache.fop.rtf.rtflib.tools.ImageUtil; +import org.apache.fop.rtf.rtflib.tools.jpeg.Encoder; +import org.apache.fop.rtf.rtflib.tools.jpeg.JPEGException; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; 1.3 +2 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java Index: RtfExtraRowSet.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RtfExtraRowSet.java 24 Jun 2003 17:47:14 - 1.2 +++ RtfExtraRowSet.java 25 Jun 2003 08:54:25 - 1.3 @@ -54,7 +54,7 @@ import java.io.*; import java.util.*; -import org.jfor.jfor.interfaces.ITableColumnsInfo; +import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; /** Used
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools/jpeg - New directory
bdelacretaz2003/06/25 01:55:11 xml-fop/src/java/org/apache/fop/rtf/rtflib/tools/jpeg - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools/jpeg DCT.java Encoder.java Huffman.java JPEGException.java JpegInfo.java
bdelacretaz2003/06/25 02:01:18
Added: src/java/org/apache/fop/rtf/rtflib/interfaces
ITableColumnsInfo.java
src/java/org/apache/fop/rtf/rtflib/tools
DomToSaxAdapter.java ElementVisitor.java
ImageConstants.java ImageUtil.java
src/java/org/apache/fop/rtf/rtflib/tools/jpeg DCT.java
Encoder.java Huffman.java JPEGException.java
JpegInfo.java
Log:
additional jfor packages donated to the FOP project
Revision ChangesPath
1.1
xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java
Index: ITableColumnsInfo.java
===
package org.apache.fop.rtf.rtflib.interfaces;
/*-
* jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org
*
*
* jfor Apache-Style Software License.
* Copyright (c) 2002 by the jfor project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* This product includes software developed
* by the jfor project (http://www.jfor.org).
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The name jfor must not be used to endorse
* or promote products derived from this software without prior written
* permission. For written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called jfor,
* nor may jfor appear in their name, without prior written
* permission of [EMAIL PROTECTED]
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE JFOR PROJECT OR ITS CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Contributor(s):
-*/
/** Used to get information about tables, for example when handling nested tables
*
* @author Bertrand Delacretaz [EMAIL PROTECTED]
*/
//--
// $Id: ITableColumnsInfo.java,v 1.1 2003/06/25 09:01:17 bdelacretaz Exp $
// $Log: ITableColumnsInfo.java,v $
// Revision 1.1 2003/06/25 09:01:17 bdelacretaz
// additional jfor packages donated to the FOP project
//
// Revision 1.1 2002/08/12 09:40:02 bdelacretaz
// V0.7.1dev-e, contributions from Boris Poudérous for number-columns-spanned
// and vertical merging of tables cells.
//
//--
public interface ITableColumnsInfo
{
float INVALID_COLUM_WIDTH = 200f;
/** reset the column iteration index, meant to be called when creating a new row
*/
void selectFirstColumn();
/** increment the column iteration index */
void selectNextColumn();
/** get current column width according to column iteration index
* @return INVALID_COLUMN_WIDTH if we cannot find the value
*/
float getColumnWidth();
/** return current column iteration index */
int getColumnIndex();
/** return number of columns */
int getNumberOfColumns();
}
1.1
xml-fop/src/java/org/apache/fop/rtf/rtflib/tools/DomToSaxAdapter.java
Index: DomToSaxAdapter.java
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java
bdelacretaz2003/06/25 02:30:53 Modified:src/java/org/apache/fop/rtf/rtflib/interfaces ITableColumnsInfo.java src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java Log: Apache license added Revision ChangesPath 1.2 +54 -60 xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java Index: ITableColumnsInfo.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ITableColumnsInfo.java25 Jun 2003 09:01:17 - 1.1 +++ ITableColumnsInfo.java25 Jun 2003 09:30:52 - 1.2 @@ -1,75 +1,66 @@ -package org.apache.fop.rtf.rtflib.interfaces; +/* + * $Id$ + * + *The Apache Software License, Version 1.1 + * + * + * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modifica- + * tion, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + *this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + *this list of conditions and the following disclaimer in the documentation + *and/or other materials provided with the distribution. + * + * 3. The end-user documentation included with the redistribution, if any, must + *include the following acknowledgment: This product includes software + *developed by the Apache Software Foundation (http://www.apache.org/). + *Alternately, this acknowledgment may appear in the software itself, if + *and wherever such third-party acknowledgments normally appear. + * + * 4. The names FOP and Apache Software Foundation must not be used to + *endorse or promote products derived from this software without prior + *written permission. For written permission, please contact + *[EMAIL PROTECTED] + * + * 5. Products derived from this software may not be called Apache, nor may + *Apache appear in their name, without prior written permission of the + *Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * + * The RTF library of the FOP project consists of voluntary contributions made by + * many individuals on behalf of the Apache Software Foundation and was originally + * created by Bertrand Delacretaz [EMAIL PROTECTED] and contributors of + * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. + * For more information on the Apache Software Foundation, please + * see http://www.apache.org/. + */ -/*- - * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org - * - * - * jfor Apache-Style Software License. - * Copyright (c) 2002 by the jfor project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools DomToSaxAdapter.java ElementVisitor.java
bdelacretaz2003/06/25 02:31:39 Removed: src/java/org/apache/fop/rtf/rtflib/tools DomToSaxAdapter.java ElementVisitor.java Log: unneeded classes removed - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools/jpeg DCT.java Encoder.java Huffman.java JPEGException.java JpegInfo.java
bdelacretaz2003/06/25 02:32:39 Removed: src/java/org/apache/fop/rtf/rtflib/tools/jpeg DCT.java Encoder.java Huffman.java JPEGException.java JpegInfo.java Log: jpeg package removed - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib - New directory
bdelacretaz2003/06/20 08:54:44 xml-fop/src/java/org/apache/fop/rtf/rtflib - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop build.xml
bdelacretaz2003/06/20 08:56:51
Modified:.build.xml
Log:
rtflib package is not compilable yet
Revision ChangesPath
1.82 +10 -0 xml-fop/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- build.xml 27 Apr 2003 18:19:48 - 1.81
+++ build.xml 20 Jun 2003 15:56:51 - 1.82
@@ -118,6 +118,12 @@
exclude name=org/apache/fop/pdf/PDFEncryptionJCE.java unless=jce.present/
/patternset
+ !-- jfor RTF library has been moved here but needs tweaking before it compiles
--
+ !-- remove this once the RTF library compiles --
+ patternset id=exclude-rtflib
+exclude name=org/apache/fop/rtf/rtflib/**/*.java/
+ /patternset
+
patternset id=base-sources
include name=**/*.java/
exclude name=**/*${ignore_this}/
@@ -432,6 +438,10 @@
patternset refid=exclude-jce-dependencies/
patternset refid=exclude-jai/
patternset refid=exclude-jimi/
+
+ !-- remove this once the RTF library compiles --
+ patternset refid=exclude-rtflib/
+
classpath refid=libs-build-classpath/
patternset refid=base-sources/
/javac
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/exceptions - New directory
bdelacretaz2003/06/20 09:03:54 xml-fop/src/java/org/apache/fop/rtf/rtflib/exceptions - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc - New directory
bdelacretaz2003/06/20 09:04:04 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs - New directory
bdelacretaz2003/06/20 09:04:12 xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/rtf/renderer RTFHandler.java
bdelacretaz2002/11/05 00:51:44
Modified:src/org/apache/fop/rtf/renderer RTFHandler.java
Log:
RTFHandler constructor IOException removed
Revision ChangesPath
1.2 +5 -3 xml-fop/src/org/apache/fop/rtf/renderer/RTFHandler.java
Index: RTFHandler.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/rtf/renderer/RTFHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RTFHandler.java 1 Nov 2002 06:44:15 - 1.1
+++ RTFHandler.java 5 Nov 2002 08:51:44 - 1.2
@@ -38,6 +38,7 @@
public class RTFHandler extends StructureHandler {
private FontInfo _fontInfo = new FontInfo();
private RtfFile _rtfFile;
+private final OutputStream _os;
private RtfSection _sect;
private RtfDocumentArea _docArea;
private RtfParagraph _para;
@@ -45,8 +46,8 @@
private static final String ALPHA_WARNING = WARNING: RTF renderer is
veryveryalpha at this time, see class org.apache.fop.rtf.renderer.RTFHandler;
-public RTFHandler(OutputStream os) throws IOException {
-_rtfFile = new RtfFile(new OutputStreamWriter(os));
+public RTFHandler(OutputStream os) {
+_os = os;
// use pdf fonts for now, this is only for resolving names
org.apache.fop.render.pdf.FontSetup.setup(_fontInfo, null);
System.err.println(ALPHA_WARNING);
@@ -59,6 +60,7 @@
public void startDocument() throws SAXException {
// FIXME sections should be created
try {
+_rtfFile = new RtfFile(new OutputStreamWriter(_os));
_docArea = _rtfFile.startDocumentArea();
} catch(IOException ioe) {
// FIXME could we throw Exception in all StructureHandler events?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop build.properties build.xml
bdelacretaz2002/10/31 09:16:07
Modified:.build.xml
Added: .build.properties
Log:
build.properties and build-local.properties allow local override of build settings
Revision ChangesPath
1.65 +7 -1 xml-fop/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- build.xml 28 Oct 2002 09:26:46 - 1.64
+++ build.xml 31 Oct 2002 17:16:07 - 1.65
@@ -36,6 +36,11 @@
--
project default=package basedir=.
+ !-- used to set values for testing etc. --
+ !-- build-local.properties is not stored in CVS and overrides values from
build.properties --
+ property file=build-local.properties/
+ property file=build.properties/
+
fileset dir=${basedir} id=dist.bin
include name=conf/**/
include name=docs/**/
@@ -130,6 +135,7 @@
property name=year value=1999-2002/
echo message=--- ${Name} ${version} [${year}]
/
+echo message=See build.properties and build-local.properties for additional
build settings/
property name=build.compiler value=classic/
property name=debug value=on/
@@ -668,7 +674,7 @@
taskdef name=fop classname=org.apache.fop.tools.anttasks.Fop
classpathref=libs-run-classpath/
mkdir dir=${build.examples.dir}/
-fop format=application/pdf outdir=${build.examples.dir}
+fop format=${build.property.examples.mime.type}
outdir=${build.examples.dir}
messagelevel=debug basedir=${fo.examples.dir}
fileset dir=${fo.examples.dir}
include name=**/*.fo/
1.1 xml-fop/build.properties
Index: build.properties
===
# these settings can be overridden locally in build-local.properties,
# which is not stored in CVS (due to .cvsignore)
# output format for ant examples
build.property.examples.mime.type = application/pdf
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop .cvsignore
bdelacretaz2002/10/31 09:16:18 Modified:..cvsignore Log: build.properties and build-local.properties allow local override of build settings Revision ChangesPath 1.3 +1 -0 xml-fop/.cvsignore Index: .cvsignore === RCS file: /home/cvs/xml-fop/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore14 Feb 2001 11:41:26 - 1.2 +++ .cvsignore31 Oct 2002 17:16:18 - 1.3 @@ -1,2 +1,3 @@ build jpfop-0.17.0 +build-local.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/tools/anttasks Fop.java
bdelacretaz2002/10/31 09:26:05
Modified:src/org/apache/fop/apps CommandLineOptions.java Driver.java
src/org/apache/fop/tools/anttasks Fop.java
Log:
rtf renderer selection mechanism added, no rtf renderer yet
Revision ChangesPath
1.20 +21 -2 xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CommandLineOptions.java 4 Sep 2002 08:36:35 - 1.19
+++ CommandLineOptions.java 31 Oct 2002 17:26:04 - 1.20
@@ -50,6 +50,8 @@
private static final int SVG_OUTPUT = 8;
/* output: XML area tree */
private static final int AREA_OUTPUT = 9;
+/* output: RTF file */
+private static final int RTF_OUTPUT = 10;
/* show configuration information */
Boolean dumpConfiguration = Boolean.FALSE;
@@ -184,6 +186,15 @@
outfile = new File(args[i + 1]);
i++;
}
+} else if (args[i].equals(-rtf)) {
+setOutputMode(RTF_OUTPUT);
+if ((i + 1 == args.length)
+|| (args[i + 1].charAt(0) == '-')) {
+throw new FOPException(you must specify the rtf output file);
+} else {
+outfile = new File(args[i + 1]);
+i++;
+}
} else if (args[i].equals(-print)) {
setOutputMode(PRINT_OUTPUT);
// show print help
@@ -347,6 +358,8 @@
case AREA_OUTPUT:
rendererOptions.put(fineDetail, isCoarseAreaXml());
return Driver.RENDER_XML;
+case RTF_OUTPUT:
+return Driver.RENDER_RTF;
default:
throw new FOPException(Invalid Renderer setting!);
}
@@ -471,7 +484,7 @@
* shows the commandline syntax including a summary of all available options
and some examples
*/
public static void printUsage() {
-System.err.println(\nUSAGE\nFop [options] [-fo|-xml] infile [-xsl file]
[-awt|-pdf|-mif|-pcl|-ps|-txt|-at|-print] outfile\n
+System.err.println(\nUSAGE\nFop [options] [-fo|-xml] infile [-xsl file]
[-awt|-pdf|-mif|-rtf|-pcl|-ps|-txt|-at|-print] outfile\n
+ [OPTIONS] \n
+ -d debug mode \n
+ -x dump configuration settings \n
@@ -489,6 +502,7 @@
+ -pdf outfile input will be rendered as pdf
file (outfile req'd) \n
+ -awt input will be displayed on
screen \n
+ -mif outfile input will be rendered as mif
file (outfile req'd)\n
+ + -rtf outfile input will be rendered as rtf
file (outfile req'd)\n
+ -pcl outfile input will be rendered as pcl
file (outfile req'd) \n
+ -ps outfile input will be rendered as
PostScript file (outfile req'd) \n
+ -txt outfile input will be rendered as
text file (outfile req'd) \n
@@ -500,6 +514,7 @@
+ Fop -fo foo.fo -pdf foo.pdf (does the same as
the previous line)\n
+ Fop -xsl foo.xsl -xml foo.xml -pdf foo.pdf\n
+ Fop foo.fo -mif foo.mif\n
+ + Fop foo.fo -rtf foo.rtf\n
+ Fop foo.fo -print or Fop -print foo.fo \n
+ Fop foo.fo -awt \n);
}
@@ -554,6 +569,10 @@
break;
case MIF_OUTPUT:
log.debug(mif);
+log.debug(output file: + outfile.toString());
+break;
+case RTF_OUTPUT:
+log.debug(rtf);
log.debug(output file: + outfile.toString());
break;
case PRINT_OUTPUT:
1.56 +10 -1 xml-fop/src/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Driver.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Driver.java 25 Oct 2002 09:29:39 - 1.55
+++ Driver.java 31 Oct 2002 17:26:04 - 1.56
@@ -135,6 +135,11 @@
public static final int RENDER_SVG = 9;
/**
+ * Render to RTF. OutputStream must be set
+ */
+public static final
cvs commit: xml-fop/src/org/apache/fop/rtf - New directory
bdelacretaz2002/10/31 22:42:45 xml-fop/src/org/apache/fop/rtf - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/rtf/renderer - New directory
bdelacretaz2002/10/31 22:42:45 xml-fop/src/org/apache/fop/rtf/renderer - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/rtf/renderer RTFHandler.java
bdelacretaz2002/10/31 22:44:15
Modified:.build.xml
src/org/apache/fop/apps Driver.java
Added: lib jfor-0.7.1.jar jfor.LICENSE.txt
src/org/apache/fop/rtf/renderer RTFHandler.java
Log:
first shot at RTFHandler using jfor RTF library
Revision ChangesPath
1.66 +1 -0 xml-fop/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- build.xml 31 Oct 2002 17:16:07 - 1.65
+++ build.xml 1 Nov 2002 06:44:14 - 1.66
@@ -64,6 +64,7 @@
include name=lib/batik.jar/
include name=lib/avalon-framework*.jar/
include name=lib/jimi*/
+include name=lib/jfor*.jar/
/fileset
fileset dir=${basedir} id=dist.src
1.1 xml-fop/lib/jfor-0.7.1.jar
Binary file
1.1 xml-fop/lib/jfor.LICENSE.txt
Index: jfor.LICENSE.txt
===
*
* jfor Apache-Style Software License.
* Copyright (c) 2002 by the jfor project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* This product includes software developed
* by the jfor project (http://www.jfor.org).
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The name jfor must not be used to endorse
* or promote products derived from this software without prior written
* permission. For written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called jfor,
* nor may jfor appear in their name, without prior written
* permission of [EMAIL PROTECTED]
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE JFOR PROJECT OR ITS CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
1.57 +16 -6 xml-fop/src/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Driver.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Driver.java 31 Oct 2002 17:26:04 - 1.56
+++ Driver.java 1 Nov 2002 06:44:15 - 1.57
@@ -145,6 +145,11 @@
private FOTreeBuilder _treeBuilder;
/**
+ * the renderer type code given by setRenderer
+ */
+private int _rendererType;
+
+/**
* the renderer to use to output the area tree
*/
private Renderer _renderer;
@@ -318,6 +323,7 @@
* @param renderer the type of renderer to use
*/
public void setRenderer(int renderer) throws IllegalArgumentException {
+_rendererType = renderer;
switch (renderer) {
case RENDER_PDF:
setRenderer(org.apache.fop.render.pdf.PDFRenderer);
@@ -336,7 +342,7 @@
setRenderer(org.apache.fop.render.txt.TXTRenderer());
break;
case RENDER_MIF:
-//structHandler = new org.apache.fop.mif.MIFHandler(_stream);
+//structHandler will be set later
break;
case RENDER_XML:
setRenderer(org.apache.fop.render.xml.XMLRenderer);
@@ -345,7 +351,7 @@
setRenderer
