From: Jeremias Maerki Date: Wed, 16 May 2007 09:54:34 +0000 (+0000) Subject: Extracted a little bit of the multi-output handling code from PNGRenderer in to a... X-Git-Tag: fop-0_94~102 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b0f790111261731e82390528448d3c2324233629;p=xmlgraphics-fop.git Extracted a little bit of the multi-output handling code from PNGRenderer in to a new class (MultiFileRenderingUtil) for reuse in the SVGRenderer. Minimal SVG rendering support using Batik's SVGGraphics2D git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@538506 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java b/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java new file mode 100644 index 000000000..ca757fccf --- /dev/null +++ b/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java @@ -0,0 +1,75 @@ +package org.apache.fop.render.bitmap; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; + +/** + * This utility class helps renderers who generate one file per page, + * like the PNG renderer. + */ +public class MultiFileRenderingUtil { + + /** The file syntax prefix, eg. "page" will output "page1.png" etc */ + private String filePrefix; + + private String fileExtension; + + /** The output directory where images are to be written */ + private File outputDir; + + /** + * Creates a new instance. + *

+ * The file name must not have an extension, or must have extension "png", + * and its last period must not be at the start (empty file prefix). + * @param ext the extension to be used + * @param outputFile the output file or null if there's no such information + */ + public MultiFileRenderingUtil(String ext, File outputFile) { + this.fileExtension = ext; + // the file provided on the command line + if (outputFile == null) { + //No filename information available. Only the first page will be rendered. + outputDir = null; + filePrefix = null; + } else { + outputDir = outputFile.getParentFile(); + + // extracting file name syntax + String s = outputFile.getName(); + int i = s.lastIndexOf("."); + if (i > 0) { + // Make sure that the file extension was "png" + String extension = s.substring(i + 1).toLowerCase(); + if (!ext.equals(extension)) { + throw new IllegalArgumentException("Invalid file extension ('" + + extension + "') specified"); + } + } else if (i == -1) { + i = s.length(); + } else { // i == 0 + throw new IllegalArgumentException("Invalid file name ('" + + s + "') specified"); + } + if (s.charAt(i - 1) == '1') { + i--; // getting rid of the "1" + } + filePrefix = s.substring(0, i); + } + } + + public OutputStream createOutputStream(int pageNumber) throws IOException { + if (filePrefix == null) { + return null; + } else { + File f = new File(outputDir, + filePrefix + (pageNumber + 1) + "." + fileExtension); + OutputStream os = new BufferedOutputStream(new FileOutputStream(f)); + return os; + } + } + +} diff --git a/src/java/org/apache/fop/render/bitmap/PNGRenderer.java b/src/java/org/apache/fop/render/bitmap/PNGRenderer.java index 19573e4d9..c6a264830 100644 --- a/src/java/org/apache/fop/render/bitmap/PNGRenderer.java +++ b/src/java/org/apache/fop/render/bitmap/PNGRenderer.java @@ -20,10 +20,6 @@ package org.apache.fop.render.bitmap; import java.awt.image.RenderedImage; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -33,7 +29,6 @@ import org.apache.xmlgraphics.image.writer.ImageWriterRegistry; import org.apache.commons.io.IOUtils; -import org.apache.fop.apps.FOPException; import org.apache.fop.apps.MimeConstants; import org.apache.fop.area.PageViewport; import org.apache.fop.render.java2d.Java2DRenderer; @@ -51,14 +46,11 @@ public class PNGRenderer extends Java2DRenderer { /** The file extension expected for PNG files */ private static final String PNG_FILE_EXTENSION = "png"; - /** The file syntax prefix, eg. "page" will output "page1.png" etc */ - private String filePrefix; - - /** The output directory where images are to be written */ - private File outputDir; - /** The OutputStream for the first Image */ private OutputStream firstOutputStream; + + /** Helper class for generating multiple files */ + private MultiFileRenderingUtil multiFileUtil; /** @see org.apache.fop.render.AbstractRenderer */ public String getMimeType() { @@ -68,54 +60,11 @@ public class PNGRenderer extends Java2DRenderer { /** @see org.apache.fop.render.Renderer#startRenderer(java.io.OutputStream) */ public void startRenderer(OutputStream outputStream) throws IOException { log.info("rendering areas to PNG"); - setOutputDirectory(); + multiFileUtil = new MultiFileRenderingUtil(PNG_FILE_EXTENSION, + getUserAgent().getOutputFile()); this.firstOutputStream = outputStream; } - /** - * Sets the output directory, either from the outfile specified on the - * command line, or from the directory specified in configuration file. - * Also sets the file name syntax, eg. "page". - * The file name must not have an extension, or must have extension "png", - * and its last period must not be at the start (empty file prefix). - * - * @throws IOException if an invalid output file name was specified - * (e.g., with an extension other than '.png') - */ - private void setOutputDirectory() throws IOException { - - // the file provided on the command line - File f = getUserAgent().getOutputFile(); - if (f == null) { - //No filename information available. Only the first page will be rendered. - outputDir = null; - filePrefix = null; - } else { - outputDir = f.getParentFile(); - - // extracting file name syntax - String s = f.getName(); - int i = s.lastIndexOf("."); - if (i > 0) { - // Make sure that the file extension was "png" - String extension = s.substring(i + 1).toLowerCase(); - if (!PNG_FILE_EXTENSION.equals(extension)) { - throw new IOException("Invalid file extension ('" - + extension + "') specified"); - } - } else if (i == -1) { - i = s.length(); - } else { // i == 0 - throw new IOException("Invalid file name ('" - + s + "') specified"); - } - if (s.charAt(i - 1) == '1') { - i--; // getting rid of the "1" - } - filePrefix = s.substring(0, i); - } - } - /** @see org.apache.fop.render.Renderer#stopRenderer() */ public void stopRenderer() throws IOException { @@ -131,23 +80,14 @@ public class PNGRenderer extends Java2DRenderer { } try { // Do the rendering: get the image for this page - RenderedImage image = (RenderedImage) getPageImage((PageViewport) pageViewportList - .get(i)); + PageViewport pv = (PageViewport)pageViewportList.get(i); + RenderedImage image = (RenderedImage)getPageImage(pv); // Encode this image - log.debug("Encoding page " + (i + 1)); - ImageWriterParams params = new ImageWriterParams(); - params.setResolution(Math.round(userAgent.getTargetResolution())); - - // Encode PNG image - ImageWriter writer = ImageWriterRegistry.getInstance().getWriterFor(getMimeType()); - if (writer == null) { - throw new IOException("Could not get an ImageWriter to produce " - + getMimeType() + ". The most likely explanation for this is a class" - + " loading problem."); + if (log.isDebugEnabled()) { + log.debug("Encoding page " + (i + 1)); } - log.debug("Writing image using " + writer.getClass().getName()); - writer.writeImage(image, os, params); + writeImage(os, image); } finally { //Only close self-created OutputStreams if (os != firstOutputStream) { @@ -157,29 +97,36 @@ public class PNGRenderer extends Java2DRenderer { } } + private void writeImage(OutputStream os, RenderedImage image) throws IOException { + ImageWriterParams params = new ImageWriterParams(); + params.setResolution(Math.round(userAgent.getTargetResolution())); + + // Encode PNG image + ImageWriter writer = ImageWriterRegistry.getInstance().getWriterFor(getMimeType()); + if (writer == null) { + throw new IOException("Could not get an ImageWriter to produce " + + getMimeType() + ". The most likely explanation for this is a class" + + " loading problem."); + } + if (log.isDebugEnabled()) { + log.debug("Writing image using " + writer.getClass().getName()); + } + writer.writeImage(image, os, params); + } + /** - * Builds the OutputStream corresponding to this page + * Returns the OutputStream corresponding to this page * @param 0-based pageNumber * @return the corresponding OutputStream + * @throws IOException In case of an I/O error */ - private OutputStream getCurrentOutputStream(int pageNumber) { + protected OutputStream getCurrentOutputStream(int pageNumber) throws IOException { if (pageNumber == 0) { return firstOutputStream; - } - - if (filePrefix == null) { - return null; } else { - File f = new File(outputDir, - filePrefix + (pageNumber + 1) + "." + PNG_FILE_EXTENSION); - try { - OutputStream os = new BufferedOutputStream(new FileOutputStream(f)); - return os; - } catch (FileNotFoundException e) { - new FOPException("Can't build the OutputStream\n" + e); - return null; - } + return multiFileUtil.createOutputStream(pageNumber); } + } } diff --git a/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java b/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java index 36ff7ab58..889307123 100644 --- a/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java +++ b/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,425 +19,163 @@ package org.apache.fop.render.svg; -import org.apache.fop.apps.FOPException; -import org.apache.fop.area.CTM; +import java.awt.Dimension; +import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; + +import org.apache.avalon.framework.configuration.Configuration; +import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.batik.dom.GenericDOMImplementation; +import org.apache.batik.svggen.SVGGeneratorContext; +import org.apache.batik.svggen.SVGGraphics2D; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.fop.apps.MimeConstants; import org.apache.fop.area.PageViewport; -import org.apache.fop.area.LineArea; -import org.apache.fop.area.inline.ForeignObject; -import org.apache.fop.area.inline.InlineArea; -import org.apache.fop.area.inline.Leader; -import org.apache.fop.area.inline.TextArea; -import org.apache.fop.svg.SVGUtilities; -import org.apache.fop.fonts.FontInfo; -import org.apache.fop.apps.FOUserAgent; - -/* org.w3c.dom.Document is not imported to avoid conflict with - org.apache.fop.control.Document */ +import org.apache.fop.render.bitmap.MultiFileRenderingUtil; +import org.apache.fop.render.java2d.Java2DGraphicsState; +import org.apache.fop.render.java2d.Java2DRenderer; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Text; -import org.apache.batik.dom.svg.SVGDOMImplementation; -import org.apache.batik.transcoder.svg2svg.SVGTranscoder; -import org.apache.batik.transcoder.TranscoderInput; -import org.apache.batik.transcoder.TranscoderOutput; -import org.apache.batik.transcoder.TranscoderException; - -import java.awt.Color; -import java.awt.image.BufferedImage; -import java.awt.geom.Rectangle2D; -import java.util.HashMap; -import java.io.OutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; - -import org.apache.fop.render.AbstractRenderer; -import org.apache.fop.render.XMLHandler; -import org.apache.fop.render.RendererContext; /** - * This is the SVG renderer. + *

