Merge from branch https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95:

Fixed text stroking in SVG when the stroke-width is zero.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@688087 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/svg/PDFTextPainter.java b/src/java/org/apache/fop/svg/PDFTextPainter.java
index d8123c4fb8b9c7e46c4f7e7b5d1801738f6131d5..06fea54cc0f80be96d5c9a6281ac4b4137f83702 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFTextPainter.java
+++ b/src/java/org/apache/fop/svg/PDFTextPainter.java
@@ -147,7 +147,9 @@ public class PDFTextPainter extends StrokingTextPainter {
 
             textUtil.beginTextObject();
             textUtil.setFonts(fonts);
-            textUtil.setTextRenderingMode(tpi.fillPaint != null, tpi.strokePaint != null, false);
+            boolean stroke = (tpi.strokePaint != null)
+                && (tpi.strokeStroke != null);
+            textUtil.setTextRenderingMode(tpi.fillPaint != null, stroke, false);
 
             AffineTransform localTransform = new AffineTransform();
             Point2D prevPos = null;

diff --git a/status.xml b/status.xml
index 3e17b56ac0ace091ba9fb95e2856b97deb6dda4d..deb5242a1866b190ec9fab335157678842e83984 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -53,6 +53,9 @@
 
   <changes>
     <release version="FOP Trunk" date="TBD">
+      <action context="Renderers" dev="JM" type="fix">
+        Fixed text stroking in SVG when the stroke-width is zero.
+      </action>
       <action context="Layout" dev="JM" type="fix">
         Fixed the source for a division by zero when the content of an fo:leader with
         leader-pattern="use-content" collapses to zero width during layout.