--- src/org/apache/fop/svg/PDFTextPainter.java.sav	2003-07-15 04:03:14.000000000 +0200
+++ src/org/apache/fop/svg/PDFTextPainter.java	2005-10-11 08:27:43.000000000 +0200
@@ -70,6 +70,7 @@
 import org.apache.batik.gvt.TextPainter;
 import org.apache.batik.gvt.TextNode;
 import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
+import org.apache.batik.gvt.text.TextPaintInfo;
 import org.apache.batik.gvt.text.Mark;
 import org.apache.batik.gvt.font.GVTFontFamily;
 import org.apache.batik.gvt.renderer.StrokingTextPainter;
@@ -186,13 +187,20 @@
         //Set up font
         List gvtFonts =
             (List)aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
-        Paint forg = (Paint)aci.getAttribute(TextAttribute.FOREGROUND);
+        TextPaintInfo tpi = (TextPaintInfo) aci.getAttribute(
+            GVTAttributedCharacterIterator.TextAttribute.PAINT_INFO);
+        
+        if (tpi == null) {
+            return loc;
+        }
+
+        Paint forg = tpi.fillPaint;
+        Paint strokePaint = tpi.strokePaint;
         Float size = (Float)aci.getAttribute(TextAttribute.SIZE);
         if (size == null) {
             return loc;
         }
-        Stroke stroke =
-            (Stroke)aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.STROKE);
+        Stroke stroke = tpi.strokeStroke;
 
         Float posture = (Float)aci.getAttribute(TextAttribute.POSTURE);
         Float taWeight = (Float)aci.getAttribute(TextAttribute.WEIGHT);