+ * This renderer generates SVG (Scalable Vector Graphics) format. + *

+ * This class actually does not render itself, instead it extends + * org.apache.fop.render.java2D.Java2DRenderer and uses + * Apache Batik's SVGGraphics2D for SVG generation. */ -public class SVGRenderer extends AbstractRenderer { - - /** SVG MIME type */ - public static final String SVG_MIME_TYPE = "image/svg+xml"; - - /** SVG namespace */ - public static final String SVG_NAMESPACE = SVGDOMImplementation.SVG_NAMESPACE_URI; - - private org.w3c.dom.Document svgDocument; - private Element svgRoot; - private Element currentPageG = null; - private Element lastLink = null; - private String lastViewbox = null; - - private Element docDefs = null; - private Element pageDefs = null; - private Element pagesGroup = null; - - // first sequence title - private LineArea docTitle = null; +public class SVGRenderer extends Java2DRenderer { - private OutputStream ostream; + /** logging instance */ + private static Log log = LogFactory.getLog(SVGRenderer.class); - private float totalWidth = 0; - private float totalHeight = 0; - private float sequenceWidth = 0; - private float sequenceHeight = 0; + /** The MIME type for the SVG format */ + public static final String MIME_TYPE = MimeConstants.MIME_SVG; - private float pageWidth = 0; - private float pageHeight = 0; - private int pageNumber = 0; + private static final String SVG_FILE_EXTENSION = "svg"; - private HashMap fontNames = new HashMap(); - private HashMap fontStyles = new HashMap(); - private Color saveColor = null; + private OutputStream firstOutputStream; + + private Document document; + + private SVGGraphics2D svgGenerator; - /** - * The current (internal) font name - */ - private String currentFontName; - - /** - * The current font size in millipoints - */ - private int currentFontSize; - - /** - * The current colour's red, green and blue component - */ - private float currentRed = 0; - private float currentGreen = 0; - private float currentBlue = 0; + /** Helper class for generating multiple files */ + private MultiFileRenderingUtil multiFileUtil; + + /** @see org.apache.fop.render.AbstractRenderer */ + public String getMimeType() { + return MIME_TYPE; + } - /** - * Creates a new SVG renderer. - */ + /** Creates TIFF renderer. */ public SVGRenderer() { } /** - * @see org.apache.fop.render.Renderer#setUserAgent(FOUserAgent) + * @see org.apache.fop.render.AbstractRenderer#configure( + * org.apache.avalon.framework.configuration.Configuration) */ - public void setUserAgent(FOUserAgent agent) { - super.setUserAgent(agent); - - //Note: This is done here as having two service lookup files in the same IDE project - //will end up with one overwriting the other when all sources are compiled in to the - //same target directory. Remove this code and add an entry in the XMLHandler resource - //file when this renderer exits the sandbox. - XMLHandler handler = agent.getXMLHandlerRegistry().getXMLHandler(this, SVG_NAMESPACE); - if (handler == null) { - agent.getXMLHandlerRegistry().addXMLHandler("org.apache.fop.render.svg.SVGSVGHandler"); - } + public void configure(Configuration cfg) throws ConfigurationException { } - /** - * @see org.apache.fop.render.Renderer#setupFontInfo(FontInfo) - */ - public void setupFontInfo(FontInfo fontInfo) { - // create a temp Image to test font metrics on - BufferedImage fontImage = - new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB); - org.apache.fop.render.java2d.FontSetup.setup(fontInfo, - fontImage.createGraphics()); + /** @see org.apache.fop.render.Renderer#startRenderer(java.io.OutputStream) */ + public void startRenderer(OutputStream outputStream) throws IOException { + this.firstOutputStream = outputStream; + this.multiFileUtil = new MultiFileRenderingUtil(SVG_FILE_EXTENSION, + getUserAgent().getOutputFile()); + super.startRenderer(this.firstOutputStream); } /** - * @see org.apache.fop.render.Renderer#startRenderer(OutputStream) + * @see org.apache.fop.render.java2d.Java2DRenderer#renderPage(org.apache.fop.area.PageViewport) */ - public void startRenderer(OutputStream outputStream) - throws IOException { - ostream = outputStream; - DOMImplementation impl = SVGDOMImplementation.getDOMImplementation(); - svgDocument = impl.createDocument(SVG_NAMESPACE, "svg", null); - svgRoot = svgDocument.getDocumentElement(); - /* - ProcessingInstruction pi = - svgDocument.createProcessingInstruction("xml", - " version=\"1.0\" encoding=\"ISO-8859-1\""); - svgDocument.insertBefore(pi, svgRoot); - */ + public void renderPage(PageViewport pageViewport) throws IOException { + log.debug("Rendering page: " + pageViewport.getPageNumberString()); + // Get a DOMImplementation + DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation(); - docDefs = svgDocument.createElementNS(SVG_NAMESPACE, "defs"); - svgRoot.appendChild(docDefs); - - pagesGroup = svgDocument.createElementNS(SVG_NAMESPACE, "g"); - pageDefs = svgDocument.createElementNS(SVG_NAMESPACE, "defs"); - pagesGroup.appendChild(pageDefs); - svgRoot.appendChild(pagesGroup); - - } + // Create an instance of org.w3c.dom.Document + this.document = domImpl.createDocument(null, "svg", null); - /** - * @see org.apache.fop.render.Renderer#stopRenderer() - */ - public void stopRenderer() throws IOException { - totalWidth += sequenceWidth; - if (sequenceHeight > totalHeight) { - totalHeight = sequenceHeight; - } - - svgRoot.setAttributeNS(null, "width", "" + (totalWidth + 1)); - svgRoot.setAttributeNS(null, "height", "" + (totalHeight + 1)); - //svgRoot.setAttributeNS(null, "viewBox", "0 0 " + pageWidth + " " + pageHeight); - SVGTranscoder svgT = new SVGTranscoder(); - TranscoderInput input = new TranscoderInput(svgDocument); - TranscoderOutput output = - new TranscoderOutput(new OutputStreamWriter(ostream)); + // Create an SVGGeneratorContext to customize SVG generation + SVGGeneratorContext ctx = SVGGeneratorContext.createDefault(this.document); + ctx.setComment("Generated by " + userAgent.getProducer() + " with Batik SVG Generator"); + ctx.setEmbeddedFontsOn(true); + + // Create an instance of the SVG Generator + this.svgGenerator = new SVGGraphics2D(ctx, true); + Rectangle2D viewArea = pageViewport.getViewArea(); + Dimension dim = new Dimension(); + dim.setSize(viewArea.getWidth() / 1000, viewArea.getHeight() / 1000); + this.svgGenerator.setSVGCanvasSize(dim); + + AffineTransform at = this.svgGenerator.getTransform(); + this.state = new Java2DGraphicsState(this.svgGenerator, this.fontInfo, at); try { - svgT.transcode(input, output); - } catch (TranscoderException e) { - log.error("could not write svg file :" + e.getMessage(), e); + //super.renderPage(pageViewport); + renderPageAreas(pageViewport.getPage()); + } finally { + this.state = null; } - ostream.flush(); - ostream = null; - - svgDocument = null; - svgRoot = null; - currentPageG = null; - lastLink = null; - - totalWidth = 0; - totalHeight = 0; - - pageNumber = 0; + writeSVGFile(pageViewport.getPageIndex()); + + this.svgGenerator = null; + this.document = null; + } - /** - * @see org.apache.fop.render.Renderer#startPageSequence(LineArea) - */ - public void startPageSequence(LineArea seqTitle) { - totalWidth += sequenceWidth; - if (sequenceHeight > totalHeight) { - totalHeight = sequenceHeight; + /** @see org.apache.fop.render.Renderer#stopRenderer() */ + public void stopRenderer() throws IOException { + super.stopRenderer(); + + // Cleaning + clearViewportList(); + log.debug("SVG generation complete."); + } + + private void writeSVGFile(int pageNumber) throws IOException { + log.debug("Writing out SVG file..."); + // Finally, stream out SVG to the standard output using UTF-8 + // character to byte encoding + boolean useCSS = true; // we want to use CSS style attribute + OutputStream out = getCurrentOutputStream(pageNumber); + if (out == null) { + log.warn("No filename information available." + + " Stopping early after the first page."); + return; } - sequenceWidth = 0; - sequenceHeight = 0; - if (seqTitle != null && docTitle == null) { - // convert first title to a string and set for svg document title - docTitle = seqTitle; - String str = convertTitleToString(seqTitle); - Element svgTitle = svgDocument.createElementNS(SVG_NAMESPACE, "title"); - Text strNode = svgDocument.createTextNode(str); - svgTitle.appendChild(strNode); - svgRoot.insertBefore(svgTitle, svgRoot.getFirstChild()); + try { + Writer writer = new java.io.OutputStreamWriter(out, "UTF-8"); + this.svgGenerator.stream(writer, useCSS); + } finally { + if (out != this.firstOutputStream) { + IOUtils.closeQuietly(out); + } else { + out.flush(); + } } } /** - * @see org.apache.fop.render.Renderer#renderPage(PageViewport) + * Returns the OutputStream corresponding to this page + * @param 0-based pageNumber + * @return the corresponding OutputStream + * @throws IOException In case of an I/O error */ - public void renderPage(PageViewport page) throws IOException, FOPException { - float lastWidth = pageWidth; - float lastHeight = pageHeight; - - Rectangle2D area = page.getViewArea(); - pageWidth = (float) area.getWidth() / 1000f; - pageHeight = (float) area.getHeight() / 1000f; - - // if there is a link from the last page - if (lastLink != null) { - lastLink.setAttributeNS(null, "xlink:href", "#svgView(viewBox(" - + totalWidth + ", " - + sequenceHeight + ", " - + pageWidth + ", " - + pageHeight + "))"); - pagesGroup.appendChild(lastLink); - } - - currentPageG = svgDocument.createElementNS(SVG_NAMESPACE, "svg"); - currentPageG.setAttributeNS(null, "viewbox", - "0 0 " + (int) pageWidth + " " + (int) pageHeight); - currentPageG.setAttributeNS(null, "width", - "" + ((int) pageWidth + 1)); - currentPageG.setAttributeNS(null, "height", - "" + ((int) pageHeight + 1)); - currentPageG.setAttributeNS(null, "id", "Page-" + pageNumber); - currentPageG.setAttributeNS(null, "style", "font-family:sanserif;font-size:12"); - pageDefs.appendChild(currentPageG); - - if (pageWidth > sequenceWidth) { - sequenceWidth = pageWidth; - } - sequenceHeight += pageHeight; - - Element border = - SVGUtilities.createRect(svgDocument, 0, 0, pageWidth, - pageHeight); - border.setAttributeNS(null, "style", "fill:none;stroke:black"); - currentPageG.appendChild(border); - - // render the page contents - super.renderPage(page); - - Element use = svgDocument.createElementNS(SVG_NAMESPACE, "use"); - use.setAttributeNS(null, "xlink:href", "#Page-" + pageNumber); - use.setAttributeNS(null, "x", "" + totalWidth); - use.setAttributeNS(null, "y", "" + (sequenceHeight - pageHeight)); - pagesGroup.appendChild(use); - - Element lastPageLink = svgDocument.createElementNS(SVG_NAMESPACE, "a"); - if (lastLink != null) { - lastPageLink.setAttributeNS(null, "xlink:href", lastViewbox); + protected OutputStream getCurrentOutputStream(int pageNumber) throws IOException { + if (pageNumber == 0) { + return firstOutputStream; } else { - lastPageLink.setAttributeNS(null, "xlink:href", - "#svgView(viewBox(" - + totalWidth + ", " - + (sequenceHeight - pageHeight) + ", " - + pageWidth + ", " - + pageHeight + "))"); - } - pagesGroup.appendChild(lastPageLink); - - // setup a link to the next page, only added when the - // next page is rendered - Element rect = SVGUtilities.createRect(svgDocument, totalWidth, - (sequenceHeight - pageHeight), pageWidth / 2, pageHeight); - rect.setAttributeNS(null, "style", "fill:blue;visibility:hidden"); - lastPageLink.appendChild(rect); - - lastLink = svgDocument.createElementNS(SVG_NAMESPACE, "a"); - rect = SVGUtilities.createRect(svgDocument, - totalWidth + pageWidth / 2, - (sequenceHeight - pageHeight), pageWidth / 2, pageHeight); - rect.setAttributeNS(null, "style", "fill:blue;visibility:hidden"); - lastLink.appendChild(rect); - - lastViewbox = "#svgView(viewBox(" - + totalWidth + ", " - + (sequenceHeight - pageHeight) + ", " - + pageWidth + ", " - + pageHeight + "))"; - - pageNumber++; - - } - - /** - * Method renderForeignObject. - * @param fo the foreign object - */ - public void renderForeignObject(ForeignObject fo, Rectangle2D pos) { - org.w3c.dom.Document doc = fo.getDocument(); - String ns = fo.getNameSpace(); - renderDocument(doc, ns, pos); - } - - /** - * Renders an XML document (SVG for example). - * - * @param doc DOM document representing the XML document - * @param ns Namespace for the document - * @param pos Position on the page - */ - public void renderDocument(Document doc, String ns, Rectangle2D pos) { - RendererContext context; - context = new RendererContext(this, getMimeType()); - context.setUserAgent(userAgent); - - context.setProperty(SVGRendererContextConstants.SVG_DOCUMENT, svgDocument); - context.setProperty(SVGRendererContextConstants.SVG_PAGE_G, currentPageG); - context.setProperty(SVGRendererContextConstants.XPOS, - new Integer(currentIPPosition + (int)pos.getX())); - context.setProperty(SVGRendererContextConstants.YPOS, - new Integer(currentBPPosition + (int)pos.getY())); - context.setProperty(SVGRendererContextConstants.WIDTH, - new Integer((int)pos.getWidth())); - context.setProperty(SVGRendererContextConstants.HEIGHT, - new Integer((int) pos.getHeight())); - - renderXML(context, doc, ns); - } - - /** - * @see org.apache.fop.render.AbstractRenderer#renderLeader(Leader) - */ - public void renderLeader(Leader area) { - String style = "stroke:black;stroke-width:" - + (area.getRuleThickness() / 1000) + ";"; - switch (area.getRuleStyle()) { - case EN_DOTTED: - style += "stroke-dasharray:1,1"; - break; - case EN_DASHED: - style += "stroke-dasharray:5,1"; - break; - case EN_SOLID: - break; - case EN_DOUBLE: - break; - case EN_GROOVE: - break; - case EN_RIDGE: - break; + return multiFileUtil.createOutputStream(pageNumber); } - Element line = SVGUtilities.createLine(svgDocument, - currentIPPosition / 1000, - (currentBPPosition + area.getOffset() - - area.getRuleThickness() / 2) / 1000, - (currentIPPosition + area.getIPD()) / 1000, - (currentBPPosition + area.getOffset() - - area.getRuleThickness() / 2) / 1000); - line.setAttributeNS(null, "style", style); - currentPageG.appendChild(line); - super.renderLeader(area); } - - /** - * @see org.apache.fop.render.AbstractRenderer#renderText(TextArea) - */ - public void renderText(TextArea text) { - Element textElement = SVGUtilities.createText(svgDocument, - currentIPPosition / 1000, - (currentBPPosition + text.getOffset() - + text.getBaselineOffset()) / 1000, - text.getText()); - currentPageG.appendChild(textElement); - - super.renderText(text); - } - - /** - * @see org.apache.fop.render.AbstractRenderer#renderCharacter(Character) - */ -/* deprecated - public void renderCharacter(org.apache.fop.area.inline.Character ch) { - Element text = SVGUtilities.createText(svgDocument, - currentIPPosition / 1000, - (currentBPPosition + ch.getOffset() - + ch.getBaselineOffset()) / 1000, - "" + ch.getChar()); - currentPageG.appendChild(text); - - super.renderCharacter(ch); - } -*/ - - /** @see org.apache.fop.render.AbstractRenderer */ - public String getMimeType() { - return SVG_MIME_TYPE; - } - - /** - * @see org.apache.fop.render.AbstractRenderer#startVParea(CTM, Rectangle2D) - */ - protected void startVParea(CTM ctm, Rectangle2D clippingRect) { - // TODO Auto-generated method stub - } - - /** - * @see org.apache.fop.render.AbstractRenderer#endVParea() - */ - protected void endVParea() { - // TODO Auto-generated method stub - } - - protected void renderInlineAreaBackAndBorders(InlineArea area) { - // TODO Auto-generated method stub - } - + } - diff --git a/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java b/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java index 876abc47a..f59d3af18 100644 --- a/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java +++ b/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java @@ -74,7 +74,7 @@ public class SVGSVGHandler implements XMLHandler, SVGRendererContextConstants { /** @see org.apache.fop.render.XMLHandler#getNamespace() */ public String getNamespace() { - return SVGRenderer.SVG_NAMESPACE; + return SVGRenderer.MIME_TYPE; }