Attachment #23467 for bug #47000

View | Details | Raw Unified | Return to bug 47000
Collapse All | Expand All

Lines 58-63 Link Here

(-)status.xml (+4 lines)
58	documents. Example: the fix of marks layering will be such a case when it's done.	58	documents. Example: the fix of marks layering will be such a case when it's done.
59	-->	59	-->
60	<release version="FOP Trunk" date="TBD">	60	<release version="FOP Trunk" date="TBD">
		61	<action context="Renderers" dev="JM" type="add">
		62	Added a custom text painter for rendering SVG text using text operators when rendering
		63	to PostScript or EPS. Text is no longer painted as shapes, thus creating much smaller files.
		64	</action>
61	<action context="Renderers" dev="JM" type="fix">	65	<action context="Renderers" dev="JM" type="fix">
62	Fixed a bug that left the PrintRenderer unconfigured even if a configuration was	66	Fixed a bug that left the PrintRenderer unconfigured even if a configuration was
63	specified for "application/X-fop-print".	67	specified for "application/X-fop-print".




import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.InputStream;

import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;

import org.w3c.dom.Document;
import org.w3c.dom.svg.SVGLength;

import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.UnitProcessor;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.ext.awt.RenderingHintsKeyExt;
import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.TranscodingHints;
import org.apache.batik.transcoder.image.ImageTranscoder;
import org.apache.batik.transcoder.keys.BooleanKey;
import org.apache.batik.transcoder.keys.FloatKey;
import org.apache.batik.util.ParsedURL;

import org.apache.xmlgraphics.image.loader.ImageContext;
import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext;

import org.apache.fop.Version;
import org.apache.fop.fonts.FontInfo;


public class PDFTranscoder extends AbstractFOPTranscoder
        implements Configurable {

    /**
     * The key is used to specify the resolution for on-the-fly images generated
     * due to complex effects like gradients and filters.
     */
    public static final TranscodingHints.Key KEY_DEVICE_RESOLUTION = new FloatKey();

    /**
     * The key is used to specify whether the available fonts should be automatically
     * detected. The alternative is to configure the transcoder manually using a configuration
     * file.
     */
    public static final TranscodingHints.Key KEY_AUTO_FONTS = new BooleanKey();

    private Configuration cfg = null;

    /** Graphics2D instance that is used to paint to */
    protected PDFDocumentGraphics2D graphics = null;

    private ImageManager imageManager;
    private ImageSessionContext imageSessionContext;

    /**
     * Constructs a new <tt>PDFTranscoder</tt>.
     */

        };
    }

    /** {@inheritDoc} */
    public void configure(Configuration cfg) throws ConfigurationException {
        this.cfg = cfg;
    }

    /**
     * Transcodes the specified Document as an image in the specified output.
     *

                + Version.getVersion()
                + ": PDF Transcoder for Batik");
        if (hints.containsKey(KEY_DEVICE_RESOLUTION)) {
            graphics.setDeviceDPI(getDeviceResolution());
        }

        setupImageInfrastructure(uri);

        try {
            Configuration effCfg = getEffectiveConfiguration();
            if (effCfg == null) {
                //By default, enable font auto-detection if no cfg is given
                boolean autoFonts = true;
                if (hints.containsKey(KEY_AUTO_FONTS)) {
                    autoFonts = ((Boolean)hints.get(KEY_AUTO_FONTS)).booleanValue();
                }
                if (autoFonts) {
                    DefaultConfiguration c = new DefaultConfiguration("pdf-transcoder");
                    DefaultConfiguration fonts = new DefaultConfiguration("fonts");
                    c.addChild(fonts);
                    DefaultConfiguration autodetect = new DefaultConfiguration("auto-detect");
                    fonts.addChild(autodetect);
                    effCfg = c;
                }
            }

            if (effCfg != null) {
                PDFDocumentGraphics2DConfigurator configurator

        }
    }

    private void setupImageInfrastructure(final String baseURI) {
        final ImageContext imageContext = new ImageContext() {
            public float getSourceResolution() {
                return 25.4f / userAgent.getPixelUnitToMillimeter();
            }
        };
        this.imageManager = new ImageManager(imageContext);
        this.imageSessionContext = new AbstractImageSessionContext() {

            public ImageContext getParentContext() {
                return imageContext;
            }

            public float getTargetResolution() {
                return graphics.getDeviceDPI();
            }

            public Source resolveURI(String uri) {
                System.out.println("resolve " + uri);
                try {
                    ParsedURL url = new ParsedURL(baseURI, uri);
                    InputStream in = url.openStream();
                    StreamSource source = new StreamSource(in, url.toString());
                    return source;
                } catch (IOException ioe) {
                    userAgent.displayError(ioe);
                    return null;
                }
            }

        };
    }

    /** {@inheritDoc} */
    protected BridgeContext createBridgeContext() {
        //For compatibility with Batik 1.6

            fontInfo = null;
        }
        BridgeContext ctx = new PDFBridgeContext(userAgent, fontInfo,
                getImageManager(), getImageSessionContext());
        return ctx;
    }





import java.awt.Paint;
import java.awt.Shape;
import java.awt.Stroke;
import java.awt.font.TextAttribute;
import java.awt.geom.AffineTransform;
import java.awt.geom.Ellipse2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
import java.lang.reflect.Method;
import java.text.AttributedCharacterIterator;
import java.util.Iterator;
import java.util.List;

import org.apache.batik.bridge.SVGFontFamily;
import org.apache.batik.gvt.font.GVTFont;
import org.apache.batik.gvt.font.GVTFontFamily;
import org.apache.batik.gvt.font.GVTGlyphVector;
import org.apache.batik.gvt.renderer.StrokingTextPainter;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
import org.apache.batik.gvt.text.TextPaintInfo;
import org.apache.batik.gvt.text.TextSpanLayout;

import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.util.CharUtilities;

/**

 *
 * @version $Id$
 */
class PDFTextPainter extends NativeTextPainter {

    private static final boolean DEBUG = false;

    private final boolean strokeText = false;
    private final FontInfo fontInfo;

    /**
     * Create a new PDF text painter with the given font information.
     * @param fi the font info
     */
    public PDFTextPainter(FontInfo fi) {
        super(fi);
    }

    /** {@inheritDoc} */
    protected boolean isSupported(Graphics2D g2d) {
        return g2d instanceof PDFGraphics2D;
    }

    /** {@inheritDoc} */
    protected void paintTextRun(TextRun textRun, Graphics2D g2d) {
        AttributedCharacterIterator runaci = textRun.getACI();
        runaci.first();

        TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
        if (tpi == null || !tpi.visible) {
            return;
        }
        if ((tpi != null) && (tpi.composite != null)) {
            g2d.setComposite(tpi.composite);
        }

        //------------------------------------
        TextSpanLayout layout = textRun.getLayout();
        logTextRun(runaci, layout);
        CharSequence chars = collectCharacters(runaci);
        runaci.first(); //Reset ACI

        final PDFGraphics2D pdf = (PDFGraphics2D)g2d;
        PDFTextUtil textUtil = new PDFTextUtil(pdf.fontInfo) {
            protected void write(String code) {
                pdf.currentStream.write(code);
            }
        };
        for (int i = 0; i < textRuns.size(); i++) {
            TextRun textRun = (TextRun)textRuns.get(i);
            AttributedCharacterIterator runaci = textRun.getACI();
            runaci.first();

        if (DEBUG) {
            log.debug("Text: " + chars);
            pdf.currentStream.write("%Text: " + chars + "\n");
        }
            if ((tpi != null) && (tpi.composite != null)) {
                g2d.setComposite(tpi.composite);
            }

        GeneralPath debugShapes = null;
        if (DEBUG) {
            debugShapes = new GeneralPath();
        }
                System.out.println("================================================");
                System.out.println("New text run:");
                System.out.println("char count: " + charCount);
                System.out.println("range: "
                        + runaci.getBeginIndex() + " - " + runaci.getEndIndex());
                System.out.println("glyph count: " + layout.getGlyphCount()); //=getNumGlyphs()
            }
            //Gather all characters of the run
            StringBuffer chars = new StringBuffer();
            for (runaci.first(); runaci.getIndex() < runaci.getEndIndex();) {
                chars.append(runaci.current());
                runaci.next();
            }
            runaci.first();
            if (DEBUG) {
                System.out.println("Text: " + chars);
                pdf.currentStream.write("%Text: " + chars + "\n");
            }

        Font[] fonts = findFonts(runaci);
        if (fonts == null || fonts.length == 0) {
            //Draw using Java2D when no native fonts are available
            textRun.getLayout().draw(g2d);
            return;
        }

        textUtil.saveGraphicsState();
        textUtil.concatMatrix(g2d.getTransform());
        Shape imclip = g2d.getClip();
        pdf.writeClip(imclip);
                continue;
            }

        applyColorAndPaint(tpi, pdf);
            textUtil.concatMatrix(g2d.getTransform());
            Shape imclip = g2d.getClip();
            pdf.writeClip(imclip);

        textUtil.beginTextObject();
        textUtil.setFonts(fonts);
        boolean stroke = (tpi.strokePaint != null)
            && (tpi.strokeStroke != null);
        textUtil.setTextRenderingMode(tpi.fillPaint != null, stroke, false);

        AffineTransform localTransform = new AffineTransform();
        Point2D prevPos = null;
        double prevVisibleCharWidth = 0.0;
        GVTGlyphVector gv = layout.getGlyphVector();
        for (int index = 0, c = gv.getNumGlyphs(); index < c; index++) {
            char ch = chars.charAt(index);
            boolean visibleChar = gv.isGlyphVisible(index)
                || (CharUtilities.isAnySpace(ch) && !CharUtilities.isZeroWidthSpace(ch));
            logCharacter(ch, layout, index, visibleChar);
            if (!visibleChar) {
                continue;
            }
            Point2D glyphPos = gv.getGlyphPosition(index);

            AffineTransform glyphTransform = gv.getGlyphTransform(index);
            //TODO Glyph transforms could be refined so not every char has to be painted
            //with its own TJ command (stretch/squeeze case could be optimized)
            if (log.isTraceEnabled()) {
                log.trace("pos " + glyphPos + ", transform " + glyphTransform);
            }
            if (DEBUG) {
                Shape sh = gv.getGlyphLogicalBounds(index);
                if (sh == null) {
                    sh = new Ellipse2D.Double(glyphPos.getX(), glyphPos.getY(), 2, 2);
                            + " -> " + layout.getGlyphIndex(index) + " => " + ch);
                    if (CharUtilities.isAnySpace(ch) && ch != 32) {
                        System.out.println("Space found: " + Integer.toHexString(ch));
                    }
                    if (ch == CharUtilities.ZERO_WIDTH_JOINER) {
                        System.out.println("ZWJ found: " + Integer.toHexString(ch));
                    }
                    if (ch == CharUtilities.SOFT_HYPHEN) {
                        System.out.println("Soft hyphen found: " + Integer.toHexString(ch));
                    }
                    if (!visibleChar) {
                        System.out.println("Invisible glyph found: " + Integer.toHexString(ch));
                    }
                }
                debugShapes.append(sh, false);
            }
                }
                Point2D p = gv.getGlyphPosition(index);

            //Exact position of the glyph
            localTransform.setToIdentity();
            localTransform.translate(glyphPos.getX(), glyphPos.getY());
            if (glyphTransform != null) {
                localTransform.concatenate(glyphTransform);
            }
            localTransform.scale(1, -1);
                    if (sh == null) {
                        sh = new Ellipse2D.Double(p.getX(), p.getY(), 2, 2);
                    }
                    debugShapes.append(sh, false);
                }

            boolean yPosChanged = (prevPos == null
                    || prevPos.getY() != glyphPos.getY()
                    || glyphTransform != null);
            if (yPosChanged) {
                if (index > 0) {
                }
                localTransform.scale(1, -1);

                boolean yPosChanged = (prevPos == null
                        || prevPos.getY() != p.getY()
                        || glyphTransform != null);
                if (yPosChanged) {
                    if (index > 0) {
                        textUtil.writeTJ();
                        textUtil.writeTextMatrix(localTransform);
                    }
                } else {
                    double xdiff = p.getX() - prevPos.getX();
                    //Width of previous character
                    Font font = textUtil.getCurrentFont();
                    double cw = prevVisibleCharWidth;
                    double effxdiff = (1000 * xdiff) - cw;
                    if (effxdiff != 0) {
                        double adjust = (-effxdiff / font.getFontSize());
                        textUtil.adjustGlyphTJ(adjust * 1000);
                    }
                    if (DEBUG) {
                        System.out.println("==> x diff: " + xdiff + ", " + effxdiff
                                + ", charWidth: " + cw);
                    }
                }
                Font f = textUtil.selectFontForChar(ch);
                if (f != textUtil.getCurrentFont()) {
                    textUtil.writeTJ();
                    textUtil.setCurrentFont(f);
                    textUtil.writeTf(f);
                    textUtil.writeTextMatrix(localTransform);
                }
            } else {
                double xdiff = glyphPos.getX() - prevPos.getX();
                //Width of previous character
                Font font = textUtil.getCurrentFont();
                double cw = prevVisibleCharWidth;
                double effxdiff = (1000 * xdiff) - cw;
                if (effxdiff != 0) {
                    double adjust = (-effxdiff / font.getFontSize());
                    textUtil.adjustGlyphTJ(adjust * 1000);
                }
                if (log.isTraceEnabled()) {
                    log.trace("==> x diff: " + xdiff + ", " + effxdiff
                            + ", charWidth: " + cw);
                }
            }
            Font f = textUtil.selectFontForChar(ch);
            if (f != textUtil.getCurrentFont()) {
                textUtil.writeTJ();
                textUtil.setCurrentFont(f);
                textUtil.writeTf(f);
                textUtil.writeTextMatrix(localTransform);
                g2d.draw(debugShapes);
            }
            char paintChar = (CharUtilities.isAnySpace(ch) ? ' ' : ch);
            textUtil.writeTJChar(paintChar);

            //Update last position
            prevPos = glyphPos;
            prevVisibleCharWidth = textUtil.getCurrentFont().getCharWidth(chars.charAt(index));
        }
        textUtil.writeTJ();
        textUtil.endTextObject();
        textUtil.restoreGraphicsState();
        if (DEBUG) {
            g2d.setStroke(new BasicStroke(0));
            g2d.setColor(Color.LIGHT_GRAY);
            g2d.draw(debugShapes);
        }
    }

    private void applyColorAndPaint(TextPaintInfo tpi, PDFGraphics2D pdf) {

        pdf.applyAlpha(fillAlpha, PDFGraphics2D.OPAQUE);
    }

    private Font[] findFonts(AttributedCharacterIterator aci) {
        List fonts = new java.util.ArrayList();
        List gvtFonts = (List) aci.getAttribute(
                GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
        Float posture = (Float) aci.getAttribute(TextAttribute.POSTURE);
        Float taWeight = (Float) aci.getAttribute(TextAttribute.WEIGHT);
        Float fontSize = (Float) aci.getAttribute(TextAttribute.SIZE);

        String style = ((posture != null) && (posture.floatValue() > 0.0))
                       ? Font.STYLE_ITALIC : Font.STYLE_NORMAL;
        int weight = ((taWeight != null)
                       &&  (taWeight.floatValue() > 1.0)) ? Font.WEIGHT_BOLD
                       : Font.WEIGHT_NORMAL;

        String firstFontFamily = null;

        //GVT_FONT can sometimes be different from the fonts in GVT_FONT_FAMILIES
        //or GVT_FONT_FAMILIES can even be empty and only GVT_FONT is set
        /* The following code section is not available until Batik 1.7 is released. */
        GVTFont gvtFont = (GVTFont)aci.getAttribute(
                GVTAttributedCharacterIterator.TextAttribute.GVT_FONT);
        if (gvtFont != null) {
            try {
                Method method = gvtFont.getClass().getMethod("getFamilyName", null);
                String gvtFontFamily = (String)method.invoke(gvtFont, null);
                //TODO Uncomment the following line when Batik 1.7 is shipped with FOP
                //String gvtFontFamily = gvtFont.getFamilyName(); //Not available in Batik 1.6
                if (DEBUG) {
                    System.out.print(gvtFontFamily + ", ");
                }
                if (fontInfo.hasFont(gvtFontFamily, style, weight)) {
                    FontTriplet triplet = fontInfo.fontLookup(gvtFontFamily, style,
                                                       weight);
                    int fsize = (int)(fontSize.floatValue() * 1000);
                    fonts.add(fontInfo.getFontInstance(triplet, fsize));
                }
                firstFontFamily = gvtFontFamily;
            } catch (Exception e) {
                //Most likely NoSuchMethodError here when using Batik 1.6
                //Just skip this section in this case
            }
        }

        if (gvtFonts != null) {
            Iterator i = gvtFonts.iterator();
            while (i.hasNext()) {
                GVTFontFamily fam = (GVTFontFamily) i.next();
                if (fam instanceof SVGFontFamily) {
                    return null; //Let Batik paint this text!
                }
                String fontFamily = fam.getFamilyName();
                if (DEBUG) {
                    System.out.print(fontFamily + ", ");
                }
                if (fontInfo.hasFont(fontFamily, style, weight)) {
                    FontTriplet triplet = fontInfo.fontLookup(fontFamily, style,
                                                       weight);
                    int fsize = (int)(fontSize.floatValue() * 1000);
                    fonts.add(fontInfo.getFontInstance(triplet, fsize));
                }
                if (firstFontFamily == null) {
                    firstFontFamily = fontFamily;
                }
            }
        }
        if (fonts.size() == 0) {
            if (firstFontFamily == null) {
                //This will probably never happen. Just to be on the safe side.
                firstFontFamily = "any";
            }
            //lookup with fallback possibility (incl. substitution notification)
            FontTriplet triplet = fontInfo.fontLookup(firstFontFamily, style, weight);
            int fsize = (int)(fontSize.floatValue() * 1000);
            fonts.add(fontInfo.getFontInstance(triplet, fsize));
        }
        if (DEBUG) {
            System.out.println();
        }
        return (Font[])fonts.toArray(new Font[fonts.size()]);
    }

}





        //Fonts
        try {
            FontInfo fontInfo = createFontInfo(cfg);
            graphics.setFontInfo(fontInfo);
        } catch (FOPException e) {
            throw new ConfigurationException("Error while setting up fonts", e);
        }
    }

    /**
     * Creates the {@link FontInfo} instance for the given configuration.
     * @param cfg the configuration
     * @return the font collection
     * @throws FOPException if an error occurs while setting up the fonts
     */
    public static FontInfo createFontInfo(Configuration cfg) throws FOPException {
        FontInfo fontInfo = new FontInfo();
        if (cfg != null) {
            FontResolver fontResolver = FontManager.createMinimalFontResolver();
            //TODO The following could be optimized by retaining the FontManager somewhere
            FontManager fontManager = new FontManager();

            if (fontManager.useCache()) {
                fontManager.getFontCache().save();
            }
            FontInfo fontInfo = new FontInfo();
            FontSetup.setup(fontInfo, fontInfoList, fontResolver);
        } else {
            FontSetup.setup(fontInfo);
            throw new ConfigurationException("Error while setting up fonts", e);
        }
        return fontInfo;
    }

}




