cvs commit: xml-fop/src/org/apache/fop/render/svg SVGRenderer.java
jeremias2003/02/25 06:58:32 Modified:src/org/apache/fop/render/svg Tag: fop-0_20_2-maintain SVGRenderer.java Log: Switched to long licence Cleanup of tab characters where necessary Cleanup of unused imports where necessary Revision ChangesPath No revision No revision 1.3.2.7 +49 -7 xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java Index: SVGRenderer.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java,v retrieving revision 1.3.2.6 retrieving revision 1.3.2.7 diff -u -r1.3.2.6 -r1.3.2.7 --- SVGRenderer.java 8 Nov 2002 10:25:29 - 1.3.2.6 +++ SVGRenderer.java 25 Feb 2003 14:58:32 - 1.3.2.7 @@ -1,10 +1,53 @@ /* * $Id$ - * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved. - * For details on use and redistribution please refer to the - * LICENSE file included with these sources. - */ - + * + *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. + * + * + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber [EMAIL PROTECTED]. For more information on the Apache + * Software Foundation, please see http://www.apache.org/. + */ package org.apache.fop.render.svg; import org.apache.fop.layout.*; @@ -25,7 +68,6 @@ import org.w3c.dom.DOMImplementation; import org.apache.batik.dom.svg.SVGDOMImplementation; -import org.apache.batik.dom.svg.SVGOMElement; import org.apache.batik.dom.util.XMLSupport; import org.apache.batik.transcoder.svg2svg.SVGTranscoder; import org.apache.batik.transcoder.TranscoderInput; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/render/svg SVGRenderer.java
keiron 2002/07/09 02:43:15 Modified:src/org/apache/fop/fo XMLObj.java src/org/apache/fop/render/awt AWTRenderer.java src/org/apache/fop/render/pdf PDFRenderer.java src/org/apache/fop/render/ps PSRenderer.java src/org/apache/fop/render/svg SVGRenderer.java Removed: src/org/apache/fop/datatypes IDNode.java IDReferences.java Log: removed old id reference stuff Revision ChangesPath 1.11 +1 -2 xml-fop/src/org/apache/fop/fo/XMLObj.java Index: XMLObj.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/XMLObj.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- XMLObj.java 20 Jun 2002 09:14:12 - 1.10 +++ XMLObj.java 9 Jul 2002 09:43:14 - 1.11 @@ -11,7 +11,6 @@ import org.apache.fop.fo.*; import org.apache.fop.layout.FontState; import org.apache.fop.apps.FOPException; -import org.apache.fop.datatypes.IDReferences; import org.w3c.dom.*; import org.xml.sax.Attributes; 1.42 +1 -3 xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java Index: AWTRenderer.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- AWTRenderer.java 21 Jun 2002 14:03:42 - 1.41 +++ AWTRenderer.java 9 Jul 2002 09:43:14 - 1.42 @@ -67,8 +67,6 @@ protected Hashtable fontStyles = new Hashtable(); protected Color saveColor = null; -protected IDReferences idReferences = null; - /** * Image Object and Graphics Object. The Graphics Object is the Graphics * object that is contained within the Image Object. 1.110 +1 -2 xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java Index: PDFRenderer.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- PDFRenderer.java 5 Jul 2002 09:21:47 - 1.109 +++ PDFRenderer.java 9 Jul 2002 09:43:14 - 1.110 @@ -19,7 +19,6 @@ import org.apache.fop.pdf.*; import org.apache.fop.image.*; import org.apache.fop.extensions.*; -import org.apache.fop.datatypes.IDReferences; import org.apache.fop.render.pdf.fonts.LazyFont; import org.apache.fop.area.*; 1.23 +1 -3 xml-fop/src/org/apache/fop/render/ps/PSRenderer.java Index: PSRenderer.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- PSRenderer.java 21 Jun 2002 14:03:42 - 1.22 +++ PSRenderer.java 9 Jul 2002 09:43:14 - 1.23 @@ -97,8 +97,6 @@ private FontInfo fontInfo; -protected IDReferences idReferences; - /** * set the document's producer * 1.7 +1 -4 xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java Index: SVGRenderer.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SVGRenderer.java 26 Feb 2002 12:43:10 - 1.6 +++ SVGRenderer.java 9 Jul 2002 09:43:14 - 1.7 @@ -10,7 +10,6 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.area.*; import org.apache.fop.area.inline.*; -import org.apache.fop.datatypes.IDReferences; import org.apache.fop.datatypes.ColorType; import org.apache.fop.image.*; import org.apache.fop.svg.SVGUtilities; @@ -83,8 +82,6 @@ protected HashMap fontNames = new HashMap(); protected HashMap fontStyles = new HashMap(); protected Color saveColor = null; - -protected IDReferences idReferences = null; /** * The current (internal) font name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/render/svg SVGRenderer.java
keiron 01/10/05 02:49:21 Modified:src/org/apache/fop/apps CommandLineOptions.java Driver.java Added: src/org/apache/fop/render/svg SVGRenderer.java Log: added svg renderer Revision ChangesPath 1.14 +18 -1 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- CommandLineOptions.java 2001/09/17 13:29:52 1.13 +++ CommandLineOptions.java 2001/10/05 09:49:21 1.14 @@ -1,5 +1,5 @@ /* - * $Id: CommandLineOptions.java,v 1.13 2001/09/17 13:29:52 keiron Exp $ + * $Id: CommandLineOptions.java,v 1.14 2001/10/05 09:49:21 keiron Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -48,6 +48,8 @@ private static final int PS_OUTPUT = 6; /* output: text file */ private static final int TXT_OUTPUT = 7; +/* output: svg file */ +private static final int SVG_OUTPUT = 8; /* System buffers */ private static final int BUFFER_FILE = 8; @@ -247,6 +249,14 @@ outfile = new File(args[i + 1]); i++; } +} else if (args[i].equals(-svg)) { +setOutputMode(SVG_OUTPUT); +if ((i + 1 == args.length) +|| (args[i + 1].charAt(0) == '-')) { +throw new FOPException(you must specify the svg output file); } else { +outfile = new File(args[i + 1]); +i++; +} } else if (args[i].charAt(0) != '-') { if (inputmode == NOT_SET) { inputmode = FO_INPUT; @@ -376,6 +386,8 @@ return Driver.RENDER_PS; case TXT_OUTPUT: return Driver.RENDER_TXT; +case SVG_OUTPUT: +return Driver.RENDER_SVG; case AREA_OUTPUT: rendererOptions.put(fineDetail, isCoarseAreaXml()); return Driver.RENDER_XML; @@ -532,6 +544,7 @@ + -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 + + -svg outfile input will be rendered as an svg slides file (outfile req'd) \n + -at outfile representation of area tree as XML (outfile req'd) \n + -printinput file will be rendered and sent to the printer \n + see options with \-print help\ \n\n @@ -612,6 +625,10 @@ break; case TXT_OUTPUT: log.debug(txt); +log.debug(output file: + outfile.toString()); +break; +case SVG_OUTPUT: +log.debug(svg); log.debug(output file: + outfile.toString()); break; default: 1.36 +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.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Driver.java 2001/09/17 13:29:52 1.35 +++ Driver.java 2001/10/05 09:49:21 1.36 @@ -1,5 +1,5 @@ /* - * $Id: Driver.java,v 1.35 2001/09/17 13:29:52 keiron Exp $ + * $Id: Driver.java,v 1.36 2001/10/05 09:49:21 keiron Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -132,6 +132,11 @@ public static final int RENDER_TXT = 8; /** + * Render to SVG. OutputStream must be set + */ +public static final int RENDER_SVG = 9; + +/** * the FO tree builder */ private FOTreeBuilder _treeBuilder; @@ -308,6 +313,7 @@ * liRENDER_PCL * liRENDER_PS * liRENDER_TXT + * liRENDER_SVG * /ul * @param renderer the type of renderer to use */ @@ -334,6 +340,9 @@ break; case RENDER_XML: setRenderer(new org.apache.fop.render.xml.XMLRenderer()); +break; +case RENDER_SVG: +