/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * 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.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

/* $Id$ */

package org.apache.fop.svg;

import java.awt.Graphics2D;
import java.awt.font.TextAttribute;
import java.io.IOException;
import java.text.AttributedCharacterIterator;
import java.util.Iterator;
import java.util.List;

import org.apache.batik.bridge.SVGFontFamily;
import org.apache.batik.gvt.font.GVTFont;
import org.apache.batik.gvt.font.GVTFontFamily;
import org.apache.batik.gvt.renderer.StrokingTextPainter;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
import org.apache.batik.gvt.text.TextSpanLayout;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.util.CharUtilities;

/**
 * Abstract base class for text painters that use specialized text commands native to an output
 * format to render text.
 */
public abstract class NativeTextPainter extends StrokingTextPainter {

    /** the logger for this class */
    protected Log log = LogFactory.getLog(NativeTextPainter.class);

    /** the font collection */
    protected final FontInfo fontInfo;

    /**
     * Creates a new instance.
     * @param fontInfo the font collection
     */
    public NativeTextPainter(FontInfo fontInfo) {
        this.fontInfo = fontInfo;
    }

    /**
     * Indicates whether the given {@link Graphics2D} instance if compatible with this text painter
     * implementation.
     * @param g2d the instance to check
     * @return true if the instance is compatible.
     */
    protected abstract boolean isSupported(Graphics2D g2d);

    /**
     * Paints a single text run.
     * @param textRun the text run
     * @param g2d the target Graphics2D instance
     * @throws IOException if an I/O error occurs while rendering the text
     */
    protected abstract void paintTextRun(TextRun textRun, Graphics2D g2d) throws IOException;

    /** {@inheritDoc} */
    protected void paintTextRuns(List textRuns, Graphics2D g2d) {
        if (log.isTraceEnabled()) {
            log.trace("paintTextRuns: count = " + textRuns.size());
        }
        if (!isSupported(g2d)) {
            super.paintTextRuns(textRuns, g2d);
            return;
        }
        for (int i = 0; i < textRuns.size(); i++) {
            TextRun textRun = (TextRun)textRuns.get(i);
            try {
                paintTextRun(textRun, g2d);
            } catch (IOException ioe) {
                //No other possibility than to use a RuntimeException
                throw new RuntimeException(ioe);
            }
        }
    }

    /**
     * Finds an array of suitable fonts for a given AttributedCharacterIterator.
     * @param aci the character iterator
     * @return the array of fonts
     */
    protected Font[] findFonts(AttributedCharacterIterator aci) {
        List fonts = new java.util.ArrayList();
        List gvtFonts = (List) aci.getAttribute(
                GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
        Float posture = (Float) aci.getAttribute(TextAttribute.POSTURE);
        Float taWeight = (Float) aci.getAttribute(TextAttribute.WEIGHT);
        Float fontSize = (Float) aci.getAttribute(TextAttribute.SIZE);

        String style = ((posture != null) && (posture.floatValue() > 0.0))
                       ? Font.STYLE_ITALIC : Font.STYLE_NORMAL;
        int weight = ((taWeight != null)
                       &&  (taWeight.floatValue() > 1.0)) ? Font.WEIGHT_BOLD
                       : Font.WEIGHT_NORMAL;

        String firstFontFamily = null;

        //GVT_FONT can sometimes be different from the fonts in GVT_FONT_FAMILIES
        //or GVT_FONT_FAMILIES can even be empty and only GVT_FONT is set
        /* The following code section is not available until Batik 1.7 is released. */
        GVTFont gvtFont = (GVTFont)aci.getAttribute(
                GVTAttributedCharacterIterator.TextAttribute.GVT_FONT);
        if (gvtFont != null) {
            try {
                String gvtFontFamily = gvtFont.getFamilyName(); //Not available in Batik 1.6!
                if (log.isDebugEnabled()) {
                    log.debug("Matching font family: " + gvtFontFamily);
                }
                if (fontInfo.hasFont(gvtFontFamily, style, weight)) {
                    FontTriplet triplet = fontInfo.fontLookup(gvtFontFamily, style,
                                                       weight);
                    int fsize = (int)(fontSize.floatValue() * 1000);
                    fonts.add(fontInfo.getFontInstance(triplet, fsize));
                }
                firstFontFamily = gvtFontFamily;
            } catch (Exception e) {
                //Most likely NoSuchMethodError here when using Batik 1.6
                //Just skip this section in this case
            }
        }

        if (gvtFonts != null) {
            Iterator i = gvtFonts.iterator();
            while (i.hasNext()) {
                GVTFontFamily fam = (GVTFontFamily) i.next();
                if (fam instanceof SVGFontFamily) {
                    return null; //Let Batik paint this text!
                }
                String fontFamily = fam.getFamilyName();
                if (log.isDebugEnabled()) {
                    log.debug("Matching font family: " + fontFamily);
                }
                if (fontInfo.hasFont(fontFamily, style, weight)) {
                    FontTriplet triplet = fontInfo.fontLookup(fontFamily, style,
                                                       weight);
                    int fsize = (int)(fontSize.floatValue() * 1000);
                    fonts.add(fontInfo.getFontInstance(triplet, fsize));
                }
                if (firstFontFamily == null) {
                    firstFontFamily = fontFamily;
                }
            }
        }
        if (fonts.size() == 0) {
            if (firstFontFamily == null) {
                //This will probably never happen. Just to be on the safe side.
                firstFontFamily = "any";
            }
            //lookup with fallback possibility (incl. substitution notification)
            FontTriplet triplet = fontInfo.fontLookup(firstFontFamily, style, weight);
            int fsize = (int)(fontSize.floatValue() * 1000);
            fonts.add(fontInfo.getFontInstance(triplet, fsize));
        }
        return (Font[])fonts.toArray(new Font[fonts.size()]);
    }

    /**
     * Collects all characters from an {@link AttributedCharacterIterator}.
     * @param runaci the character iterator
     * @return the characters
     */
    protected CharSequence collectCharacters(AttributedCharacterIterator runaci) {
        StringBuffer chars = new StringBuffer();
        for (runaci.first(); runaci.getIndex() < runaci.getEndIndex();) {
            chars.append(runaci.current());
            runaci.next();
        }
        return chars;
    }

    protected final void logTextRun(AttributedCharacterIterator runaci, TextSpanLayout layout) {
        if (log.isTraceEnabled()) {
            int charCount = runaci.getEndIndex() - runaci.getBeginIndex();
            log.trace("================================================");
            log.trace("New text run:");
            log.trace("char count: " + charCount);
            log.trace("range: "
                    + runaci.getBeginIndex() + " - " + runaci.getEndIndex());
            log.trace("glyph count: " + layout.getGlyphCount()); //=getNumGlyphs()
        }
    }

    protected final void logCharacter(char ch, TextSpanLayout layout, int index,
            boolean visibleChar) {
        if (log.isTraceEnabled()) {
            log.trace("glyph " + index
                    + " -> " + layout.getGlyphIndex(index) + " => " + ch);
            if (CharUtilities.isAnySpace(ch) && ch != 32) {
                log.trace("Space found: " + Integer.toHexString(ch));
            } else if (ch == CharUtilities.ZERO_WIDTH_JOINER) {
                log.trace("ZWJ found: " + Integer.toHexString(ch));
            } else if (ch == CharUtilities.SOFT_HYPHEN) {
                log.trace("Soft hyphen found: " + Integer.toHexString(ch));
            }
            if (!visibleChar) {
                log.trace("Invisible glyph found: " + Integer.toHexString(ch));
            }
        }
    }


}
  + Id
  + native

Lines 19-24 Link Here

(-)src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (-3 / +132 lines)
19		19
20	package org.apache.fop.svg;	20	package org.apache.fop.svg;
21		21
		22	import java.io.IOException;
		23	import java.io.InputStream;
		24
		25	import javax.xml.transform.Source;
		26	import javax.xml.transform.stream.StreamSource;
		27
		28	import org.w3c.dom.DOMImplementation;
		29
		30	import org.xml.sax.EntityResolver;
		31
		32	import org.apache.avalon.framework.configuration.Configuration;
		33	import org.apache.avalon.framework.configuration.ConfigurationException;
		34	import org.apache.avalon.framework.configuration.DefaultConfiguration;
22	import org.apache.batik.bridge.UserAgent;	35	import org.apache.batik.bridge.UserAgent;
23	import org.apache.batik.dom.svg.SVGDOMImplementation;	36	import org.apache.batik.dom.svg.SVGDOMImplementation;
24	import org.apache.batik.dom.util.DocumentFactory;	37	import org.apache.batik.dom.util.DocumentFactory;
Lines 28-50 Link Here
28	import org.apache.batik.transcoder.TranscodingHints;	41	import org.apache.batik.transcoder.TranscodingHints;
29	import org.apache.batik.transcoder.image.ImageTranscoder;	42	import org.apache.batik.transcoder.image.ImageTranscoder;
30	import org.apache.batik.transcoder.keys.BooleanKey;	43	import org.apache.batik.transcoder.keys.BooleanKey;
		44	import org.apache.batik.transcoder.keys.FloatKey;
		45	import org.apache.batik.util.ParsedURL;
31	import org.apache.batik.util.SVGConstants;	46	import org.apache.batik.util.SVGConstants;
32	import org.apache.commons.logging.Log;	47	import org.apache.commons.logging.Log;
33	import org.apache.commons.logging.impl.SimpleLog;	48	import org.apache.commons.logging.impl.SimpleLog;
34	import org.w3c.dom.DOMImplementation;
35	import org.xml.sax.EntityResolver;
36		49
		50	import org.apache.xmlgraphics.image.loader.ImageContext;
		51	import org.apache.xmlgraphics.image.loader.ImageManager;
		52	import org.apache.xmlgraphics.image.loader.ImageSessionContext;
		53	import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext;
		54
37	/**	55	/**
38	* This is the common base class of all of FOP's transcoders.	56	* This is the common base class of all of FOP's transcoders.
39	*/	57	*/
40	public abstract class AbstractFOPTranscoder extends SVGAbstractTranscoder {	58	public abstract class AbstractFOPTranscoder extends SVGAbstractTranscoder {
41		59
42	/**	60	/**
		61	* The key is used to specify the resolution for on-the-fly images generated
		62	* due to complex effects like gradients and filters.
		63	*/
		64	public static final TranscodingHints.Key KEY_DEVICE_RESOLUTION = new FloatKey();
		65
		66	/**
43	* The key to specify whether to stroke text instead of using text	67	* The key to specify whether to stroke text instead of using text
44	* operations.	68	* operations.
45	*/	69	*/
46	public static final TranscodingHints.Key KEY_STROKE_TEXT = new BooleanKey();	70	public static final TranscodingHints.Key KEY_STROKE_TEXT = new BooleanKey();
47		71
		72	/**
		73	* The key is used to specify whether the available fonts should be automatically
		74	* detected. The alternative is to configure the transcoder manually using a configuration
		75	* file.
		76	*/
		77	public static final TranscodingHints.Key KEY_AUTO_FONTS = new BooleanKey();
		78
48	/** The value to turn on text stroking. */	79	/** The value to turn on text stroking. */
49	public static final Boolean VALUE_FORMAT_ON = Boolean.TRUE;	80	public static final Boolean VALUE_FORMAT_ON = Boolean.TRUE;
50		81
Lines 58-63 Link Here
58		89
59	private Log logger;	90	private Log logger;
60	private EntityResolver resolver;	91	private EntityResolver resolver;
		92	private Configuration cfg = null;
		93	private ImageManager imageManager;
		94	private ImageSessionContext imageSessionContext;
61		95
62	/**	96	/**
63	* Constructs a new FOP-style transcoder.	97	* Constructs a new FOP-style transcoder.
Lines 80-86 Link Here
80	}	114	}
81		115
82	/**	116	/**
83	* @param logger	117	* Sets the logger.
		118	* @param logger the logger
84	*/	119	*/
85	public void setLogger(Log logger) {	120	public void setLogger(Log logger) {
86	this.logger = logger;	121	this.logger = logger;
Lines 94-100 Link Here
94	this.resolver = resolver;	129	this.resolver = resolver;
95	}	130	}
96		131
		132	/** {@inheritDoc} */
		133	public void configure(Configuration cfg) throws ConfigurationException {
		134	this.cfg = cfg;
		135	}
		136
97	/**	137	/**
		138	* Returns the effective configuration for the transcoder.
		139	* @return the effective configuration
		140	*/
		141	protected Configuration getEffectiveConfiguration() {
		142	Configuration effCfg = this.cfg;
		143	if (effCfg == null) {
		144	//By default, enable font auto-detection if no cfg is given
		145	boolean autoFonts = true;
		146	if (hints.containsKey(KEY_AUTO_FONTS)) {
		147	autoFonts = ((Boolean)hints.get(KEY_AUTO_FONTS)).booleanValue();
		148	}
		149	if (autoFonts) {
		150	DefaultConfiguration c = new DefaultConfiguration("cfg");
		151	DefaultConfiguration fonts = new DefaultConfiguration("fonts");
		152	c.addChild(fonts);
		153	DefaultConfiguration autodetect = new DefaultConfiguration("auto-detect");
		154	fonts.addChild(autodetect);
		155	effCfg = c;
		156	}
		157	}
		158	return effCfg;
		159	}
		160
		161	/**
98	* Returns the logger associated with this transcoder. It returns a	162	* Returns the logger associated with this transcoder. It returns a
99	* SimpleLog if no logger has been explicitly set.	163	* SimpleLog if no logger has been explicitly set.
100	* @return Logger the logger for the transcoder.	164	* @return Logger the logger for the transcoder.
Lines 142-147 Link Here
142	return stroke;	206	return stroke;
143	}	207	}
144		208
		209	/**
		210	* Returns the device resolution that has been set up.
		211	* @return the device resolution (in dpi)
		212	*/
		213	protected float getDeviceResolution() {
		214	if (hints.containsKey(KEY_DEVICE_RESOLUTION)) {
		215	return ((Float)hints.get(KEY_DEVICE_RESOLUTION)).floatValue();
		216	} else {
		217	return 72;
		218	}
		219	}
		220
		221	/**
		222	* Returns the ImageManager to be used by the transcoder.
		223	* @return the image manager
		224	*/
		225	protected ImageManager getImageManager() {
		226	return this.imageManager;
		227	}
		228
		229	/**
		230	* Returns the ImageSessionContext to be used by the transcoder.
		231	* @return the image session context
		232	*/
		233	protected ImageSessionContext getImageSessionContext() {
		234	return this.imageSessionContext;
		235	}
		236
		237	/**
		238	* Sets up the image infrastructure (the image loading framework).
		239	* @param baseURI the base URI of the current document
		240	*/
		241	protected void setupImageInfrastructure(final String baseURI) {
		242	final ImageContext imageContext = new ImageContext() {
		243	public float getSourceResolution() {
		244	return 25.4f / userAgent.getPixelUnitToMillimeter();
		245	}
		246	};
		247	this.imageManager = new ImageManager(imageContext);
		248	this.imageSessionContext = new AbstractImageSessionContext() {
		249
		250	public ImageContext getParentContext() {
		251	return imageContext;
		252	}
		253
		254	public float getTargetResolution() {
		255	return getDeviceResolution();
		256	}
		257
		258	public Source resolveURI(String uri) {
		259	System.out.println("resolve " + uri);
		260	try {
		261	ParsedURL url = new ParsedURL(baseURI, uri);
		262	InputStream in = url.openStream();
		263	StreamSource source = new StreamSource(in, url.toString());
		264	return source;
		265	} catch (IOException ioe) {
		266	userAgent.displayError(ioe);
		267	return null;
		268	}
		269	}
		270
		271	};
		272	}
273
145	// --------------------------------------------------------------------	274	// --------------------------------------------------------------------
146	// FOP's default error handler (for transcoders)	275	// FOP's default error handler (for transcoders)
147	// --------------------------------------------------------------------	276	// --------------------------------------------------------------------





package org.apache.fop.svg;

import org.w3c.dom.Element;

import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.SVGTextElementBridge;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.TextPainter;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

/**
 * Bridge class for the &lt;text> element.

        return node;
    }

    /**
     * Check if text element contains simple text.
     * This checks the children of the text element to determine
     * if the text is simple. The text is simple if it can be rendered
     * with basic text drawing algorithms. This means there are no
     * alternate characters, the font is known and there are no effects
     * applied to the text.
     *
     * @param ctx the bridge context
     * @param element the svg text element
     * @param node the graphics node
     * @return true if this text is simple of false if it cannot be
     *         easily rendered using normal drawString on the Graphics2D
     */
    protected boolean isSimple(BridgeContext ctx, Element element, GraphicsNode node) {
        for (Node n = element.getFirstChild();
                n != null;
                n = n.getNextSibling()) {

            switch (n.getNodeType()) {
            case Node.ELEMENT_NODE:

                if (n.getLocalName().equals(SVG_TSPAN_TAG)
                        || n.getLocalName().equals(SVG_ALT_GLYPH_TAG)) {
                    return false;
                } else if (n.getLocalName().equals(SVG_TEXT_PATH_TAG)) {
                    return false;
                } else if (n.getLocalName().equals(SVG_TREF_TAG)) {
                    return false;
                }
                break;
            case Node.TEXT_NODE:
            case Node.CDATA_SECTION_NODE:
            default:
            }
        }

        /*if (CSSUtilities.convertFilter(element, node, ctx) != null) {
            return false;
        }*/

        return true;
    }

}






package org.apache.fop.render.ps;

import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Paint;
import java.awt.Shape;
import java.awt.Stroke;
import java.awt.geom.AffineTransform;
import java.awt.geom.Ellipse2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.PathIterator;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
import java.text.AttributedCharacterIterator;
import java.text.CharacterIterator;
import java.util.Iterator;
import java.util.List;

import org.apache.batik.gvt.font.GVTGlyphVector;
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.TextPainter;
import org.apache.batik.gvt.font.GVTFontFamily;
import org.apache.batik.gvt.renderer.StrokingTextPainter;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
import org.apache.batik.gvt.text.Mark;
import org.apache.batik.gvt.text.TextPaintInfo;
import org.apache.batik.gvt.text.TextSpanLayout;

import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
import org.apache.xmlgraphics.ps.PSGenerator;
import org.apache.xmlgraphics.ps.PSResource;

import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.svg.NativeTextPainter;
import org.apache.fop.util.CharUtilities;


/**
 * Renders the attributed character iterator of a <tt>TextNode</tt>.
 * This class draws the text directly using PostScript text operators so
 * the text is not drawn using shapes which makes the PS files larger.
 * <p>
 * The text runs are split into smaller text runs that can be bundles in single
 * calls of the xshow, yshow or xyshow operators. For outline text, the charpath
 * operator is used.
 * (todo) handle underline, overline and strikethrough
 * (todo) use drawString(AttributedCharacterIterator iterator...) for some
 *
 * @author <a href="mailto:keiron@aftexsw.com">Keiron Liddle</a>
 * @version $Id$
 */
public class PSTextPainter extends NativeTextPainter {

    private static final boolean DEBUG = false;
    protected Log log = LogFactory.getLog(PSTextPainter.class);

    private FontResourceCache fontResources;
    private final FontInfo fontInfo;

    private static final AffineTransform IDENTITY_TRANSFORM = new AffineTransform();
     * Use the stroking text painter to get the bounds and shape.
     * Also used as a fallback to draw the string with strokes.
     */
    protected static final TextPainter
        PROXY_PAINTER = StrokingTextPainter.getInstance();

    /**
     * Create a new PS text painter with the given font information.
     * @param fontInfo the font collection
     */
    public PSTextPainter(FontInfo fontInfo) {
        super(fontInfo);
        this.fontResources = new FontResourceCache(fontInfo);
    }

    /** {@inheritDoc} */
    protected boolean isSupported(Graphics2D g2d) {
        return g2d instanceof PSGraphics2D;
     * @param node the TextNode to paint
     * @param g2d the Graphics2D to use
     */
    public void paint(TextNode node, Graphics2D g2d) {
        String txt = node.getText();
        Point2D loc = node.getLocation();

        if (hasUnsupportedAttributes(node)) {
            PROXY_PAINTER.paint(node, g2d);
        } else {
            paintTextRuns(node.getTextRuns(), g2d, loc);
        }
    }

    /** {@inheritDoc} */
    protected void paintTextRun(TextRun textRun, Graphics2D g2d) throws IOException {
        AttributedCharacterIterator runaci = textRun.getACI();
        runaci.first();

        TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
        if (tpi == null || !tpi.visible) {
            return;
            StrokingTextPainter.TextRun
                    run = (StrokingTextPainter.TextRun)i.next();
            AttributedCharacterIterator aci = run.getACI();
            boolean hasUnsupported = hasUnsupportedAttributes(aci);
            if (hasUnsupported) {
                return true;
            }
        }
        if ((tpi != null) && (tpi.composite != null)) {
            g2d.setComposite(tpi.composite);
        }

        //------------------------------------
        TextSpanLayout layout = textRun.getLayout();
        logTextRun(runaci, layout);
        CharSequence chars = collectCharacters(runaci);
        runaci.first(); //Reset ACI

        final PSGraphics2D ps = (PSGraphics2D)g2d;
        final PSGenerator gen = ps.getPSGenerator();
        ps.preparePainting();
            log.trace("-> Unsupported glyphs found");
            hasunsupported = true;
        }

        if (DEBUG) {
            log.debug("Text: " + chars);
            gen.commentln("%Text: " + chars);
                && ((tpi.strokeStroke != null && tpi.strokePaint != null)
                    || (tpi.strikethroughStroke != null)
                    || (tpi.underlineStroke != null)
                    || (tpi.overlineStroke != null))) {
                        log.trace("-> under/overlines etc. found");
            hasunsupported = true;
        }

        GeneralPath debugShapes = null;
        if (DEBUG) {
            debugShapes = new GeneralPath();
            Color col = (Color)foreground;
            if (col.getAlpha() != 255) {
                log.trace("-> transparency found");
                hasunsupported = true;
            }
        }

        TextUtil textUtil = new TextUtil(gen);
        textUtil.setupFonts(runaci);
        if (!textUtil.hasFonts()) {
            //Draw using Java2D when no native fonts are available
            textRun.getLayout().draw(g2d);
            return;
        }

        gen.saveGraphicsState();
        gen.concatMatrix(g2d.getTransform());
        Shape imclip = g2d.getClip();
        clip(ps, imclip);
            hasunsupported = true;
        }

        gen.writeln("BT"); //beginTextObject()
                            GVTAttributedCharacterIterator.TextAttribute.LENGTH_ADJUST);
        if (lengthAdjust != null) {
            log.trace("-> length adjustments found");
            hasunsupported = true;
        }

        AffineTransform localTransform = new AffineTransform();
        Point2D prevPos = null;
        GVTGlyphVector gv = layout.getGlyphVector();
        PSTextRun psRun = new PSTextRun(); //Used to split a text run into smaller runs
        for (int index = 0, c = gv.getNumGlyphs(); index < c; index++) {
            char ch = chars.charAt(index);
            boolean visibleChar = gv.isGlyphVisible(index)
                || (CharUtilities.isAnySpace(ch) && !CharUtilities.isZeroWidthSpace(ch));
            logCharacter(ch, layout, index, visibleChar);
            if (!visibleChar) {
                continue;
            }
            Point2D glyphPos = gv.getGlyphPosition(index);

            AffineTransform glyphTransform = gv.getGlyphTransform(index);
            if (log.isTraceEnabled()) {
                log.trace("pos " + glyphPos + ", transform " + glyphTransform);
            }
            if (DEBUG) {
                Shape sh = gv.getGlyphLogicalBounds(index);
                if (sh == null) {
                    sh = new Ellipse2D.Double(glyphPos.getX(), glyphPos.getY(), 2, 2);
                }
                debugShapes.append(sh, false);
            }

            //Exact position of the glyph
            localTransform.setToIdentity();
            localTransform.translate(glyphPos.getX(), glyphPos.getY());
            if (glyphTransform != null) {
                localTransform.concatenate(glyphTransform);
            }
            localTransform.scale(1, -1);

            boolean flushCurrentRun = false;
            //Try to optimize by combining characters using the same font and on the same line.
            if (glyphTransform != null) {
                //Happens for text-on-a-path
                flushCurrentRun = true;
            }
            if (psRun.getRunLength() >= 128) {
                //Don't let a run get too long
                flushCurrentRun = true;
            }

            //Note the position of the glyph relative to the previous one
            Point2D relPos;
            if (prevPos == null) {
                relPos = new Point2D.Double(0, 0);
            } else {
                relPos = new Point2D.Double(
                        glyphPos.getX() - prevPos.getX(),
                        glyphPos.getY() - prevPos.getY());
            }
            if (psRun.vertChanges == 0
                    && psRun.getHorizRunLength() > 2
                    && relPos.getY() != 0) {
                //new line
                flushCurrentRun = true;
            }

            //Select the actual character to paint
            char paintChar = (CharUtilities.isAnySpace(ch) ? ' ' : ch);

            //Select (sub)font for character
            Font f = textUtil.selectFontForChar(paintChar);
            char mapped = f.mapChar(ch);
            boolean fontChanging = textUtil.isFontChanging(f, mapped);
            if (fontChanging) {
                flushCurrentRun = true;
            }

            if (flushCurrentRun) {
                //Paint the current run and reset for the next run
                psRun.paint(ps, textUtil, tpi);
                psRun.reset();
            }

            //Track current run
            psRun.addCharacter(paintChar, relPos);
            psRun.noteStartingTransformation(localTransform);

            //Change font if necessary
            if (fontChanging) {
                textUtil.setCurrentFont(f, mapped);
            }

            //Update last position
            prevPos = glyphPos;
        }
        psRun.paint(ps, textUtil, tpi);
        gen.writeln("ET"); //endTextObject()
        gen.restoreGraphicsState();

        if (DEBUG) {
            //Paint debug shapes
            g2d.setStroke(new BasicStroke(0));
            g2d.setColor(Color.LIGHT_GRAY);
            g2d.draw(debugShapes);
        }
        return hasunsupported;
    }

    private void applyColor(Paint paint, final PSGenerator gen) throws IOException {
        if (paint == null) {
            return;
        } else if (paint instanceof Color) {
            Color col = (Color)paint;
            gen.useColor(col);
        } else {
            log.warn("Paint not supported: " + paint.toString());
        Iterator i = textRuns.iterator();
        while (i.hasNext()) {
            StrokingTextPainter.TextRun
                    run = (StrokingTextPainter.TextRun)i.next();
            currentloc = paintTextRun(run, g2d, currentloc);
        }
    }

    private PSResource getResourceForFont(Font f, String postfix) {
        String key = (postfix != null ? f.getFontName() + '_' + postfix : f.getFontName());
        return this.fontResources.getPSResourceForFontKey(key);
     * @param g2d the Graphics2D to paint to
     * @param loc the current location of the "cursor"
     * @return the new location of the "cursor" after painting the text run
     */
    protected Point2D paintTextRun(StrokingTextPainter.TextRun run, Graphics2D g2d, Point2D loc) {
        AttributedCharacterIterator aci = run.getACI();
        return paintACI(aci, g2d, loc);
    }

    private void clip(PSGraphics2D ps, Shape shape) throws IOException {
        if (shape == null) {
            return;
     * @return the extracted text
     */
    protected String getText(AttributedCharacterIterator aci) {
        StringBuffer sb = new StringBuffer(aci.getEndIndex() - aci.getBeginIndex());
        for (char c = aci.first(); c != CharacterIterator.DONE; c = aci.next()) {
            sb.append(c);
        }
        ps.getPSGenerator().writeln("newpath");
        PathIterator iter = shape.getPathIterator(IDENTITY_TRANSFORM);
        ps.processPathIterator(iter);
        ps.getPSGenerator().writeln("clip");
    }

    private class TextUtil {
     * Paint an ACI on a Graphics2D at a given location. The method has to
     * update the location after painting.
     * @param aci ACI to paint
     * @param g2d Graphics2D to paint on
     * @param loc start location
     * @return new current location
     */
    protected Point2D paintACI(AttributedCharacterIterator aci, Graphics2D g2d, Point2D loc) {
        //ACIUtils.dumpAttrs(aci);

        private PSGenerator gen;
        private Font[] fonts;
        private Font currentFont;
        private int currentEncoding = -1;

        public TextUtil(PSGenerator gen) {
            this.gen = gen;
        TextPaintInfo tpi = (TextPaintInfo) aci.getAttribute(
            GVTAttributedCharacterIterator.TextAttribute.PAINT_INFO);

        if (tpi == null) {
            return loc;
        }

        public Font selectFontForChar(char ch) {
            for (int i = 0, c = fonts.length; i < c; i++) {
                if (fonts[i].hasChar(ch)) {
                    return fonts[i];
                }
            }
            return fonts[0]; //TODO Maybe fall back to painting with shapes
        Paint strokePaint = tpi.strokePaint;
        Stroke stroke = tpi.strokeStroke;

        Float fontSize = (Float)aci.getAttribute(TextAttribute.SIZE);
        if (fontSize == null) {
            return loc;
        }
        Float posture = (Float)aci.getAttribute(TextAttribute.POSTURE);
        Float taWeight = (Float)aci.getAttribute(TextAttribute.WEIGHT);

        public void writeTextMatrix(AffineTransform transform) throws IOException {
            double[] matrix = new double[6];
            transform.getMatrix(matrix);
            gen.writeln(gen.formatDouble5(matrix[0]) + " "
                + gen.formatDouble5(matrix[1]) + " "
                + gen.formatDouble5(matrix[2]) + " "
                + gen.formatDouble5(matrix[3]) + " "
                + gen.formatDouble5(matrix[4]) + " "
                + gen.formatDouble5(matrix[5]) + " Tm");
        }
        g2d.setPaint(foreground);
        g2d.setStroke(stroke);

        public boolean isFontChanging(Font f, char mapped) {
            if (f != getCurrentFont()) {
                int encoding = mapped / 256;
                if (encoding != getCurrentFontEncoding()) {
                    return true; //Font is changing
                }
        float advance = getStringWidth(txt, font);
        float tx = 0;
        if (anchor != null) {
            switch (anchor.getType()) {
                case TextNode.Anchor.ANCHOR_MIDDLE:
                    tx = -advance / 2;
                    break;
                case TextNode.Anchor.ANCHOR_END:
                    tx = -advance;
                    break;
                default: //nop
            }
            return false; //Font is the same
        }

        public void selectFont(Font f, char mapped) throws IOException {
            int encoding = mapped / 256;
            String postfix = (encoding == 0 ? null : Integer.toString(encoding));
            PSResource res = getResourceForFont(f, postfix);
            gen.useFont("/" + res.getName(), f.getFontSize() / 1000f);
            gen.getResourceTracker().notifyResourceUsageOnPage(res);
        }

        public Font getCurrentFont() {
            return this.currentFont;
        nativeTextHandler.setOverrideFont(font);
        try {
            try {
                nativeTextHandler.drawString(txt, (float)(loc.getX() + tx), (float)(loc.getY()));
            } catch (IOException ioe) {
                if (g2d instanceof PSGraphics2D) {
                    ((PSGraphics2D)g2d).handleIOException(ioe);
                }
            }
        } finally {
            nativeTextHandler.setOverrideFont(null);
        }
    }

        public int getCurrentFontEncoding() {
            return this.currentEncoding;
                Point2D loc) {
        //Adjust position of span
        Float xpos = (Float)aci.getAttribute(
                GVTAttributedCharacterIterator.TextAttribute.X);
        Float ypos = (Float)aci.getAttribute(
                GVTAttributedCharacterIterator.TextAttribute.Y);
        Float dxpos = (Float)aci.getAttribute(
                GVTAttributedCharacterIterator.TextAttribute.DX);
        Float dypos = (Float)aci.getAttribute(
                GVTAttributedCharacterIterator.TextAttribute.DY);
        if (xpos != null) {
            loc.setLocation(xpos.doubleValue(), loc.getY());
        }

        public void setCurrentFont(Font font, int encoding) {
            this.currentFont = font;
            this.currentEncoding = encoding;
        }

        public void setCurrentFont(Font font, char mapped) {
            int encoding = mapped / 256;
            setCurrentFont(font, encoding);
        }

        public void setupFonts(AttributedCharacterIterator runaci) {
            this.fonts = findFonts(runaci);
        }
    }

        public boolean hasFonts() {
            return (fonts != null) && (fonts.length > 0);
        }
                       ? "italic"
                       : "normal";
    }

    private int getWeight(AttributedCharacterIterator aci) {
        Float taWeight = (Float)aci.getAttribute(TextAttribute.WEIGHT);
        return ((taWeight != null) &&  (taWeight.floatValue() > 1.0))
                       ? Font.WEIGHT_BOLD
                       : Font.WEIGHT_NORMAL;
    }

    private class PSTextRun {

        private AffineTransform textTransform;
        private List relativePositions = new java.util.LinkedList();
        private StringBuffer currentChars = new StringBuffer();
        private int horizChanges = 0;
        private int vertChanges = 0;

        public void reset() {
            textTransform = null;
            currentChars.setLength(0);
            horizChanges = 0;
            vertChanges = 0;
            relativePositions.clear();
        }
        String style = getStyle(aci);
        int weight = getWeight(aci);

        public int getHorizRunLength() {
            if (this.vertChanges == 0
                    && getRunLength() > 0) {
                return getRunLength();
            Iterator i = gvtFonts.iterator();
            while (i.hasNext()) {
                GVTFontFamily fam = (GVTFontFamily) i.next();
                /* (todo) Enable SVG Font painting
                if (fam instanceof SVGFontFamily) {
                    PROXY_PAINTER.paint(node, g2d);
                    return;
                }*/
                fontFamily = fam.getFamilyName();
                if (fontInfo.hasFont(fontFamily, style, weight)) {
                    FontTriplet triplet = fontInfo.fontLookup(
                            fontFamily, style, weight);
                    int fsize = (int)(fontSize.floatValue() * 1000);
                    return fontInfo.getFontInstance(triplet, fsize);
                }
            }
            return 0;
        }
        FontTriplet triplet = fontInfo.fontLookup("any", style, Font.WEIGHT_NORMAL);
        int fsize = (int)(fontSize.floatValue() * 1000);
        return fontInfo.getFontInstance(triplet, fsize);
    }

        public void addCharacter(char paintChar, Point2D relPos) {
            addRelativePosition(relPos);
            currentChars.append(paintChar);
        int fStyle = java.awt.Font.PLAIN;
        if (weight == Font.WEIGHT_BOLD) {
            fStyle |= java.awt.Font.BOLD;
        }
        if ("italic".equals(style)) {
            fStyle |= java.awt.Font.ITALIC;
        }
        return new java.awt.Font(font.getFontName(), fStyle,
                             (font.getFontSize() / 1000));
    }

        private void addRelativePosition(Point2D relPos) {
            if (getRunLength() > 0) {
                if (relPos.getX() != 0) {
                    horizChanges++;
        for (int i = 0; i < str.length(); i++) {
            float charWidth;
            char c = str.charAt(i);
            if (!((c == ' ') || (c == '\n') || (c == '\r') || (c == '\t'))) {
                charWidth = font.getWidth(font.mapChar(c));
                if (charWidth <= 0) {
                    charWidth = whitespaceWidth;
                }
                if (relPos.getY() != 0) {
                    vertChanges++;
                }
            }
            relativePositions.add(relPos);
        }
        return wordWidth / 1000f;
    }

        public void noteStartingTransformation(AffineTransform transform) {
            if (textTransform == null) {
                this.textTransform = new AffineTransform(transform);
            char c = str.charAt(i);
            if (!((c == ' ') || (c == '\n') || (c == '\r') || (c == '\t'))) {
                if (!font.hasChar(c)) {
                    return true;
                }
            }
        }
        return false;
    }

        public int getRunLength() {
            return currentChars.length();
        }
     * shape since in theory it should be the same.
     *
     * @param node the text node
     * @return the outline shape of the text characters
     */
    public Shape getOutline(TextNode node) {
        return PROXY_PAINTER.getOutline(node);
    }

        private boolean isXShow() {
            return vertChanges == 0;
        }
     * since in theory it should be the same.
     *
     * @param node the text node
     * @return the bounds of the text
     */
    public Rectangle2D getBounds2D(TextNode node) {
        /* (todo) getBounds2D() is too slow
         * because it uses the StrokingTextPainter. We should implement this
         * method ourselves. */
        return PROXY_PAINTER.getBounds2D(node);
    }

        private boolean isYShow() {
            return horizChanges == 0;
        }
     * since in theory it should be the same.
     * @param node the text node
     * @return the bounds of the text
     */
    public Rectangle2D getGeometryBounds(TextNode node) {
        return PROXY_PAINTER.getGeometryBounds(node);
    }

        public void paint(PSGraphics2D g2d, TextUtil textUtil, TextPaintInfo tpi)
                    throws IOException {
            if (getRunLength() > 0) {
                if (log.isDebugEnabled()) {
                    log.debug("Text run: " + currentChars);
                }
                textUtil.writeTextMatrix(this.textTransform);
                if (isXShow()) {
                    log.debug("Horizontal text: xshow");
                    paintXYShow(g2d, textUtil, tpi.fillPaint, true, false);
                } else if (isYShow()) {
                    log.debug("Vertical text: yshow");
                    paintXYShow(g2d, textUtil, tpi.fillPaint, false, true);
                } else {
                    log.debug("Arbitrary text: xyshow");
                    paintXYShow(g2d, textUtil, tpi.fillPaint, true, true);
                }
                boolean stroke = (tpi.strokePaint != null) && (tpi.strokeStroke != null);
                if (stroke) {
                    log.debug("Stroked glyph outlines");
                    paintStrokedGlyphs(g2d, textUtil, tpi.strokePaint, tpi.strokeStroke);
                }
            }
        }

        private void paintXYShow(PSGraphics2D g2d, TextUtil textUtil, Paint paint,
                boolean x, boolean y) throws IOException {
            PSGenerator gen = textUtil.gen;
            char firstChar = this.currentChars.charAt(0);
            //Font only has to be setup up before the first character
            Font f = textUtil.selectFontForChar(firstChar);
            char mapped = f.mapChar(firstChar);
            textUtil.selectFont(f, mapped);
            textUtil.setCurrentFont(f, mapped);
            applyColor(paint, gen);
    }

            StringBuffer sb = new StringBuffer();
            sb.append('(');
            for (int i = 0, c = this.currentChars.length(); i < c; i++) {
                char ch = this.currentChars.charAt(i);
                mapped = f.mapChar(ch);
                PSGenerator.escapeChar(mapped, sb);
            }
            sb.append(')');
            if (x || y) {
                sb.append("\n[");
                int idx = 0;
                Iterator iter = this.relativePositions.iterator();
                while (iter.hasNext()) {
                    Point2D pt = (Point2D)iter.next();
                    if (idx > 0) {
                        if (x) {
                            sb.append(format(gen, pt.getX()));
                        }
                        if (y) {
                            if (x) {
                                sb.append(' ');
                            }
                            sb.append(format(gen, -pt.getY()));
                        }
                        if (idx % 8 == 0) {
                            sb.append('\n');
                        } else {
                            sb.append(' ');
                        }
                    }
                    idx++;
                }
                if (x) {
                    sb.append('0');
                }
                if (y) {
                    if (x) {
                        sb.append(' ');
                    }
                    sb.append('0');
                }
                sb.append(']');
            }
            sb.append(' ');
            if (x) {
                sb.append('x');
            }
            if (y) {
                sb.append('y');
            }
            sb.append("show"); // --> xshow, yshow or xyshow
            gen.writeln(sb.toString());
        }

        private String format(PSGenerator gen, double coord) {
            if (Math.abs(coord) < 0.00001) {
                return "0";
            } else {
                return gen.formatDouble5(coord);
            }
        }
     */
    public Mark selectTo(double x, double y, Mark beginMark) {
        return null;
    }

        private void paintStrokedGlyphs(PSGraphics2D g2d, TextUtil textUtil,
                Paint strokePaint, Stroke stroke) throws IOException {
            PSGenerator gen = textUtil.gen;
     * @param node the text node
     * @return null
     */
    public Mark selectFirst(TextNode node) {
        return null;
    }

            applyColor(strokePaint, gen);
            PSGraphics2D.applyStroke(stroke, gen);
     * This does nothing since the output is pdf and not interactive.
     * @param node the text node
     * @return null
     */
    public Mark selectLast(TextNode node) {
        return null;
    }

            Font f = null;
            Iterator iter = this.relativePositions.iterator();
            iter.next();
            Point2D pos = new Point2D.Double(0, 0);
            gen.writeln("0 0 M");
            for (int i = 0, c = this.currentChars.length(); i < c; i++) {
                char ch = this.currentChars.charAt(0);
                if (i == 0) {
                    //Font only has to be setup up before the first character
                    f = textUtil.selectFontForChar(ch);
                }
                char mapped = f.mapChar(ch);
                if (i == 0) {
                    textUtil.selectFont(f, mapped);
                    textUtil.setCurrentFont(f, mapped);
                }
                mapped = f.mapChar(this.currentChars.charAt(i));
                //add glyph outlines to current path
                char codepoint = (char)(mapped % 256);
                gen.write("(" + codepoint + ")");
                gen.writeln(" false charpath");

                if (iter.hasNext()) {
                    //Position for the next character
                    Point2D pt = (Point2D)iter.next();
                    pos.setLocation(pos.getX() + pt.getX(), pos.getY() - pt.getY());
                    gen.writeln(gen.formatDouble5(pos.getX()) + " "
                            + gen.formatDouble5(pos.getY()) + " M");
                }
            }
            gen.writeln("stroke"); //paints all accumulated glyph outlines
        }

    }

}





package org.apache.fop.render.ps;

import org.w3c.dom.Element;

import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.SVGTextElementBridge;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.TextPainter;

import org.w3c.dom.Element;
import org.w3c.dom.Node;

/**
 * Bridge class for the &lt;text> element.
 * This bridge will use the direct text painter if the text

 */
public class PSTextElementBridge extends SVGTextElementBridge {

    private TextPainter textPainter;

    /**
     * Constructs a new bridge for the &lt;text> element.
     * @param textPainter the text painter to use
     */
    public PSTextElementBridge(TextPainter textPainter) {
        this.textPainter = textPainter;
    }


     */
    public GraphicsNode createGraphicsNode(BridgeContext ctx, Element e) {
        GraphicsNode node = super.createGraphicsNode(ctx, e);
        ((TextNode)node).setTextPainter(getTextPainter());
         * at determining whether to stroke or not. */
        if (true/*node != null && isSimple(ctx, e, node)*/) {
            ((TextNode)node).setTextPainter(getTextPainter());
        }
        return node;
    }

    private TextPainter getTextPainter() {
        return this.textPainter;
    }

    /**
     * Check if text element contains simple text.
     * This checks the children of the text element to determine
     * if the text is simple. The text is simple if it can be rendered
     * with basic text drawing algorithms. This means there are no
     * alternate characters, the font is known and there are no effects
     * applied to the text.
     *
     * @param ctx the bridge context
     * @param element the svg text element
     * @param node the graphics node
     * @return true if this text is simple of false if it cannot be
     *         easily rendered using normal drawString on the PDFGraphics2D
     */
    private boolean isSimple(BridgeContext ctx, Element element, GraphicsNode node) {
        for (Node n = element.getFirstChild();
                n != null;
                n = n.getNextSibling()) {

            switch (n.getNodeType()) {
            case Node.ELEMENT_NODE:

                if (n.getLocalName().equals(SVG_TSPAN_TAG)
                        || n.getLocalName().equals(SVG_ALT_GLYPH_TAG)) {
                    return false;
                } else if (n.getLocalName().equals(SVG_TEXT_PATH_TAG)) {
                    return false;
                } else if (n.getLocalName().equals(SVG_TREF_TAG)) {
                    return false;
                }
                break;
            case Node.TEXT_NODE:
            case Node.CDATA_SECTION_NODE:
            default:
            }
        }

        /*if (CSSUtilities.convertFilter(element, node, ctx) != null) {
            return false;
        }*/

        return true;
    }
}





        PSGraphics2D graphics = new PSGraphics2D(strokeText, gen);
        graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());

        BridgeContext ctx = new PSBridgeContext(ua,
                (strokeText ? null : psInfo.fontInfo),
                context.getUserAgent().getFactory().getImageManager(),
                context.getUserAgent().getImageSessionContext());
            nativeTextHandler = new NativeTextHandler(graphics, fontInfo);
            graphics.setCustomTextHandler(nativeTextHandler);
            PSTextPainter textPainter = new PSTextPainter(nativeTextHandler);
            ctx.setTextPainter(textPainter);
            PSTextElementBridge tBridge = new PSTextElementBridge(textPainter);
            ctx.putBridge(tBridge);
        }

        //Cloning SVG DOM as Batik attaches non-thread-safe facilities (like the CSS engine)
        //to it.




/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * 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.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

/* $Id$ */

package org.apache.fop.render.ps;

import java.text.AttributedCharacterIterator;
import java.util.List;

import org.apache.batik.bridge.svg12.SVGFlowRootElementBridge;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.TextPainter;
import org.apache.batik.gvt.flow.FlowTextPainter;

import org.apache.fop.fonts.FontInfo;

/**
 * Element Bridge for SVG 1.2 flow text, so those texts can be painted using
 * PDF primitives.
 */
public class PSSVGFlowRootElementBridge extends SVGFlowRootElementBridge {

    private PSTextPainter textPainter;

    /**
     * Main Constructor.
     * @param fontInfo the font directory
     */
    public PSSVGFlowRootElementBridge(FontInfo fontInfo) {
        this.textPainter = new PSFlowTextPainter(fontInfo);
    }

    /** {@inheritDoc} */
    protected GraphicsNode instantiateGraphicsNode() {
        GraphicsNode node = super.instantiateGraphicsNode();
        if (node != null) {
            //Set our own text painter
            ((TextNode)node).setTextPainter(getTextPainter());
        }
        return node;
    }

    /**
     * Returns the text painter used by this bridge.
     * @return the text painter
     */
    public TextPainter getTextPainter() {
        return this.textPainter;
    }

    private class PSFlowTextPainter extends PSTextPainter {

        /**
         * Main constructor
         * @param fontInfo the font directory
         */
        public PSFlowTextPainter(FontInfo fontInfo) {
            super(fontInfo);
        }

        /** {@inheritDoc} */
        public List getTextRuns(TextNode node, AttributedCharacterIterator aci) {
            //Text runs are delegated to the normal FlowTextPainter, we just paint the text.
            FlowTextPainter delegate = (FlowTextPainter)FlowTextPainter.getInstance();
            return delegate.getTextRuns(node, aci);
        }

    }

}
  + Id
  + native




            //TODO Opportunity for font caching if font state is more heavily used
            String fontKey = getFontInfo().getInternalFontKey(triplet);
            int sizeMillipoints = state.getFontSize();
            float fontSize = sizeMillipoints / 1000f;

            // This assumes that *all* CIDFonts use a /ToUnicode mapping
            Typeface tf = getTypeface(fontKey);

            }
            Font font = getFontInfo().getFontInstance(triplet, sizeMillipoints);

            useFont(fontKey, sizeMillipoints);
            generator.useFont("/" + res.getName(), fontSize);
            generator.getResourceTracker().notifyResourceUsageOnPage(res);

            generator.writeln("1 0 0 -1 " + formatMptAsPt(generator, x)
                    + " " + formatMptAsPt(generator, y) + " Tm");




        PSGraphics2D graphics = new PSGraphics2D(strokeText, gen);
        graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());

        BridgeContext ctx = new PSBridgeContext(ua,
                (strokeText ? null : psContext.getFontInfo()),
                context.getUserAgent().getFactory().getImageManager(),
                context.getUserAgent().getImageSessionContext());
            graphics.setCustomTextHandler(nativeTextHandler);
            PSTextPainter textPainter = new PSTextPainter(nativeTextHandler);
            ctx.setTextPainter(textPainter);
            PSTextElementBridge tBridge = new PSTextElementBridge(textPainter);
            ctx.putBridge(tBridge);
        }

        GraphicsNode root;
        try {




import org.apache.xmlgraphics.ps.dsc.events.DSCCommentHiResBoundingBox;

import org.apache.fop.apps.MimeConstants;
import org.apache.fop.fonts.LazyFont;
import org.apache.fop.fonts.Typeface;
import org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;
import org.apache.fop.render.intermediate.IFContext;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;

    /** Used to temporarily store PSSetupCode instance until they can be written. */
    private List setupCodeList;

    /** This is a cache of PSResource instances of all fonts defined */
    private FontResourceCache fontResources;
    /** This is a map of PSResource instances of all forms (key: uri) */
    private Map formResources;


    /** {@inheritDoc} */
    public void startDocument() throws IFException {
        super.startDocument();
        this.fontResources = new FontResourceCache(getFontInfo());
        try {
            OutputStream out;
            if (psUtil.isOptimizeResources()) {

        gen.writeDSCComment(DSCConstants.BEGIN_SETUP);
        PSRenderingUtil.writeSetupCodeList(gen, setupCodeList, "SetupCode");
        if (!psUtil.isOptimizeResources()) {
            this.fontResources.addAll(PSFontUtils.writeFontDict(gen, fontInfo));
        } else {
            gen.commentln("%FOPFontSetup"); //Place-holder, will be replaced in the second pass
        }

        }
    }

    private String getPostScriptNameForFontKey(String key) {
        int pos = key.indexOf('_');
        String postFix = null;
        if (pos > 0) {
            postFix = key.substring(pos);
            key = key.substring(0, pos);
        }
        Map fonts = fontInfo.getFonts();
        Typeface tf = (Typeface)fonts.get(key);
        if (tf instanceof LazyFont) {
            tf = ((LazyFont)tf).getRealFont();
        }
        if (tf == null) {
            throw new IllegalStateException("Font not available: " + key);
        }
        if (postFix == null) {
            return tf.getFontName();
        } else {
            return tf.getFontName() + postFix;
        }
    }

    /**
     * Returns the PSResource for the given font key.
     * @param key the font key ("F*")
     * @return the matching PSResource
     */
    protected PSResource getPSResourceForFontKey(String key) {
        return this.fontResources.getPSResourceForFontKey(key);
        if (this.fontResources != null) {
            res = (PSResource)this.fontResources.get(key);
        } else {
            this.fontResources = new java.util.HashMap();
        }
        if (res == null) {
            res = new PSResource(PSResource.TYPE_FONT, getPostScriptNameForFontKey(key));
            this.fontResources.put(key, res);
        }
        return res;
    }

    /**




/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * 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.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

/* $Id$ */

package org.apache.fop.render.ps;

import java.awt.geom.AffineTransform;

import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.DocumentLoader;
import org.apache.batik.bridge.SVGTextElementBridge;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.gvt.TextPainter;

import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.image.loader.ImageSessionContext;

import org.apache.fop.fonts.FontInfo;
import org.apache.fop.svg.AbstractFOPBridgeContext;

/**
 * BridgeContext which registers the custom bridges for PostScript output.
 */
public class PSBridgeContext extends AbstractFOPBridgeContext {

    /**
     * Constructs a new bridge context.
     * @param userAgent the user agent
     * @param documentLoader the Document Loader to use for referenced documents.
     * @param fontInfo the font list for the text painter, may be null
     *                 in which case text is painted as shapes
     * @param imageManager an image manager
     * @param imageSessionContext an image session context
     * @param linkTransform AffineTransform to properly place links,
     *                      may be null
     */
    public PSBridgeContext(UserAgent userAgent, DocumentLoader documentLoader,
            FontInfo fontInfo, ImageManager imageManager,
            ImageSessionContext imageSessionContext,
            AffineTransform linkTransform) {
        super(userAgent, documentLoader, fontInfo,
                imageManager, imageSessionContext, linkTransform);
    }

    /**
     * Constructs a new bridge context.
     * @param userAgent the user agent
     * @param fontInfo the font list for the text painter, may be null
     *                 in which case text is painted as shapes
     * @param imageManager an image manager
     * @param imageSessionContext an image session context
     */
    public PSBridgeContext(UserAgent userAgent, FontInfo fontInfo,
            ImageManager imageManager, ImageSessionContext imageSessionContext) {
        super(userAgent, fontInfo, imageManager, imageSessionContext);
    }

    /** {@inheritDoc} */
    public void registerSVGBridges() {
        super.registerSVGBridges();

        if (fontInfo != null) {
            TextPainter textPainter = new PSTextPainter(fontInfo);
            SVGTextElementBridge textElementBridge = new PSTextElementBridge(textPainter);
            putBridge(textElementBridge);

            //Batik flow text extension (may not always be available)
            //putBridge(new PDFBatikFlowTextElementBridge(fontInfo);
            putElementBridgeConditional(
                    "org.apache.fop.render.ps.PSBatikFlowTextElementBridge",
                    "org.apache.batik.extension.svg.BatikFlowTextElementBridge");

            //SVG 1.2 flow text support
            //putBridge(new PDFSVG12TextElementBridge(fontInfo)); //-->Batik 1.7
            putElementBridgeConditional(
                    "org.apache.fop.render.ps.PSSVG12TextElementBridge",
                    "org.apache.batik.bridge.svg12.SVG12TextElementBridge");

            //putBridge(new PDFSVGFlowRootElementBridge(fontInfo));
            putElementBridgeConditional(
                    "org.apache.fop.render.ps.PSSVGFlowRootElementBridge",
                    "org.apache.batik.bridge.svg12.SVGFlowRootElementBridge");
        }

        //putBridge(new PSImageElementBridge()); //TODO uncomment when implemented
    }

    // Make sure any 'sub bridge contexts' also have our bridges.
    //TODO There's no matching method in the super-class here
    public BridgeContext createBridgeContext() {
        return new PSBridgeContext(getUserAgent(), getDocumentLoader(),
                                    fontInfo,
                                    getImageManager(),
                                    getImageSessionContext(),
                                    linkTransform);
    }

}
  + Id
  + native




/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * 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.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

/* $Id$ */

package org.apache.fop.render.ps;

import java.text.AttributedCharacterIterator;
import java.util.List;

import org.apache.batik.extension.svg.BatikFlowTextElementBridge;
import org.apache.batik.extension.svg.FlowExtTextPainter;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.TextPainter;

import org.apache.fop.fonts.FontInfo;

/**
 * Element Bridge for Batik's flow text extension, so those texts can be painted using
 * PostScript primitives.
 */
public class PSBatikFlowTextElementBridge extends BatikFlowTextElementBridge {

    private PSTextPainter textPainter;

    /**
     * Main Constructor.
     * @param fontInfo the font directory
     */
    public PSBatikFlowTextElementBridge(FontInfo fontInfo) {
        this.textPainter = new PSFlowExtTextPainter(fontInfo);
    }

    /** {@inheritDoc} */
    protected GraphicsNode instantiateGraphicsNode() {
        GraphicsNode node = super.instantiateGraphicsNode();
        if (node != null) {
            //Set our own text painter
            ((TextNode)node).setTextPainter(getTextPainter());
        }
        return node;
    }

    /**
     * Returns the text painter used by this bridge.
     * @return the text painter
     */
    public TextPainter getTextPainter() {
        return this.textPainter;
    }

    private class PSFlowExtTextPainter extends PSTextPainter {

        /**
         * Main constructor
         * @param fontInfo the font directory
         */
        public PSFlowExtTextPainter(FontInfo fontInfo) {
            super(fontInfo);
        }

        /** {@inheritDoc} */
        public List getTextRuns(TextNode node, AttributedCharacterIterator aci) {
            //Text runs are delegated to the normal FlowExtTextPainter, we just paint the text.
            FlowExtTextPainter delegate = (FlowExtTextPainter)FlowExtTextPainter.getInstance();
            return delegate.getTextRuns(node, aci);
        }

    }

}
  + Id
  + native




/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * 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.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

/* $Id$ */

package org.apache.fop.render.ps;

import java.util.Map;

import org.apache.xmlgraphics.ps.PSResource;

import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.LazyFont;
import org.apache.fop.fonts.Typeface;

/**
 * A cache for font resource objects.
 */
class FontResourceCache {

    private FontInfo fontInfo;

    /** This is a map of PSResource instances of all fonts defined (key: font key) */
    private Map fontResources = new java.util.HashMap();

    public FontResourceCache(FontInfo fontInfo) {
        this.fontInfo = fontInfo;
    }

    /**
     * Returns the PSResource for the given font key.
     * @param key the font key ("F*")
     * @return the matching PSResource
     */
    public PSResource getPSResourceForFontKey(String key) {
        PSResource res = null;
        if (this.fontResources != null) {
            res = (PSResource)this.fontResources.get(key);
        } else {
            this.fontResources = new java.util.HashMap();
        }
        if (res == null) {
            res = new PSResource(PSResource.TYPE_FONT, getPostScriptNameForFontKey(key));
            this.fontResources.put(key, res);
        }
        return res;
    }

    private String getPostScriptNameForFontKey(String key) {
        int pos = key.indexOf('_');
        String postFix = null;
        if (pos > 0) {
            postFix = key.substring(pos);
            key = key.substring(0, pos);
        }
        Map fonts = fontInfo.getFonts();
        Typeface tf = (Typeface)fonts.get(key);
        if (tf instanceof LazyFont) {
            tf = ((LazyFont)tf).getRealFont();
        }
        if (tf == null) {
            throw new IllegalStateException("Font not available: " + key);
        }
        if (postFix == null) {
            return tf.getFontName();
        } else {
            return tf.getFontName() + postFix;
        }
    }

    /**
     * Adds a number of fonts to the cache.
     * @param fontMap the font map
     */
    public void addAll(Map fontMap) {
        this.fontResources.putAll(fontMap);
    }

}
  + Id
  + native




import org.w3c.dom.Document;
import org.w3c.dom.svg.SVGLength;

import org.apache.avalon.framework.configuration.Configuration;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.UnitProcessor;
import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.ImageTranscoder;

import org.apache.xmlgraphics.java2d.TextHandler;
import org.apache.xmlgraphics.java2d.ps.AbstractPSDocumentGraphics2D;
import org.apache.xmlgraphics.ps.PSGenerator;

import org.apache.fop.apps.FOPException;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontSetup;
import org.apache.fop.svg.AbstractFOPTranscoder;
import org.apache.fop.svg.PDFDocumentGraphics2DConfigurator;

/**
 * This class enables to transcode an input to a PostScript document.

 */
public abstract class AbstractPSTranscoder extends AbstractFOPTranscoder {

    /** the root Graphics2D instance for generating PostScript */
    protected AbstractPSDocumentGraphics2D graphics = null;

    private FontInfo fontInfo;

    /**
     * Constructs a new <tt>AbstractPSTranscoder</tt>.
     */

        super();
    }

    /**
     * Creates the root Graphics2D instance for generating PostScript.
     * @return the root Graphics2D
     */
    protected abstract AbstractPSDocumentGraphics2D createDocumentGraphics2D();

    /**


        graphics = createDocumentGraphics2D();
        if (!isTextStroked()) {
            try {
                this.fontInfo = PDFDocumentGraphics2DConfigurator.createFontInfo(
                        getEffectiveConfiguration());
                graphics.setCustomTextHandler(new NativeTextHandler(graphics, fontInfo));
            } catch (FOPException fe) {
                throw new TranscoderException(fe);
            }
        }

        super.transcode(document, uri, output);


    /** {@inheritDoc} */
    protected BridgeContext createBridgeContext() {
        //For compatibility with Batik 1.6
        return createBridgeContext("1.x");
    }

    /** {@inheritDoc} */
    public BridgeContext createBridgeContext(String version) {
        BridgeContext ctx = new PSBridgeContext(userAgent, (isTextStroked() ? null : fontInfo),
                getImageManager(), getImageSessionContext());
                NativeTextHandler nativeTextHandler = (NativeTextHandler)handler;
                PSTextPainter textPainter = new PSTextPainter(nativeTextHandler);
                ctx.setTextPainter(textPainter);
                ctx.putBridge(new PSTextElementBridge(textPainter));
            }
        }

        //ctx.putBridge(new PSImageElementBridge());
        return ctx;
    }


}

Return to bug 47000

Lines 350-356 Link Here

(-)src/java/org/apache/fop/render/ps/PSPainter.java (-4 / +1 lines)
350	//TODO Opportunity for font caching if font state is more heavily used	350	//TODO Opportunity for font caching if font state is more heavily used
351	String fontKey = getFontInfo().getInternalFontKey(triplet);	351	String fontKey = getFontInfo().getInternalFontKey(triplet);
352	int sizeMillipoints = state.getFontSize();	352	int sizeMillipoints = state.getFontSize();
353	float fontSize = sizeMillipoints / 1000f;
354		353
355	// This assumes that all CIDFonts use a /ToUnicode mapping	354	// This assumes that all CIDFonts use a /ToUnicode mapping
356	Typeface tf = getTypeface(fontKey);	355	Typeface tf = getTypeface(fontKey);
Lines 360-368 Link Here
360	}	359	}
361	Font font = getFontInfo().getFontInstance(triplet, sizeMillipoints);	360	Font font = getFontInfo().getFontInstance(triplet, sizeMillipoints);
362		361
363	PSResource res = this.documentHandler.getPSResourceForFontKey(fontKey);	362	useFont(fontKey, sizeMillipoints);
364	generator.useFont("/" + res.getName(), fontSize);
365	generator.getResourceTracker().notifyResourceUsageOnPage(res);
366		363
367	generator.writeln("1 0 0 -1 " + formatMptAsPt(generator, x)	364	generator.writeln("1 0 0 -1 " + formatMptAsPt(generator, x)
368	+ " " + formatMptAsPt(generator, y) + " Tm");	365	+ " " + formatMptAsPt(generator, y) + " Tm");

Lines 23-57 Link Here

(-)src/java/org/apache/fop/svg/PDFTranscoder.java (-89 / +3 lines)
23	import java.io.BufferedOutputStream;	23	import java.io.BufferedOutputStream;
24	import java.io.IOException;	24	import java.io.IOException;
25	import java.io.OutputStream;	25	import java.io.OutputStream;
26	import java.io.InputStream;
27		26
28	import javax.xml.transform.Source;
29	import javax.xml.transform.stream.StreamSource;
30
31	import org.w3c.dom.Document;	27	import org.w3c.dom.Document;
32	import org.w3c.dom.svg.SVGLength;	28	import org.w3c.dom.svg.SVGLength;
33		29
34	import org.apache.avalon.framework.configuration.Configurable;	30	import org.apache.avalon.framework.configuration.Configurable;
35	import org.apache.avalon.framework.configuration.Configuration;	31	import org.apache.avalon.framework.configuration.Configuration;
36	import org.apache.avalon.framework.configuration.ConfigurationException;
37	import org.apache.avalon.framework.configuration.DefaultConfiguration;
38	import org.apache.batik.bridge.BridgeContext;	32	import org.apache.batik.bridge.BridgeContext;
39	import org.apache.batik.bridge.UnitProcessor;	33	import org.apache.batik.bridge.UnitProcessor;
40	import org.apache.batik.bridge.UserAgent;	34	import org.apache.batik.bridge.UserAgent;
41	import org.apache.batik.ext.awt.RenderingHintsKeyExt;	35	import org.apache.batik.ext.awt.RenderingHintsKeyExt;
42	import org.apache.batik.transcoder.TranscoderException;	36	import org.apache.batik.transcoder.TranscoderException;
43	import org.apache.batik.transcoder.TranscoderOutput;	37	import org.apache.batik.transcoder.TranscoderOutput;
44	import org.apache.batik.transcoder.TranscodingHints;
45	import org.apache.batik.transcoder.image.ImageTranscoder;	38	import org.apache.batik.transcoder.image.ImageTranscoder;
46	import org.apache.batik.transcoder.keys.BooleanKey;
47	import org.apache.batik.transcoder.keys.FloatKey;
48	import org.apache.batik.util.ParsedURL;
49		39
50	import org.apache.xmlgraphics.image.loader.ImageContext;
51	import org.apache.xmlgraphics.image.loader.ImageManager;
52	import org.apache.xmlgraphics.image.loader.ImageSessionContext;
53	import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext;
54
55	import org.apache.fop.Version;	40	import org.apache.fop.Version;
56	import org.apache.fop.fonts.FontInfo;	41	import org.apache.fop.fonts.FontInfo;
57		42
Lines 91-117 Link Here
91	public class PDFTranscoder extends AbstractFOPTranscoder	76	public class PDFTranscoder extends AbstractFOPTranscoder
92	implements Configurable {	77	implements Configurable {
93		78
94	/**
95	* The key is used to specify the resolution for on-the-fly images generated
96	* due to complex effects like gradients and filters.
97	*/
98	public static final TranscodingHints.Key KEY_DEVICE_RESOLUTION = new FloatKey();
99
100	/**
101	* The key is used to specify whether the available fonts should be automatically
102	* detected. The alternative is to configure the transcoder manually using a configuration
103	* file.
104	*/
105	public static final TranscodingHints.Key KEY_AUTO_FONTS = new BooleanKey();
106
107	private Configuration cfg = null;
108
109	/** Graphics2D instance that is used to paint to */	79	/** Graphics2D instance that is used to paint to */
110	protected PDFDocumentGraphics2D graphics = null;	80	protected PDFDocumentGraphics2D graphics = null;
111		81
112	private ImageManager imageManager;
113	private ImageSessionContext imageSessionContext;
114
115	/**	82	/**
116	* Constructs a new <tt>PDFTranscoder</tt>.	83	* Constructs a new <tt>PDFTranscoder</tt>.
117	*/	84	*/
Lines 133-143 Link Here
133	};	100	};
134	}	101	}
135		102
136	/** {@inheritDoc} */
137	public void configure(Configuration cfg) throws ConfigurationException {
138	this.cfg = cfg;
139	}
140
141	/**	103	/**
142	* Transcodes the specified Document as an image in the specified output.	104	* Transcodes the specified Document as an image in the specified output.
143	*	105	*
Lines 155-182 Link Here
155	+ Version.getVersion()	117	+ Version.getVersion()
156	+ ": PDF Transcoder for Batik");	118	+ ": PDF Transcoder for Batik");
157	if (hints.containsKey(KEY_DEVICE_RESOLUTION)) {	119	if (hints.containsKey(KEY_DEVICE_RESOLUTION)) {
158	graphics.setDeviceDPI(((Float)hints.get(KEY_DEVICE_RESOLUTION)).floatValue());	120	graphics.setDeviceDPI(getDeviceResolution());
159	}	121	}
160		122
161	setupImageInfrastructure(uri);	123	setupImageInfrastructure(uri);
162		124
163	try {	125	try {
164	Configuration effCfg = this.cfg;	126	Configuration effCfg = getEffectiveConfiguration();
165	if (effCfg == null) {
166	//By default, enable font auto-detection if no cfg is given
167	boolean autoFonts = true;
168	if (hints.containsKey(KEY_AUTO_FONTS)) {
169	autoFonts = ((Boolean)hints.get(KEY_AUTO_FONTS)).booleanValue();
170	}
171	if (autoFonts) {
172	DefaultConfiguration c = new DefaultConfiguration("pdf-transcoder");
173	DefaultConfiguration fonts = new DefaultConfiguration("fonts");
174	c.addChild(fonts);
175	DefaultConfiguration autodetect = new DefaultConfiguration("auto-detect");
176	fonts.addChild(autodetect);
177	effCfg = c;
178	}
179	}
180		127
181	if (effCfg != null) {	128	if (effCfg != null) {
182	PDFDocumentGraphics2DConfigurator configurator	129	PDFDocumentGraphics2DConfigurator configurator
Lines 242-280 Link Here
242	}	189	}
243	}	190	}
244		191
245	private void setupImageInfrastructure(final String baseURI) {
246	final ImageContext imageContext = new ImageContext() {
247	public float getSourceResolution() {
248	return 25.4f / userAgent.getPixelUnitToMillimeter();
249	}
250	};
251	this.imageManager = new ImageManager(imageContext);
252	this.imageSessionContext = new AbstractImageSessionContext() {
253
254	public ImageContext getParentContext() {
255	return imageContext;
256	}
257
258	public float getTargetResolution() {
259	return graphics.getDeviceDPI();
260	}
261
262	public Source resolveURI(String uri) {
263	System.out.println("resolve " + uri);
264	try {
265	ParsedURL url = new ParsedURL(baseURI, uri);
266	InputStream in = url.openStream();
267	StreamSource source = new StreamSource(in, url.toString());
268	return source;
269	} catch (IOException ioe) {
270	userAgent.displayError(ioe);
271	return null;
272	}
273	}
274
275	};
276	}
277
278	/** {@inheritDoc} */	192	/** {@inheritDoc} */
279	protected BridgeContext createBridgeContext() {	193	protected BridgeContext createBridgeContext() {
280	//For compatibility with Batik 1.6	194	//For compatibility with Batik 1.6
Lines 288-294 Link Here
288	fontInfo = null;	202	fontInfo = null;
289	}	203	}
290	BridgeContext ctx = new PDFBridgeContext(userAgent, fontInfo,	204	BridgeContext ctx = new PDFBridgeContext(userAgent, fontInfo,
291	this.imageManager, this.imageSessionContext);	205	getImageManager(), getImageSessionContext());
292	return ctx;	206	return ctx;
293	}	207	}
294		208

Lines 25-52 Link Here

(-)src/java/org/apache/fop/svg/PDFTextPainter.java (-243 / +118 lines)
25	import java.awt.Paint;	25	import java.awt.Paint;
26	import java.awt.Shape;	26	import java.awt.Shape;
27	import java.awt.Stroke;	27	import java.awt.Stroke;
28	import java.awt.font.TextAttribute;
29	import java.awt.geom.AffineTransform;	28	import java.awt.geom.AffineTransform;
30	import java.awt.geom.Ellipse2D;	29	import java.awt.geom.Ellipse2D;
31	import java.awt.geom.GeneralPath;	30	import java.awt.geom.GeneralPath;
32	import java.awt.geom.Point2D;	31	import java.awt.geom.Point2D;
33	import java.lang.reflect.Method;
34	import java.text.AttributedCharacterIterator;	32	import java.text.AttributedCharacterIterator;
35	import java.util.Iterator;
36	import java.util.List;
37		33
38	import org.apache.batik.bridge.SVGFontFamily;
39	import org.apache.batik.gvt.font.GVTFont;
40	import org.apache.batik.gvt.font.GVTFontFamily;
41	import org.apache.batik.gvt.font.GVTGlyphVector;	34	import org.apache.batik.gvt.font.GVTGlyphVector;
42	import org.apache.batik.gvt.renderer.StrokingTextPainter;
43	import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
44	import org.apache.batik.gvt.text.TextPaintInfo;	35	import org.apache.batik.gvt.text.TextPaintInfo;
45	import org.apache.batik.gvt.text.TextSpanLayout;	36	import org.apache.batik.gvt.text.TextSpanLayout;
46		37
47	import org.apache.fop.fonts.Font;	38	import org.apache.fop.fonts.Font;
48	import org.apache.fop.fonts.FontInfo;	39	import org.apache.fop.fonts.FontInfo;
49	import org.apache.fop.fonts.FontTriplet;
50	import org.apache.fop.util.CharUtilities;	40	import org.apache.fop.util.CharUtilities;
51		41
52	/**	42	/**
Lines 59-252 Link Here
59	*	49	*
60	* @version $Id$	50	* @version $Id$
61	*/	51	*/
62	public class PDFTextPainter extends StrokingTextPainter {	52	class PDFTextPainter extends NativeTextPainter {
63		53
64	private static final boolean DEBUG = false;	54	private static final boolean DEBUG = false;
65		55
66	private final boolean strokeText = false;
67	private final FontInfo fontInfo;
68
69	/**	56	/**
70	* Create a new PDF text painter with the given font information.	57	* Create a new PDF text painter with the given font information.
71	* @param fi the font info	58	* @param fi the font info
72	*/	59	*/
73	public PDFTextPainter(FontInfo fi) {	60	public PDFTextPainter(FontInfo fi) {
74	fontInfo = fi;	61	super(fi);
75	}	62	}
76		63
77	/** {@inheritDoc} */	64	/** {@inheritDoc} */
78	protected void paintTextRuns(List textRuns, Graphics2D g2d) {	65	protected boolean isSupported(Graphics2D g2d) {
79	if (DEBUG) {	66	return g2d instanceof PDFGraphics2D;
80	System.out.println("paintTextRuns: count = " + textRuns.size());	67	}
81	//fontInfo.dumpAllTripletsToSystemOut();	68
82	}	69	/** {@inheritDoc} */
83	if (!(g2d instanceof PDFGraphics2D) \|\| strokeText) {	70	protected void paintTextRun(TextRun textRun, Graphics2D g2d) {
84	super.paintTextRuns(textRuns, g2d);	71	AttributedCharacterIterator runaci = textRun.getACI();
		72	runaci.first();
		73
		74	TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
		75	if (tpi == null \|\| !tpi.visible) {
85	return;	76	return;
86	}	77	}
		78	if ((tpi != null) && (tpi.composite != null)) {
		79	g2d.setComposite(tpi.composite);
		80	}
		81
		82	//------------------------------------
		83	TextSpanLayout layout = textRun.getLayout();
		84	logTextRun(runaci, layout);
		85	CharSequence chars = collectCharacters(runaci);
		86	runaci.first(); //Reset ACI
		87
87	final PDFGraphics2D pdf = (PDFGraphics2D)g2d;	88	final PDFGraphics2D pdf = (PDFGraphics2D)g2d;
88	PDFTextUtil textUtil = new PDFTextUtil(pdf.fontInfo) {	89	PDFTextUtil textUtil = new PDFTextUtil(pdf.fontInfo) {
89	protected void write(String code) {	90	protected void write(String code) {
90	pdf.currentStream.write(code);	91	pdf.currentStream.write(code);
91	}	92	}
92	};	93	};
93	for (int i = 0; i < textRuns.size(); i++) {
94	TextRun textRun = (TextRun)textRuns.get(i);
95	AttributedCharacterIterator runaci = textRun.getACI();
96	runaci.first();
97		94
98	TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);	95	if (DEBUG) {
99	if (tpi == null \|\| !tpi.visible) {	96	log.debug("Text: " + chars);
100	continue;	97	pdf.currentStream.write("%Text: " + chars + "\n");
101	}	98	}
102	if ((tpi != null) && (tpi.composite != null)) {
103	g2d.setComposite(tpi.composite);
104	}
105		99
106	//------------------------------------	100	GeneralPath debugShapes = null;
107	TextSpanLayout layout = textRun.getLayout();	101	if (DEBUG) {
108	if (DEBUG) {	102	debugShapes = new GeneralPath();
109	int charCount = runaci.getEndIndex() - runaci.getBeginIndex();	103	}
110	System.out.println("================================================");
111	System.out.println("New text run:");
112	System.out.println("char count: " + charCount);
113	System.out.println("range: "
114	+ runaci.getBeginIndex() + " - " + runaci.getEndIndex());
115	System.out.println("glyph count: " + layout.getGlyphCount()); //=getNumGlyphs()
116	}
117	//Gather all characters of the run
118	StringBuffer chars = new StringBuffer();
119	for (runaci.first(); runaci.getIndex() < runaci.getEndIndex();) {
120	chars.append(runaci.current());
121	runaci.next();
122	}
123	runaci.first();
124	if (DEBUG) {
125	System.out.println("Text: " + chars);
126	pdf.currentStream.write("%Text: " + chars + "\n");
127	}
128		104
129	GeneralPath debugShapes = null;	105	Font[] fonts = findFonts(runaci);
130	if (DEBUG) {	106	if (fonts == null \|\| fonts.length == 0) {
131	debugShapes = new GeneralPath();	107	//Draw using Java2D when no native fonts are available
132	}	108	textRun.getLayout().draw(g2d);
		109	return;
		110	}
133		111
134	Font[] fonts = findFonts(runaci);	112	textUtil.saveGraphicsState();
135	if (fonts == null \|\| fonts.length == 0) {	113	textUtil.concatMatrix(g2d.getTransform());
136	//Draw using Java2D	114	Shape imclip = g2d.getClip();
137	textRun.getLayout().draw(g2d);	115	pdf.writeClip(imclip);
138	continue;
139	}
140		116
141	textUtil.saveGraphicsState();	117	applyColorAndPaint(tpi, pdf);
142	textUtil.concatMatrix(g2d.getTransform());
143	Shape imclip = g2d.getClip();
144	pdf.writeClip(imclip);
145		118
146	applyColorAndPaint(tpi, pdf);	119	textUtil.beginTextObject();
		120	textUtil.setFonts(fonts);
		121	boolean stroke = (tpi.strokePaint != null)
		122	&& (tpi.strokeStroke != null);
		123	textUtil.setTextRenderingMode(tpi.fillPaint != null, stroke, false);
147		124
148	textUtil.beginTextObject();	125	AffineTransform localTransform = new AffineTransform();
149	textUtil.setFonts(fonts);	126	Point2D prevPos = null;
150	boolean stroke = (tpi.strokePaint != null)	127	double prevVisibleCharWidth = 0.0;
151	&& (tpi.strokeStroke != null);	128	GVTGlyphVector gv = layout.getGlyphVector();
152	textUtil.setTextRenderingMode(tpi.fillPaint != null, stroke, false);	129	for (int index = 0, c = gv.getNumGlyphs(); index < c; index++) {
		130	char ch = chars.charAt(index);
		131	boolean visibleChar = gv.isGlyphVisible(index)
		132	\|\| (CharUtilities.isAnySpace(ch) && !CharUtilities.isZeroWidthSpace(ch));
		133	logCharacter(ch, layout, index, visibleChar);
		134	if (!visibleChar) {
		135	continue;
		136	}
		137	Point2D glyphPos = gv.getGlyphPosition(index);
153		138
154	AffineTransform localTransform = new AffineTransform();	139	AffineTransform glyphTransform = gv.getGlyphTransform(index);
155	Point2D prevPos = null;	140	//TODO Glyph transforms could be refined so not every char has to be painted
156	double prevVisibleCharWidth = 0.0;	141	//with its own TJ command (stretch/squeeze case could be optimized)
157	GVTGlyphVector gv = layout.getGlyphVector();	142	if (log.isTraceEnabled()) {
158	for (int index = 0, c = gv.getNumGlyphs(); index < c; index++) {	143	log.trace("pos " + glyphPos + ", transform " + glyphTransform);
159	char ch = chars.charAt(index);	144	}
160	boolean visibleChar = gv.isGlyphVisible(index)	145	if (DEBUG) {
161	\|\| (CharUtilities.isAnySpace(ch) && !CharUtilities.isZeroWidthSpace(ch));	146	Shape sh = gv.getGlyphLogicalBounds(index);
162	if (DEBUG) {	147	if (sh == null) {
163	System.out.println("glyph " + index	148	sh = new Ellipse2D.Double(glyphPos.getX(), glyphPos.getY(), 2, 2);
164	+ " -> " + layout.getGlyphIndex(index) + " => " + ch);
165	if (CharUtilities.isAnySpace(ch) && ch != 32) {
166	System.out.println("Space found: " + Integer.toHexString(ch));
167	}
168	if (ch == CharUtilities.ZERO_WIDTH_JOINER) {
169	System.out.println("ZWJ found: " + Integer.toHexString(ch));
170	}
171	if (ch == CharUtilities.SOFT_HYPHEN) {
172	System.out.println("Soft hyphen found: " + Integer.toHexString(ch));
173	}
174	if (!visibleChar) {
175	System.out.println("Invisible glyph found: " + Integer.toHexString(ch));
176	}
177	}	149	}
178	if (!visibleChar) {	150	debugShapes.append(sh, false);
179	continue;	151	}
180	}
181	Point2D p = gv.getGlyphPosition(index);
182		152
183	AffineTransform glyphTransform = gv.getGlyphTransform(index);	153	//Exact position of the glyph
184	//TODO Glyph transforms could be refined so not every char has to be painted	154	localTransform.setToIdentity();
185	//with its own TJ command (stretch/squeeze case could be optimized)	155	localTransform.translate(glyphPos.getX(), glyphPos.getY());
186	if (DEBUG) {	156	if (glyphTransform != null) {
187	System.out.println("pos " + p + ", transform " + glyphTransform);	157	localTransform.concatenate(glyphTransform);
188	Shape sh;	158	}
189	sh = gv.getGlyphLogicalBounds(index);	159	localTransform.scale(1, -1);
190	if (sh == null) {
191	sh = new Ellipse2D.Double(p.getX(), p.getY(), 2, 2);
192	}
193	debugShapes.append(sh, false);
194	}
195		160
196	//Exact position of the glyph	161	boolean yPosChanged = (prevPos == null
197	localTransform.setToIdentity();	162	\|\| prevPos.getY() != glyphPos.getY()
198	localTransform.translate(p.getX(), p.getY());	163	\|\| glyphTransform != null);
199	if (glyphTransform != null) {	164	if (yPosChanged) {
200	localTransform.concatenate(glyphTransform);	165	if (index > 0) {
201	}
202	localTransform.scale(1, -1);
203
204	boolean yPosChanged = (prevPos == null
205	\|\| prevPos.getY() != p.getY()
206	\|\| glyphTransform != null);
207	if (yPosChanged) {
208	if (index > 0) {
209	textUtil.writeTJ();
210	textUtil.writeTextMatrix(localTransform);
211	}
212	} else {
213	double xdiff = p.getX() - prevPos.getX();
214	//Width of previous character
215	Font font = textUtil.getCurrentFont();
216	double cw = prevVisibleCharWidth;
217	double effxdiff = (1000 * xdiff) - cw;
218	if (effxdiff != 0) {
219	double adjust = (-effxdiff / font.getFontSize());
220	textUtil.adjustGlyphTJ(adjust * 1000);
221	}
222	if (DEBUG) {
223	System.out.println("==> x diff: " + xdiff + ", " + effxdiff
224	+ ", charWidth: " + cw);
225	}
226	}
227	Font f = textUtil.selectFontForChar(ch);
228	if (f != textUtil.getCurrentFont()) {
229	textUtil.writeTJ();	166	textUtil.writeTJ();
230	textUtil.setCurrentFont(f);
231	textUtil.writeTf(f);
232	textUtil.writeTextMatrix(localTransform);	167	textUtil.writeTextMatrix(localTransform);
233	}	168	}
234	char paintChar = (CharUtilities.isAnySpace(ch) ? ' ' : ch);	169	} else {
235	textUtil.writeTJChar(paintChar);	170	double xdiff = glyphPos.getX() - prevPos.getX();
236		171	//Width of previous character
237	//Update last position	172	Font font = textUtil.getCurrentFont();
238	prevPos = p;	173	double cw = prevVisibleCharWidth;
239	prevVisibleCharWidth = textUtil.getCurrentFont().getCharWidth(chars.charAt(index));	174	double effxdiff = (1000 * xdiff) - cw;
		175	if (effxdiff != 0) {
		176	double adjust = (-effxdiff / font.getFontSize());
		177	textUtil.adjustGlyphTJ(adjust * 1000);
		178	}
		179	if (log.isTraceEnabled()) {
		180	log.trace("==> x diff: " + xdiff + ", " + effxdiff
		181	+ ", charWidth: " + cw);
		182	}
240	}	183	}
241	textUtil.writeTJ();	184	Font f = textUtil.selectFontForChar(ch);
242	textUtil.endTextObject();	185	if (f != textUtil.getCurrentFont()) {
243	textUtil.restoreGraphicsState();	186	textUtil.writeTJ();
244	if (DEBUG) {	187	textUtil.setCurrentFont(f);
245	g2d.setStroke(new BasicStroke(0));	188	textUtil.writeTf(f);
246	g2d.setColor(Color.LIGHT_GRAY);	189	textUtil.writeTextMatrix(localTransform);
247	g2d.draw(debugShapes);
248	}	190	}
		191	char paintChar = (CharUtilities.isAnySpace(ch) ? ' ' : ch);
		192	textUtil.writeTJChar(paintChar);
		193
		194	//Update last position
		195	prevPos = glyphPos;
		196	prevVisibleCharWidth = textUtil.getCurrentFont().getCharWidth(chars.charAt(index));
249	}	197	}
		198	textUtil.writeTJ();
		199	textUtil.endTextObject();
		200	textUtil.restoreGraphicsState();
		201	if (DEBUG) {
		202	g2d.setStroke(new BasicStroke(0));
		203	g2d.setColor(Color.LIGHT_GRAY);
		204	g2d.draw(debugShapes);
		205	}
250	}	206	}
251		207
252	private void applyColorAndPaint(TextPaintInfo tpi, PDFGraphics2D pdf) {	208	private void applyColorAndPaint(TextPaintInfo tpi, PDFGraphics2D pdf) {
Lines 271-355 Link Here
271	pdf.applyAlpha(fillAlpha, PDFGraphics2D.OPAQUE);	227	pdf.applyAlpha(fillAlpha, PDFGraphics2D.OPAQUE);
272	}	228	}
273		229
274	private Font[] findFonts(AttributedCharacterIterator aci) {
275	List fonts = new java.util.ArrayList();
276	List gvtFonts = (List) aci.getAttribute(
277	GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
278	Float posture = (Float) aci.getAttribute(TextAttribute.POSTURE);
279	Float taWeight = (Float) aci.getAttribute(TextAttribute.WEIGHT);
280	Float fontSize = (Float) aci.getAttribute(TextAttribute.SIZE);
281
282	String style = ((posture != null) && (posture.floatValue() > 0.0))
283	? Font.STYLE_ITALIC : Font.STYLE_NORMAL;
284	int weight = ((taWeight != null)
285	&& (taWeight.floatValue() > 1.0)) ? Font.WEIGHT_BOLD
286	: Font.WEIGHT_NORMAL;
287
288	String firstFontFamily = null;
289
290	//GVT_FONT can sometimes be different from the fonts in GVT_FONT_FAMILIES
291	//or GVT_FONT_FAMILIES can even be empty and only GVT_FONT is set
292	/* The following code section is not available until Batik 1.7 is released. */
293	GVTFont gvtFont = (GVTFont)aci.getAttribute(
294	GVTAttributedCharacterIterator.TextAttribute.GVT_FONT);
295	if (gvtFont != null) {
296	try {
297	Method method = gvtFont.getClass().getMethod("getFamilyName", null);
298	String gvtFontFamily = (String)method.invoke(gvtFont, null);
299	//TODO Uncomment the following line when Batik 1.7 is shipped with FOP
300	//String gvtFontFamily = gvtFont.getFamilyName(); //Not available in Batik 1.6
301	if (DEBUG) {
302	System.out.print(gvtFontFamily + ", ");
303	}
304	if (fontInfo.hasFont(gvtFontFamily, style, weight)) {
305	FontTriplet triplet = fontInfo.fontLookup(gvtFontFamily, style,
306	weight);
307	int fsize = (int)(fontSize.floatValue() * 1000);
308	fonts.add(fontInfo.getFontInstance(triplet, fsize));
309	}
310	firstFontFamily = gvtFontFamily;
311	} catch (Exception e) {
312	//Most likely NoSuchMethodError here when using Batik 1.6
313	//Just skip this section in this case
314	}
315	}
316
317	if (gvtFonts != null) {
318	Iterator i = gvtFonts.iterator();
319	while (i.hasNext()) {
320	GVTFontFamily fam = (GVTFontFamily) i.next();
321	if (fam instanceof SVGFontFamily) {
322	return null; //Let Batik paint this text!
323	}
324	String fontFamily = fam.getFamilyName();
325	if (DEBUG) {
326	System.out.print(fontFamily + ", ");
327	}
328	if (fontInfo.hasFont(fontFamily, style, weight)) {
329	FontTriplet triplet = fontInfo.fontLookup(fontFamily, style,
330	weight);
331	int fsize = (int)(fontSize.floatValue() * 1000);
332	fonts.add(fontInfo.getFontInstance(triplet, fsize));
333	}
334	if (firstFontFamily == null) {
335	firstFontFamily = fontFamily;
336	}
337	}
338	}
339	if (fonts.size() == 0) {
340	if (firstFontFamily == null) {
341	//This will probably never happen. Just to be on the safe side.
342	firstFontFamily = "any";
343	}
344	//lookup with fallback possibility (incl. substitution notification)
345	FontTriplet triplet = fontInfo.fontLookup(firstFontFamily, style, weight);
346	int fsize = (int)(fontSize.floatValue() * 1000);
347	fonts.add(fontInfo.getFontInstance(triplet, fsize));
348	}
349	if (DEBUG) {
350	System.out.println();
351	}
352	return (Font[])fonts.toArray(new Font[fonts.size()]);
353	}
354
355	}	230	}

Lines 55-60 Link Here

(-)src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java (-4 / +19 lines)
55		55
56	//Fonts	56	//Fonts
57	try {	57	try {
		58	FontInfo fontInfo = createFontInfo(cfg);
		59	graphics.setFontInfo(fontInfo);
		60	} catch (FOPException e) {
		61	throw new ConfigurationException("Error while setting up fonts", e);
		62	}
		63	}
		64
		65	/**
		66	* Creates the {@link FontInfo} instance for the given configuration.
		67	* @param cfg the configuration
		68	* @return the font collection
		69	* @throws FOPException if an error occurs while setting up the fonts
		70	*/
		71	public static FontInfo createFontInfo(Configuration cfg) throws FOPException {
		72	FontInfo fontInfo = new FontInfo();
		73	if (cfg != null) {
58	FontResolver fontResolver = FontManager.createMinimalFontResolver();	74	FontResolver fontResolver = FontManager.createMinimalFontResolver();
59	//TODO The following could be optimized by retaining the FontManager somewhere	75	//TODO The following could be optimized by retaining the FontManager somewhere
60	FontManager fontManager = new FontManager();	76	FontManager fontManager = new FontManager();
Lines 73-84 Link Here
73	if (fontManager.useCache()) {	89	if (fontManager.useCache()) {
74	fontManager.getFontCache().save();	90	fontManager.getFontCache().save();
75	}	91	}
76	FontInfo fontInfo = new FontInfo();
77	FontSetup.setup(fontInfo, fontInfoList, fontResolver);	92	FontSetup.setup(fontInfo, fontInfoList, fontResolver);
78	graphics.setFontInfo(fontInfo);	93	} else {
79	} catch (FOPException e) {	94	FontSetup.setup(fontInfo);
80	throw new ConfigurationException("Error while setting up fonts", e);
81	}	95	}
		96	return fontInfo;
82	}	97	}
83		98
84	}	99	}

Lines 26-35 Link Here

(-)src/java/org/apache/fop/svg/PDFBridgeContext.java (-5 / +6 lines)
26	import org.apache.batik.bridge.SVGTextElementBridge;	26	import org.apache.batik.bridge.SVGTextElementBridge;
27	import org.apache.batik.bridge.UserAgent;	27	import org.apache.batik.bridge.UserAgent;
28	import org.apache.batik.gvt.TextPainter;	28	import org.apache.batik.gvt.TextPainter;
29	import org.apache.fop.fonts.FontInfo;	29
30	import org.apache.xmlgraphics.image.loader.ImageManager;	30	import org.apache.xmlgraphics.image.loader.ImageManager;
31	import org.apache.xmlgraphics.image.loader.ImageSessionContext;	31	import org.apache.xmlgraphics.image.loader.ImageSessionContext;
32		32
		33	import org.apache.fop.fonts.FontInfo;
		34
33	/**	35	/**
34	* BridgeContext which registers the custom bridges for PDF output.	36	* BridgeContext which registers the custom bridges for PDF output.
35	*/	37	*/
Lines 38-48 Link Here
38	/**	40	/**
39	* Constructs a new bridge context.	41	* Constructs a new bridge context.
40	* @param userAgent the user agent	42	* @param userAgent the user agent
41	* @param loader the Document Loader to use for referenced documents.	43	* @param documentLoader the Document Loader to use for referenced documents.
42	* @param fontInfo the font list for the text painter, may be null	44	* @param fontInfo the font list for the text painter, may be null
43	* in which case text is painted as shapes	45	* in which case text is painted as shapes
44	* @param linkTransform AffineTransform to properly place links,
45	* may be null
46	* @param imageManager an image manager	46	* @param imageManager an image manager
47	* @param imageSessionContext an image session context	47	* @param imageSessionContext an image session context
48	* @param linkTransform AffineTransform to properly place links,	48	* @param linkTransform AffineTransform to properly place links,
Lines 52-58 Link Here
52	FontInfo fontInfo, ImageManager imageManager,	52	FontInfo fontInfo, ImageManager imageManager,
53	ImageSessionContext imageSessionContext,	53	ImageSessionContext imageSessionContext,
54	AffineTransform linkTransform) {	54	AffineTransform linkTransform) {
55	super(userAgent, documentLoader, fontInfo, imageManager, imageSessionContext, linkTransform);	55	super(userAgent, documentLoader, fontInfo,
		56	imageManager, imageSessionContext, linkTransform);
56	}	57	}
57		58
58	/**	59	/**

Line 0 Link Here

(-)src/java/org/apache/fop/svg/NativeTextPainter.java (+224 lines)
		1	/*
		2	* Licensed to the Apache Software Foundation (ASF) under one or more
		3	* contributor license agreements. See the NOTICE file distributed with
		4	* this work for additional information regarding copyright ownership.
		5	* The ASF licenses this file to You under the Apache License, Version 2.0
		6	* (the "License"); you may not use this file except in compliance with
		7	* the License. You may obtain a copy of the License at
		8	*
		9	* http://www.apache.org/licenses/LICENSE-2.0
		10	*
		11	* Unless required by applicable law or agreed to in writing, software
		12	* distributed under the License is distributed on an "AS IS" BASIS,
		13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		14	* See the License for the specific language governing permissions and
		15	* limitations under the License.
		16	*/
		17
		18	/* $Id$ */
		19
		20	package org.apache.fop.svg;
		21
		22	import java.awt.Graphics2D;
		23	import java.awt.font.TextAttribute;
		24	import java.io.IOException;
		25	import java.text.AttributedCharacterIterator;
		26	import java.util.Iterator;
		27	import java.util.List;
		28
		29	import org.apache.batik.bridge.SVGFontFamily;
		30	import org.apache.batik.gvt.font.GVTFont;
		31	import org.apache.batik.gvt.font.GVTFontFamily;
		32	import org.apache.batik.gvt.renderer.StrokingTextPainter;
		33	import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
		34	import org.apache.batik.gvt.text.TextSpanLayout;
		35	import org.apache.commons.logging.Log;
		36	import org.apache.commons.logging.LogFactory;
		37
		38	import org.apache.fop.fonts.Font;
		39	import org.apache.fop.fonts.FontInfo;
		40	import org.apache.fop.fonts.FontTriplet;
		41	import org.apache.fop.util.CharUtilities;
		42
		43	/**
		44	* Abstract base class for text painters that use specialized text commands native to an output
		45	* format to render text.
		46	*/
		47	public abstract class NativeTextPainter extends StrokingTextPainter {
		48
		49	/** the logger for this class */
		50	protected Log log = LogFactory.getLog(NativeTextPainter.class);
		51
		52	/** the font collection */
		53	protected final FontInfo fontInfo;
		54
		55	/**
		56	* Creates a new instance.
		57	* @param fontInfo the font collection
		58	*/
		59	public NativeTextPainter(FontInfo fontInfo) {
		60	this.fontInfo = fontInfo;
		61	}
		62
		63	/**
		64	* Indicates whether the given {@link Graphics2D} instance if compatible with this text painter
65	* implementation.
66	* @param g2d the instance to check
67	* @return true if the instance is compatible.
68	*/
69	protected abstract boolean isSupported(Graphics2D g2d);
70
71	/**
72	* Paints a single text run.
73	* @param textRun the text run
74	* @param g2d the target Graphics2D instance
75	* @throws IOException if an I/O error occurs while rendering the text
76	*/
77	protected abstract void paintTextRun(TextRun textRun, Graphics2D g2d) throws IOException;
78
79	/** {@inheritDoc} */
80	protected void paintTextRuns(List textRuns, Graphics2D g2d) {
81	if (log.isTraceEnabled()) {
82	log.trace("paintTextRuns: count = " + textRuns.size());
83	}
84	if (!isSupported(g2d)) {
85	super.paintTextRuns(textRuns, g2d);
86	return;
87	}
88	for (int i = 0; i < textRuns.size(); i++) {
89	TextRun textRun = (TextRun)textRuns.get(i);
90	try {
91	paintTextRun(textRun, g2d);
92	} catch (IOException ioe) {
93	//No other possibility than to use a RuntimeException
94	throw new RuntimeException(ioe);
95	}
96	}
97	}
98
99	/**
100	* Finds an array of suitable fonts for a given AttributedCharacterIterator.
101	* @param aci the character iterator
102	* @return the array of fonts
103	*/
104	protected Font[] findFonts(AttributedCharacterIterator aci) {
105	List fonts = new java.util.ArrayList();
106	List gvtFonts = (List) aci.getAttribute(
107	GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
108	Float posture = (Float) aci.getAttribute(TextAttribute.POSTURE);
109	Float taWeight = (Float) aci.getAttribute(TextAttribute.WEIGHT);
110	Float fontSize = (Float) aci.getAttribute(TextAttribute.SIZE);
111
112	String style = ((posture != null) && (posture.floatValue() > 0.0))
113	? Font.STYLE_ITALIC : Font.STYLE_NORMAL;
114	int weight = ((taWeight != null)
115	&& (taWeight.floatValue() > 1.0)) ? Font.WEIGHT_BOLD
116	: Font.WEIGHT_NORMAL;
117
118	String firstFontFamily = null;
119
120	//GVT_FONT can sometimes be different from the fonts in GVT_FONT_FAMILIES
121	//or GVT_FONT_FAMILIES can even be empty and only GVT_FONT is set
122	/* The following code section is not available until Batik 1.7 is released. */
123	GVTFont gvtFont = (GVTFont)aci.getAttribute(
124	GVTAttributedCharacterIterator.TextAttribute.GVT_FONT);
125	if (gvtFont != null) {
126	try {
127	String gvtFontFamily = gvtFont.getFamilyName(); //Not available in Batik 1.6!
128	if (log.isDebugEnabled()) {
129	log.debug("Matching font family: " + gvtFontFamily);
130	}
131	if (fontInfo.hasFont(gvtFontFamily, style, weight)) {
132	FontTriplet triplet = fontInfo.fontLookup(gvtFontFamily, style,
133	weight);
134	int fsize = (int)(fontSize.floatValue() * 1000);
135	fonts.add(fontInfo.getFontInstance(triplet, fsize));
136	}
137	firstFontFamily = gvtFontFamily;
138	} catch (Exception e) {
139	//Most likely NoSuchMethodError here when using Batik 1.6
140	//Just skip this section in this case
141	}
142	}
143
144	if (gvtFonts != null) {
145	Iterator i = gvtFonts.iterator();
146	while (i.hasNext()) {
147	GVTFontFamily fam = (GVTFontFamily) i.next();
148	if (fam instanceof SVGFontFamily) {
149	return null; //Let Batik paint this text!
150	}
151	String fontFamily = fam.getFamilyName();
152	if (log.isDebugEnabled()) {
153	log.debug("Matching font family: " + fontFamily);
154	}
155	if (fontInfo.hasFont(fontFamily, style, weight)) {
156	FontTriplet triplet = fontInfo.fontLookup(fontFamily, style,
157	weight);
158	int fsize = (int)(fontSize.floatValue() * 1000);
159	fonts.add(fontInfo.getFontInstance(triplet, fsize));
160	}
161	if (firstFontFamily == null) {
162	firstFontFamily = fontFamily;
163	}
164	}
165	}
166	if (fonts.size() == 0) {
167	if (firstFontFamily == null) {
168	//This will probably never happen. Just to be on the safe side.
169	firstFontFamily = "any";
170	}
171	//lookup with fallback possibility (incl. substitution notification)
172	FontTriplet triplet = fontInfo.fontLookup(firstFontFamily, style, weight);
173	int fsize = (int)(fontSize.floatValue() * 1000);
174	fonts.add(fontInfo.getFontInstance(triplet, fsize));
175	}
176	return (Font[])fonts.toArray(new Font[fonts.size()]);
177	}
178
179	/**
180	* Collects all characters from an {@link AttributedCharacterIterator}.
181	* @param runaci the character iterator
182	* @return the characters
183	*/
184	protected CharSequence collectCharacters(AttributedCharacterIterator runaci) {
185	StringBuffer chars = new StringBuffer();
186	for (runaci.first(); runaci.getIndex() < runaci.getEndIndex();) {
187	chars.append(runaci.current());
188	runaci.next();
189	}
190	return chars;
191	}
192
193	protected final void logTextRun(AttributedCharacterIterator runaci, TextSpanLayout layout) {
194	if (log.isTraceEnabled()) {
195	int charCount = runaci.getEndIndex() - runaci.getBeginIndex();
196	log.trace("================================================");
197	log.trace("New text run:");
198	log.trace("char count: " + charCount);
199	log.trace("range: "
200	+ runaci.getBeginIndex() + " - " + runaci.getEndIndex());
201	log.trace("glyph count: " + layout.getGlyphCount()); //=getNumGlyphs()
202	}
203	}
204
205	protected final void logCharacter(char ch, TextSpanLayout layout, int index,
206	boolean visibleChar) {
207	if (log.isTraceEnabled()) {
208	log.trace("glyph " + index
209	+ " -> " + layout.getGlyphIndex(index) + " => " + ch);
210	if (CharUtilities.isAnySpace(ch) && ch != 32) {
211	log.trace("Space found: " + Integer.toHexString(ch));
212	} else if (ch == CharUtilities.ZERO_WIDTH_JOINER) {
213	log.trace("ZWJ found: " + Integer.toHexString(ch));
214	} else if (ch == CharUtilities.SOFT_HYPHEN) {
215	log.trace("Soft hyphen found: " + Integer.toHexString(ch));
216	}
217	if (!visibleChar) {
218	log.trace("Invisible glyph found: " + Integer.toHexString(ch));
219	}
220	}
221	}
222
223
224	}
0	+ Id	225	+ Id
1	+ native	226	+ native

Lines 19-32 Link Here

(-)src/java/org/apache/fop/render/ps/PSTextElementBridge.java (-55 / +8 lines)
19		19
20	package org.apache.fop.render.ps;	20	package org.apache.fop.render.ps;
21		21
22	import org.apache.batik.bridge.SVGTextElementBridge;	22	import org.w3c.dom.Element;
		23
23	import org.apache.batik.bridge.BridgeContext;	24	import org.apache.batik.bridge.BridgeContext;
		25	import org.apache.batik.bridge.SVGTextElementBridge;
24	import org.apache.batik.gvt.GraphicsNode;	26	import org.apache.batik.gvt.GraphicsNode;
25	import org.apache.batik.gvt.TextNode;	27	import org.apache.batik.gvt.TextNode;
		28	import org.apache.batik.gvt.TextPainter;
26		29
27	import org.w3c.dom.Element;
28	import org.w3c.dom.Node;
29
30	/**	30	/**
31	* Bridge class for the <text> element.	31	* Bridge class for the <text> element.
32	* This bridge will use the direct text painter if the text	32	* This bridge will use the direct text painter if the text
Lines 37-49 Link Here
37	*/	37	*/
38	public class PSTextElementBridge extends SVGTextElementBridge {	38	public class PSTextElementBridge extends SVGTextElementBridge {
39		39
40	private PSTextPainter textPainter;	40	private TextPainter textPainter;
41		41
42	/**	42	/**
43	* Constructs a new bridge for the <text> element.	43	* Constructs a new bridge for the <text> element.
44	* @param textPainter the text painter to use	44	* @param textPainter the text painter to use
45	*/	45	*/
46	public PSTextElementBridge(PSTextPainter textPainter) {	46	public PSTextElementBridge(TextPainter textPainter) {
47	this.textPainter = textPainter;	47	this.textPainter = textPainter;
48	}	48	}
49		49
Lines 56-115 Link Here
56	*/	56	*/
57	public GraphicsNode createGraphicsNode(BridgeContext ctx, Element e) {	57	public GraphicsNode createGraphicsNode(BridgeContext ctx, Element e) {
58	GraphicsNode node = super.createGraphicsNode(ctx, e);	58	GraphicsNode node = super.createGraphicsNode(ctx, e);
59	/* this code is worthless I think. PSTextPainter does a much better job	59	((TextNode)node).setTextPainter(getTextPainter());
60	* at determining whether to stroke or not. */
61	if (true/node != null && isSimple(ctx, e, node)/) {
62	((TextNode)node).setTextPainter(getTextPainter());
63	}
64	return node;	60	return node;
65	}	61	}
66		62
67	private PSTextPainter getTextPainter() {	63	private TextPainter getTextPainter() {
68	return this.textPainter;	64	return this.textPainter;
69	}	65	}
70		66
71	/**
72	* Check if text element contains simple text.
73	* This checks the children of the text element to determine
74	* if the text is simple. The text is simple if it can be rendered
75	* with basic text drawing algorithms. This means there are no
76	* alternate characters, the font is known and there are no effects
77	* applied to the text.
78	*
79	* @param ctx the bridge context
80	* @param element the svg text element
81	* @param node the graphics node
82	* @return true if this text is simple of false if it cannot be
83	* easily rendered using normal drawString on the PDFGraphics2D
84	*/
85	private boolean isSimple(BridgeContext ctx, Element element, GraphicsNode node) {
86	for (Node n = element.getFirstChild();
87	n != null;
88	n = n.getNextSibling()) {
89
90	switch (n.getNodeType()) {
91	case Node.ELEMENT_NODE:
92
93	if (n.getLocalName().equals(SVG_TSPAN_TAG)
94	\|\| n.getLocalName().equals(SVG_ALT_GLYPH_TAG)) {
95	return false;
96	} else if (n.getLocalName().equals(SVG_TEXT_PATH_TAG)) {
97	return false;
98	} else if (n.getLocalName().equals(SVG_TREF_TAG)) {
99	return false;
100	}
101	break;
102	case Node.TEXT_NODE:
103	case Node.CDATA_SECTION_NODE:
104	default:
105	}
106	}
107
108	/*if (CSSUtilities.convertFilter(element, node, ctx) != null) {
109	return false;
110	}*/
111
112	return true;
113	}
114	}	67	}
115		68

Lines 259-275 Link Here

(-)src/java/org/apache/fop/render/ps/PSSVGHandler.java (-11 / +4 lines)
259	PSGraphics2D graphics = new PSGraphics2D(strokeText, gen);	259	PSGraphics2D graphics = new PSGraphics2D(strokeText, gen);
260	graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());	260	graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
261		261
262	NativeTextHandler nativeTextHandler = null;	262	BridgeContext ctx = new PSBridgeContext(ua,
263	BridgeContext ctx = new BridgeContext(ua);	263	(strokeText ? null : psInfo.fontInfo),
264	if (!strokeText) {	264	context.getUserAgent().getFactory().getImageManager(),
265	FontInfo fontInfo = psInfo.getFontInfo();	265	context.getUserAgent().getImageSessionContext());
266	nativeTextHandler = new NativeTextHandler(graphics, fontInfo);
267	graphics.setCustomTextHandler(nativeTextHandler);
268	PSTextPainter textPainter = new PSTextPainter(nativeTextHandler);
269	ctx.setTextPainter(textPainter);
270	PSTextElementBridge tBridge = new PSTextElementBridge(textPainter);
271	ctx.putBridge(tBridge);
272	}
273		266
274	//Cloning SVG DOM as Batik attaches non-thread-safe facilities (like the CSS engine)	267	//Cloning SVG DOM as Batik attaches non-thread-safe facilities (like the CSS engine)
275	//to it.	268	//to it.

Lines 65-80 Link Here

(-)src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java (-10 / +4 lines)
65	PSGraphics2D graphics = new PSGraphics2D(strokeText, gen);	65	PSGraphics2D graphics = new PSGraphics2D(strokeText, gen);
66	graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());	66	graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
67		67
68	NativeTextHandler nativeTextHandler = null;	68	BridgeContext ctx = new PSBridgeContext(ua,
69	BridgeContext ctx = new BridgeContext(ua);	69	(strokeText ? null : psContext.getFontInfo()),
70	if (!strokeText) {	70	context.getUserAgent().getFactory().getImageManager(),
71	nativeTextHandler = new NativeTextHandler(graphics, psContext.getFontInfo());	71	context.getUserAgent().getImageSessionContext());
72	graphics.setCustomTextHandler(nativeTextHandler);
73	PSTextPainter textPainter = new PSTextPainter(nativeTextHandler);
74	ctx.setTextPainter(textPainter);
75	PSTextElementBridge tBridge = new PSTextElementBridge(textPainter);
76	ctx.putBridge(tBridge);
77	}
78		72
79	GraphicsNode root;	73	GraphicsNode root;
80	try {	74	try {

Lines 50-57 Link Here

(-)src/java/org/apache/fop/render/ps/PSDocumentHandler.java (-38 / +5 lines)
50	import org.apache.xmlgraphics.ps.dsc.events.DSCCommentHiResBoundingBox;	50	import org.apache.xmlgraphics.ps.dsc.events.DSCCommentHiResBoundingBox;
51		51
52	import org.apache.fop.apps.MimeConstants;	52	import org.apache.fop.apps.MimeConstants;
53	import org.apache.fop.fonts.LazyFont;
54	import org.apache.fop.fonts.Typeface;
55	import org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;	53	import org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;
56	import org.apache.fop.render.intermediate.IFContext;	54	import org.apache.fop.render.intermediate.IFContext;
57	import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;	55	import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
Lines 91-98 Link Here
91	/** Used to temporarily store PSSetupCode instance until they can be written. */	89	/** Used to temporarily store PSSetupCode instance until they can be written. */
92	private List setupCodeList;	90	private List setupCodeList;
93		91
94	/** This is a map of PSResource instances of all fonts defined (key: font key) */	92	/** This is a cache of PSResource instances of all fonts defined */
95	private Map fontResources;	93	private FontResourceCache fontResources;
96	/** This is a map of PSResource instances of all forms (key: uri) */	94	/** This is a map of PSResource instances of all forms (key: uri) */
97	private Map formResources;	95	private Map formResources;
98		96
Lines 139-144 Link Here
139	/** {@inheritDoc} */	137	/** {@inheritDoc} */
140	public void startDocument() throws IFException {	138	public void startDocument() throws IFException {
141	super.startDocument();	139	super.startDocument();
		140	this.fontResources = new FontResourceCache(getFontInfo());
142	try {	141	try {
143	OutputStream out;	142	OutputStream out;
144	if (psUtil.isOptimizeResources()) {	143	if (psUtil.isOptimizeResources()) {
Lines 200-206 Link Here
200	gen.writeDSCComment(DSCConstants.BEGIN_SETUP);	199	gen.writeDSCComment(DSCConstants.BEGIN_SETUP);
201	PSRenderingUtil.writeSetupCodeList(gen, setupCodeList, "SetupCode");	200	PSRenderingUtil.writeSetupCodeList(gen, setupCodeList, "SetupCode");
202	if (!psUtil.isOptimizeResources()) {	201	if (!psUtil.isOptimizeResources()) {
203	this.fontResources = PSFontUtils.writeFontDict(gen, fontInfo);	202	this.fontResources.addAll(PSFontUtils.writeFontDict(gen, fontInfo));
204	} else {	203	} else {
205	gen.commentln("%FOPFontSetup"); //Place-holder, will be replaced in the second pass	204	gen.commentln("%FOPFontSetup"); //Place-holder, will be replaced in the second pass
206	}	205	}
Lines 534-578 Link Here
534	}	533	}
535	}	534	}
536		535
537	private String getPostScriptNameForFontKey(String key) {
538	int pos = key.indexOf('_');
539	String postFix = null;
540	if (pos > 0) {
541	postFix = key.substring(pos);
542	key = key.substring(0, pos);
543	}
544	Map fonts = fontInfo.getFonts();
545	Typeface tf = (Typeface)fonts.get(key);
546	if (tf instanceof LazyFont) {
547	tf = ((LazyFont)tf).getRealFont();
548	}
549	if (tf == null) {
550	throw new IllegalStateException("Font not available: " + key);
551	}
552	if (postFix == null) {
553	return tf.getFontName();
554	} else {
555	return tf.getFontName() + postFix;
556	}
557	}
558
559	/**	536	/**
560	* Returns the PSResource for the given font key.	537	* Returns the PSResource for the given font key.
561	* @param key the font key ("F*")	538	* @param key the font key ("F*")
562	* @return the matching PSResource	539	* @return the matching PSResource
563	*/	540	*/
564	protected PSResource getPSResourceForFontKey(String key) {	541	protected PSResource getPSResourceForFontKey(String key) {
565	PSResource res = null;	542	return this.fontResources.getPSResourceForFontKey(key);
566	if (this.fontResources != null) {
567	res = (PSResource)this.fontResources.get(key);
568	} else {
569	this.fontResources = new java.util.HashMap();
570	}
571	if (res == null) {
572	res = new PSResource(PSResource.TYPE_FONT, getPostScriptNameForFontKey(key));
573	this.fontResources.put(key, res);
574	}
575	return res;
576	}	543	}
577		544
578	/**	545	/**

Line 0 Link Here

(-)src/java/org/apache/fop/render/ps/PSBridgeContext.java (+113 lines)
		1	/*
		2	* Licensed to the Apache Software Foundation (ASF) under one or more
		3	* contributor license agreements. See the NOTICE file distributed with
		4	* this work for additional information regarding copyright ownership.
		5	* The ASF licenses this file to You under the Apache License, Version 2.0
		6	* (the "License"); you may not use this file except in compliance with
		7	* the License. You may obtain a copy of the License at
		8	*
		9	* http://www.apache.org/licenses/LICENSE-2.0
		10	*
		11	* Unless required by applicable law or agreed to in writing, software
		12	* distributed under the License is distributed on an "AS IS" BASIS,
		13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		14	* See the License for the specific language governing permissions and
		15	* limitations under the License.
		16	*/
		17
		18	/* $Id$ */
		19
		20	package org.apache.fop.render.ps;
		21
		22	import java.awt.geom.AffineTransform;
		23
		24	import org.apache.batik.bridge.BridgeContext;
		25	import org.apache.batik.bridge.DocumentLoader;
		26	import org.apache.batik.bridge.SVGTextElementBridge;
		27	import org.apache.batik.bridge.UserAgent;
		28	import org.apache.batik.gvt.TextPainter;
		29
		30	import org.apache.xmlgraphics.image.loader.ImageManager;
		31	import org.apache.xmlgraphics.image.loader.ImageSessionContext;
		32
		33	import org.apache.fop.fonts.FontInfo;
		34	import org.apache.fop.svg.AbstractFOPBridgeContext;
		35
		36	/**
		37	* BridgeContext which registers the custom bridges for PostScript output.
		38	*/
		39	public class PSBridgeContext extends AbstractFOPBridgeContext {
		40
		41	/**
		42	* Constructs a new bridge context.
		43	* @param userAgent the user agent
		44	* @param documentLoader the Document Loader to use for referenced documents.
		45	* @param fontInfo the font list for the text painter, may be null
		46	* in which case text is painted as shapes
		47	* @param imageManager an image manager
		48	* @param imageSessionContext an image session context
		49	* @param linkTransform AffineTransform to properly place links,
		50	* may be null
		51	*/
		52	public PSBridgeContext(UserAgent userAgent, DocumentLoader documentLoader,
		53	FontInfo fontInfo, ImageManager imageManager,
		54	ImageSessionContext imageSessionContext,
		55	AffineTransform linkTransform) {
		56	super(userAgent, documentLoader, fontInfo,
		57	imageManager, imageSessionContext, linkTransform);
		58	}
		59
		60	/**
		61	* Constructs a new bridge context.
		62	* @param userAgent the user agent
		63	* @param fontInfo the font list for the text painter, may be null
		64	* in which case text is painted as shapes
65	* @param imageManager an image manager
66	* @param imageSessionContext an image session context
67	*/
68	public PSBridgeContext(UserAgent userAgent, FontInfo fontInfo,
69	ImageManager imageManager, ImageSessionContext imageSessionContext) {
70	super(userAgent, fontInfo, imageManager, imageSessionContext);
71	}
72
73	/** {@inheritDoc} */
74	public void registerSVGBridges() {
75	super.registerSVGBridges();
76
77	if (fontInfo != null) {
78	TextPainter textPainter = new PSTextPainter(fontInfo);
79	SVGTextElementBridge textElementBridge = new PSTextElementBridge(textPainter);
80	putBridge(textElementBridge);
81
82	//Batik flow text extension (may not always be available)
83	//putBridge(new PDFBatikFlowTextElementBridge(fontInfo);
84	putElementBridgeConditional(
85	"org.apache.fop.render.ps.PSBatikFlowTextElementBridge",
86	"org.apache.batik.extension.svg.BatikFlowTextElementBridge");
87
88	//SVG 1.2 flow text support
89	//putBridge(new PDFSVG12TextElementBridge(fontInfo)); //-->Batik 1.7
90	putElementBridgeConditional(
91	"org.apache.fop.render.ps.PSSVG12TextElementBridge",
92	"org.apache.batik.bridge.svg12.SVG12TextElementBridge");
93
94	//putBridge(new PDFSVGFlowRootElementBridge(fontInfo));
95	putElementBridgeConditional(
96	"org.apache.fop.render.ps.PSSVGFlowRootElementBridge",
97	"org.apache.batik.bridge.svg12.SVGFlowRootElementBridge");
98	}
99
100	//putBridge(new PSImageElementBridge()); //TODO uncomment when implemented
101	}
102
103	// Make sure any 'sub bridge contexts' also have our bridges.
104	//TODO There's no matching method in the super-class here
105	public BridgeContext createBridgeContext() {
106	return new PSBridgeContext(getUserAgent(), getDocumentLoader(),
107	fontInfo,
108	getImageManager(),
109	getImageSessionContext(),
110	linkTransform);
111	}
112
113	}
0	+ Id	114	+ Id
1	+ native	115	+ native

Line 0 Link Here

(-)src/java/org/apache/fop/render/ps/FontResourceCache.java (+93 lines)
		1	/*
		2	* Licensed to the Apache Software Foundation (ASF) under one or more
		3	* contributor license agreements. See the NOTICE file distributed with
		4	* this work for additional information regarding copyright ownership.
		5	* The ASF licenses this file to You under the Apache License, Version 2.0
		6	* (the "License"); you may not use this file except in compliance with
		7	* the License. You may obtain a copy of the License at
		8	*
		9	* http://www.apache.org/licenses/LICENSE-2.0
		10	*
		11	* Unless required by applicable law or agreed to in writing, software
		12	* distributed under the License is distributed on an "AS IS" BASIS,
		13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		14	* See the License for the specific language governing permissions and
		15	* limitations under the License.
		16	*/
		17
		18	/* $Id$ */
		19
		20	package org.apache.fop.render.ps;
		21
		22	import java.util.Map;
		23
		24	import org.apache.xmlgraphics.ps.PSResource;
		25
		26	import org.apache.fop.fonts.FontInfo;
		27	import org.apache.fop.fonts.LazyFont;
		28	import org.apache.fop.fonts.Typeface;
		29
		30	/**
		31	* A cache for font resource objects.
		32	*/
		33	class FontResourceCache {
		34
		35	private FontInfo fontInfo;
		36
		37	/** This is a map of PSResource instances of all fonts defined (key: font key) */
		38	private Map fontResources = new java.util.HashMap();
		39
		40	public FontResourceCache(FontInfo fontInfo) {
		41	this.fontInfo = fontInfo;
		42	}
		43
		44	/**
		45	* Returns the PSResource for the given font key.
		46	* @param key the font key ("F*")
		47	* @return the matching PSResource
		48	*/
		49	public PSResource getPSResourceForFontKey(String key) {
		50	PSResource res = null;
		51	if (this.fontResources != null) {
		52	res = (PSResource)this.fontResources.get(key);
		53	} else {
		54	this.fontResources = new java.util.HashMap();
		55	}
		56	if (res == null) {
		57	res = new PSResource(PSResource.TYPE_FONT, getPostScriptNameForFontKey(key));
		58	this.fontResources.put(key, res);
		59	}
		60	return res;
		61	}
		62
		63	private String getPostScriptNameForFontKey(String key) {
		64	int pos = key.indexOf('_');
65	String postFix = null;
66	if (pos > 0) {
67	postFix = key.substring(pos);
68	key = key.substring(0, pos);
69	}
70	Map fonts = fontInfo.getFonts();
71	Typeface tf = (Typeface)fonts.get(key);
72	if (tf instanceof LazyFont) {
73	tf = ((LazyFont)tf).getRealFont();
74	}
75	if (tf == null) {
76	throw new IllegalStateException("Font not available: " + key);
77	}
78	if (postFix == null) {
79	return tf.getFontName();
80	} else {
81	return tf.getFontName() + postFix;
82	}
83	}
84
85	/**
86	* Adds a number of fonts to the cache.
87	* @param fontMap the font map
88	*/
89	public void addAll(Map fontMap) {
90	this.fontResources.putAll(fontMap);
91	}
92
93	}
0	+ Id	94	+ Id
1	+ native	95	+ native

Lines 28-47 Link Here

(-)src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java (-23 / +23 lines)
28	import org.w3c.dom.Document;	28	import org.w3c.dom.Document;
29	import org.w3c.dom.svg.SVGLength;	29	import org.w3c.dom.svg.SVGLength;
30		30
31	import org.apache.avalon.framework.configuration.Configuration;
32	import org.apache.batik.bridge.BridgeContext;	31	import org.apache.batik.bridge.BridgeContext;
33	import org.apache.batik.bridge.UnitProcessor;	32	import org.apache.batik.bridge.UnitProcessor;
34	import org.apache.batik.transcoder.TranscoderException;	33	import org.apache.batik.transcoder.TranscoderException;
35	import org.apache.batik.transcoder.TranscoderOutput;	34	import org.apache.batik.transcoder.TranscoderOutput;
36	import org.apache.batik.transcoder.image.ImageTranscoder;	35	import org.apache.batik.transcoder.image.ImageTranscoder;
37		36
38	import org.apache.xmlgraphics.java2d.TextHandler;
39	import org.apache.xmlgraphics.java2d.ps.AbstractPSDocumentGraphics2D;	37	import org.apache.xmlgraphics.java2d.ps.AbstractPSDocumentGraphics2D;
40	import org.apache.xmlgraphics.ps.PSGenerator;
41		38
		39	import org.apache.fop.apps.FOPException;
42	import org.apache.fop.fonts.FontInfo;	40	import org.apache.fop.fonts.FontInfo;
43	import org.apache.fop.fonts.FontSetup;
44	import org.apache.fop.svg.AbstractFOPTranscoder;	41	import org.apache.fop.svg.AbstractFOPTranscoder;
		42	import org.apache.fop.svg.PDFDocumentGraphics2DConfigurator;
45		43
46	/**	44	/**
47	* This class enables to transcode an input to a PostScript document.	45	* This class enables to transcode an input to a PostScript document.
Lines 72-80 Link Here
72	*/	70	*/
73	public abstract class AbstractPSTranscoder extends AbstractFOPTranscoder {	71	public abstract class AbstractPSTranscoder extends AbstractFOPTranscoder {
74		72
75	private final Configuration cfg = null;	73	/** the root Graphics2D instance for generating PostScript */
76	protected AbstractPSDocumentGraphics2D graphics = null;	74	protected AbstractPSDocumentGraphics2D graphics = null;
77		75
		76	private FontInfo fontInfo;
		77
78	/**	78	/**
79	* Constructs a new <tt>AbstractPSTranscoder</tt>.	79	* Constructs a new <tt>AbstractPSTranscoder</tt>.
80	*/	80	*/
Lines 82-87 Link Here
82	super();	82	super();
83	}	83	}
84		84
		85	/**
		86	* Creates the root Graphics2D instance for generating PostScript.
		87	* @return the root Graphics2D
		88	*/
85	protected abstract AbstractPSDocumentGraphics2D createDocumentGraphics2D();	89	protected abstract AbstractPSDocumentGraphics2D createDocumentGraphics2D();
86		90
87	/**	91	/**
Lines 98-108 Link Here
98		102
99	graphics = createDocumentGraphics2D();	103	graphics = createDocumentGraphics2D();
100	if (!isTextStroked()) {	104	if (!isTextStroked()) {
101	FontInfo fontInfo = new FontInfo();	105	try {
102	//TODO Do custom font configuration here somewhere/somehow	106	this.fontInfo = PDFDocumentGraphics2DConfigurator.createFontInfo(
103	FontSetup.setup(fontInfo);	107	getEffectiveConfiguration());
104	PSGenerator generator = graphics.getPSGenerator();	108	graphics.setCustomTextHandler(new NativeTextHandler(graphics, fontInfo));
105	graphics.setCustomTextHandler(new NativeTextHandler(graphics, fontInfo));	109	} catch (FOPException fe) {
		110	throw new TranscoderException(fe);
		111	}
106	}	112	}
107		113
108	super.transcode(document, uri, output);	114	super.transcode(document, uri, output);
Lines 146-166 Link Here
146		152
147	/** {@inheritDoc} */	153	/** {@inheritDoc} */
148	protected BridgeContext createBridgeContext() {	154	protected BridgeContext createBridgeContext() {
		155	//For compatibility with Batik 1.6
		156	return createBridgeContext("1.x");
		157	}
149		158
150	BridgeContext ctx = new BridgeContext(userAgent);	159	/** {@inheritDoc} */
151	if (!isTextStroked()) {	160	public BridgeContext createBridgeContext(String version) {
152	TextHandler handler = graphics.getCustomTextHandler();	161	BridgeContext ctx = new PSBridgeContext(userAgent, (isTextStroked() ? null : fontInfo),
153	if (handler instanceof NativeTextHandler) {	162	getImageManager(), getImageSessionContext());
154	NativeTextHandler nativeTextHandler = (NativeTextHandler)handler;
155	PSTextPainter textPainter = new PSTextPainter(nativeTextHandler);
156	ctx.setTextPainter(textPainter);
157	ctx.putBridge(new PSTextElementBridge(textPainter));
158	}
159	}
160
161	//ctx.putBridge(new PSImageElementBridge());
162	return ctx;	163	return ctx;
163	}	164	}
164		165
165
166	}	166	}