adds support for rule-style values dashed, dotted, groove, ridge, double

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

2 files changed, 649 insertions, 587 deletions

diff --git a/src/org/apache/fop/layout/LeaderArea.java b/src/org/apache/fop/layout/LeaderArea.java
index ff8b31520..3fbdd919b 100644
--- a/src/org/apache/fop/layout/LeaderArea.java
+++ b/src/org/apache/fop/layout/LeaderArea.java
@@ -68,10 +68,16 @@ public class LeaderArea extends InlineArea {
                       int leaderPattern, int ruleThickness, int ruleStyle) {
         super(fontState, red, green, blue, text, leaderLengthOptimum);
 
-        this.ruleThickness = ruleThickness;
         this.leaderPattern = leaderPattern;
         this.leaderLengthOptimum = leaderLengthOptimum;
         this.ruleStyle = ruleStyle;
+        //following the xsl spec rule: if rule-style="none" set thickness to 0;
+        //actually in pdf this doesn't work, because a very thin line is still shown
+        //this is handled in the pdf renderer
+        if (ruleStyle == org.apache.fop.fo.properties.RuleStyle.NONE) {
+            ruleThickness = 0;
+        }
+        this.ruleThickness = ruleThickness;
     }
 
     public void render(Renderer renderer) {
diff --git a/src/org/apache/fop/render/pdf/PDFRenderer.java b/src/org/apache/fop/render/pdf/PDFRenderer.java
index c83d5f147..59c585832 100644
--- a/src/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/org/apache/fop/render/pdf/PDFRenderer.java
@@ -1,36 +1,36 @@
-/*-- $Id$ -- 
+/*-- $Id$ --
 
  ============================================================================
 				   The Apache Software License, Version 1.1
  ============================================================================
- 
+
 	Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
- 
+
  Redistribution and use in source and binary forms, with or without modifica-
  tion, are permitted provided that the following conditions are met:
- 
+
  1. Redistributions of	source code must  retain the above copyright  notice,
 	this list of conditions and the following disclaimer.
- 
+
  2. Redistributions in binary form must reproduce the above copyright notice,
 	this list of conditions and the following disclaimer in the documentation
 	and/or other materials provided with the distribution.
- 
+
  3. The end-user documentation included with the redistribution, if any, must
 	include  the following	acknowledgment:  "This product includes  software
 	developed  by the  Apache Software Foundation  (http://www.apache.org/)."
 	Alternately, this  acknowledgment may  appear in the software itself,  if
 	and wherever such third-party acknowledgments normally appear.
- 
+
  4. The names "FOP" and  "Apache Software Foundation"  must not be used to
 	endorse  or promote  products derived  from this  software without	prior
 	written permission. For written permission, please contact
 	apache@apache.org.
- 
+
  5. Products  derived from this software may not  be called "Apache", nor may
 	"Apache" appear  in their name,  without prior written permission  of the
 	Apache Software Foundation.
- 
+
  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  FITNESS  FOR A PARTICULAR	PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
@@ -41,12 +41,12 @@
  ANY  THEORY OF LIABILITY,	WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  (INCLUDING  NEGLIGENCE OR	OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
+
  This software	consists of voluntary contributions made  by many individuals
  on  behalf of the Apache Software	Foundation and was	originally created by
- James Tauber <jtauber@jtauber.com>. For more  information on the Apache 
+ James Tauber <jtauber@jtauber.com>. For more  information on the Apache
  Software Foundation, please see <http://www.apache.org/>.
- 
+
  */
 
 package org.apache.fop.render.pdf;
@@ -88,606 +88,662 @@ import java.util.Hashtable;
  * Renderer that renders areas to PDF
  */
 public class PDFRenderer implements Renderer {
-			
-	/** the PDF Document being created */
-	protected PDFDocument pdfDoc;
-
-	/** the /Resources object of the PDF document being created */
-	protected PDFResources pdfResources;
-
-	/** the IDReferences for this document */
-	protected IDReferences idReferences;
-
-	/** the current stream to add PDF commands to */
-	PDFStream currentStream;
-
-	/** the current annotation list to add annotations to */
-	PDFAnnotList currentAnnotList;
-
-	/** the current page to add annotations to */
-	PDFPage currentPage;
-
-	/** the current (internal) font name */
-	protected String currentFontName;
-
-	/** the current font size in millipoints */
-	protected int currentFontSize;
-
-	/** the current color/gradient for borders, letters, etc. */
-	protected PDFPathPaint currentStroke = null;
-	
-	/** the current color/gradient to fill shapes with */
-	protected PDFPathPaint currentFill = null;
-	
-	/** the current colour's red component */
-	protected float currentRed = 0;
-
-	/** the current colour's green component */
-	protected float currentGreen = 0;
-
-	/** the current colour's blue component */
-	protected float currentBlue = 0;
-	
-	/** the current vertical position in millipoints from bottom */
-	protected int currentYPosition = 0;
-
-	/** the current horizontal position in millipoints from left */
-	protected int currentXPosition = 0;
-
-	/** the horizontal position of the current area container */
-	private int currentAreaContainerXPosition = 0;
-
-	/** the current colour for use in svg */
-	private PDFColor currentColour = new PDFColor(0, 0, 0);
-
-	/**
-	 * create the PDF renderer
-	 */
-	public PDFRenderer() {
-	this.pdfDoc = new PDFDocument();
-	}
-
-	/**
-	 * set the PDF document's producer
-	 *
-	 * @param producer string indicating application producing PDF
-	 */
-	public void setProducer(String producer) {
-	this.pdfDoc.setProducer(producer);
-	}
-
-	/**
-	 * render the areas into PDF
-	 *
-	 * @param areaTree the laid-out area tree
-	 * @param writer the PrintWriter to write the PDF with
-	 */
-	public void render(AreaTree areaTree, PrintWriter writer)
-        throws IOException, FOPException {      
-            MessageHandler.logln("rendering areas to PDF");
-            idReferences=areaTree.getIDReferences();           
-            this.pdfResources = this.pdfDoc.getResources();            
-            this.pdfDoc.setIDReferences(idReferences);
-	Enumeration e = areaTree.getPages().elements();
-            while ( e.hasMoreElements() ) {
-		this.renderPage((Page) e.nextElement());
-	}
-    
-            if ( !idReferences.isEveryIdValid() ) {                          
-		//          throw new FOPException("The following id's were referenced but not found: "+idReferences.getInvalidIds()+"\n");
-		MessageHandler.errorln("WARNING: The following id's were referenced but not found: "+idReferences.getInvalidIds()+"\n");
-		
-            }
-    
-            MessageHandler.logln("writing out PDF");
-	this.pdfDoc.output(writer);
-    }
+
+    /** the PDF Document being created */
+    protected PDFDocument pdfDoc;
+
+    /** the /Resources object of the PDF document being created */
+    protected PDFResources pdfResources;
+
+    /** the IDReferences for this document */
+    protected IDReferences idReferences;
+
+    /** the current stream to add PDF commands to */
+    PDFStream currentStream;
+
+    /** the current annotation list to add annotations to */
+    PDFAnnotList currentAnnotList;
+
+    /** the current page to add annotations to */
+    PDFPage currentPage;
+
+    /** the current (internal) font name */
+    protected String currentFontName;
+
+    /** the current font size in millipoints */
+    protected int currentFontSize;
+
+    /** the current color/gradient for borders, letters, etc. */
+    protected PDFPathPaint currentStroke = null;
+
+    /** the current color/gradient to fill shapes with */
+    protected PDFPathPaint currentFill = null;
+
+    /** the current colour's red component */
+    protected float currentRed = 0;
+
+    /** the current colour's green component */
+    protected float currentGreen = 0;
+
+    /** the current colour's blue component */
+    protected float currentBlue = 0;
+
+    /** the current vertical position in millipoints from bottom */
+    protected int currentYPosition = 0;
+
+    /** the current horizontal position in millipoints from left */
+    protected int currentXPosition = 0;
+
+    /** the horizontal position of the current area container */
+    private int currentAreaContainerXPosition = 0;
+
+    /** the current colour for use in svg */
+    private PDFColor currentColour = new PDFColor(0, 0, 0);
 
     /**
-     * add a line to the current stream
-     *
-     * @param x1 the start x location in millipoints
-     * @param y1 the start y location in millipoints
-     * @param x2 the end x location in millipoints
-     * @param y2 the end y location in millipoints
-     * @param th the thickness in millipoints
-     * @param r the red component
-     * @param g the green component
-     * @param b the blue component
+     * create the PDF renderer
      */
-    protected void addLine(int x1, int y1, int x2, int y2, int th, 
-		PDFPathPaint stroke)
-    {
-		currentStream.add("ET\nq\n"
-			+ stroke.getColorSpaceOut(false)
-			+ (x1/1000f) + " "+ (y1/1000f) + " m "
-			+ (x2/1000f) + " "+ (y2/1000f) + " l "
-			+ (th / 1000f) + " w S\n"
-			+ "Q\nBT\n");
+    public PDFRenderer() {
+        this.pdfDoc = new PDFDocument();
     }
 
-	/**
-	 * add a rectangle to the current stream
-	 *
-	 * @param x the x position of left edge in millipoints
-	 * @param y the y position of top edge in millipoints
-	 * @param w the width in millipoints
-	 * @param h the height in millipoints
-	 * @param stroke the stroke color/gradient
-	 */
-	protected void addRect(int x, int y, int w, int h,
-			   PDFPathPaint stroke) { 
-	currentStream.add("ET\nq\n"
-			+ stroke.getColorSpaceOut(false)
-			  + (x/1000f) + " " + (y/1000f) + " "
-			  + (w/1000f) + " " + (h/1000f) + " re s\n"
-			  + "Q\nBT\n");
-	}
-
-	/**
-	 * add a filled rectangle to the current stream
-	 *
-	 * @param x the x position of left edge in millipoints
-	 * @param y the y position of top edge in millipoints
-	 * @param w the width in millipoints
-	 * @param h the height in millipoints
-	 * @param fill the fill color/gradient
-	 * @param stroke the stroke color/gradient
-	 */
-	protected void addRect(int x, int y, int w, int h,
-			   PDFPathPaint stroke,
-			   PDFPathPaint fill) {
-	currentStream.add("ET\nq\n"
-			+ fill.getColorSpaceOut(true)
-			  + stroke.getColorSpaceOut(false)
-			  + (x/1000f) + " " + (y/1000f) + " "
-			  + (w/1000f) + " " + (h/1000f) + " re b\n"
-			  + "Q\nBT\n");
+    /**
+      * set the PDF document's producer
+      *
+      * @param producer string indicating application producing PDF
+      */
+    public void setProducer(String producer) {
+        this.pdfDoc.setProducer(producer);
     }
 
     /**
-     * render area container to PDF
-     *
-     * @param area the area container to render
-     */
+      * render the areas into PDF
+      *
+      * @param areaTree the laid-out area tree
+      * @param writer the PrintWriter to write the PDF with
+      */
+    public void render(AreaTree areaTree,
+                       PrintWriter writer) throws IOException, FOPException {
+        MessageHandler.logln("rendering areas to PDF");
+        idReferences = areaTree.getIDReferences();
+        this.pdfResources = this.pdfDoc.getResources();
+        this.pdfDoc.setIDReferences(idReferences);
+        Enumeration e = areaTree.getPages().elements();
+        while (e.hasMoreElements()) {
+            this.renderPage((Page) e.nextElement());
+        }
+
+        if (!idReferences.isEveryIdValid()) {
+            //          throw new FOPException("The following id's were referenced but not found: "+idReferences.getInvalidIds()+"\n");
+            MessageHandler.errorln("WARNING: The following id's were referenced but not found: "+
+                                   idReferences.getInvalidIds() + "\n");
+
+        }
+
+        MessageHandler.logln("writing out PDF");
+        this.pdfDoc.output(writer);
+    }
+
+    /**
+      * add a line to the current stream
+      *
+      * @param x1 the start x location in millipoints
+      * @param y1 the start y location in millipoints
+      * @param x2 the end x location in millipoints
+      * @param y2 the end y location in millipoints
+      * @param th the thickness in millipoints
+      * @param r the red component
+      * @param g the green component
+      * @param b the blue component
+      */
+    protected void addLine(int x1, int y1, int x2, int y2, int th,
+                           PDFPathPaint stroke) {
+        currentStream.add("ET\nq\n" + stroke.getColorSpaceOut(false) +
+                          (x1 / 1000f) + " "+ (y1 / 1000f) + " m " +
+                          (x2 / 1000f) + " "+ (y2 / 1000f) + " l " +
+                          (th / 1000f) + " w S\n" + "Q\nBT\n");
+    }
+
+    /**
+      * add a rectangle to the current stream
+      *
+      * @param x the x position of left edge in millipoints
+      * @param y the y position of top edge in millipoints
+      * @param w the width in millipoints
+      * @param h the height in millipoints
+      * @param stroke the stroke color/gradient
+      */
+    protected void addRect(int x, int y, int w, int h,
+                           PDFPathPaint stroke) {
+        currentStream.add("ET\nq\n" + stroke.getColorSpaceOut(false) +
+                          (x / 1000f) + " " + (y / 1000f) + " " + (w / 1000f) +
+                          " " + (h / 1000f) + " re s\n" + "Q\nBT\n");
+    }
+
+    /**
+      * add a filled rectangle to the current stream
+      *
+      * @param x the x position of left edge in millipoints
+      * @param y the y position of top edge in millipoints
+      * @param w the width in millipoints
+      * @param h the height in millipoints
+      * @param fill the fill color/gradient
+      * @param stroke the stroke color/gradient
+      */
+    protected void addRect(int x, int y, int w, int h,
+                           PDFPathPaint stroke, PDFPathPaint fill) {
+        currentStream.add("ET\nq\n" + fill.getColorSpaceOut(true) +
+                          stroke.getColorSpaceOut(false) + (x / 1000f) + " " +
+                          (y / 1000f) + " " + (w / 1000f) + " " + (h / 1000f) +
+                          " re b\n" + "Q\nBT\n");
+    }
+
+    /**
+      * render area container to PDF
+      *
+      * @param area the area container to render
+      */
     public void renderAreaContainer(AreaContainer area) {
-        
+
         int saveY = this.currentYPosition;
         int saveX = this.currentAreaContainerXPosition;
-        
+
         if (area.getPosition() == Position.ABSOLUTE) {
             // Y position is computed assuming positive Y axis, adjust for negative postscript one
- 	  this.currentYPosition = area.getYPosition() - 2 * area.getPaddingTop() - 2 * area.borderWidthTop;
-	  this.currentAreaContainerXPosition = area.getXPosition();
-		} else if (area.getPosition() == Position.RELATIVE) {
-	  this.currentYPosition -= area.getYPosition();
-		  this.currentAreaContainerXPosition += area.getXPosition();
-		} else if (area.getPosition() == Position.STATIC) {
-	  this.currentYPosition -= area.getPaddingTop() + area.borderWidthTop;
-		  this.currentAreaContainerXPosition += area.getPaddingLeft() + area.borderWidthLeft;
-		}
-
-		this.currentXPosition = this.currentAreaContainerXPosition;
-		doFrame(area);
-		
-	Enumeration e = area.getChildren().elements();
-	while (e.hasMoreElements()) {
-		Box b = (Box) e.nextElement();
-		b.render(this);
-	}
-		if (area.getPosition() != Position.STATIC) {
-		  this.currentYPosition = saveY;
-		  this.currentAreaContainerXPosition = saveX;
-		} else 
-		  this.currentYPosition -= area.getHeight();
-	}
-	
-	private void doFrame(Area area) {
-		int w, h;
-	int rx = this.currentAreaContainerXPosition;
-	w = area.getContentWidth();
-		if (area instanceof BlockArea)
-	  rx += ((BlockArea)area).getStartIndent();
-		h = area.getContentHeight();
-	int ry = this.currentYPosition;
-	ColorType bg = area.getBackgroundColor();
-		
-		rx = rx - area.getPaddingLeft();
-		ry = ry + area.getPaddingTop();
-		w = w + area.getPaddingLeft() + area.getPaddingRight();
-		h = h + area.getPaddingTop() + area.getPaddingBottom();
-		
-	// I'm not sure I should have to check for bg being null
-	// but I do
-	if ((bg != null) && (bg.alpha() == 0)) {
-		this.addRect(rx, ry, w, -h,
-			 new PDFColor(bg),
-			 new PDFColor(bg));
-	}
-	
-		rx = rx - area.borderWidthLeft;
-		ry = ry + area.borderWidthTop;
-		w = w + area.borderWidthLeft + area.borderWidthRight;
-		h = h + area.borderWidthTop + area.borderWidthBottom;
-		
-		if (area.borderWidthTop != 0)
-		  addLine(rx, ry, rx + w, ry, 
-				area.borderWidthTop,  
-				new PDFColor(area.borderColorTop));
-		if (area.borderWidthLeft != 0)
-		  addLine(rx, ry, rx, ry - h, 
-				area.borderWidthLeft,  
-				new PDFColor(area.borderColorLeft));
-		if (area.borderWidthRight != 0)
-		  addLine(rx + w, ry, rx + w, ry - h, 
-				area.borderWidthRight,	
-				new PDFColor(area.borderColorRight));
-		if (area.borderWidthBottom != 0)
-		  addLine(rx, ry - h, rx + w, ry - h, 
-				area.borderWidthBottom,  
-				new PDFColor(area.borderColorBottom));
-
-	} 
-   
-
-	/**
-	 * render block area to PDF
-	 *
-	 * @param area the block area to render
-	 */
-	public void renderBlockArea(BlockArea area) {
-		doFrame(area);
-	Enumeration e = area.getChildren().elements();
-	while (e.hasMoreElements()) {
-		Box b = (Box) e.nextElement();
-		b.render(this);
-	}
-	}
-
-	/**
-	 * render display space to PDF
-	 *
-	 * @param space the display space to render
-	 */
-	public void renderDisplaySpace(DisplaySpace space) {
-	int d = space.getSize();
-	this.currentYPosition -= d;
-	}
-
-	/**
-	 * render image area to PDF
-	 *
-	 * @param area the image area to render
-	 */
-	public void renderImageArea(ImageArea area) {
-	// adapted from contribution by BoBoGi
-	int x = this.currentAreaContainerXPosition +
-		area.getXOffset();
-	int y = this.currentYPosition;
-	int w = area.getContentWidth();
-	int h = area.getHeight();
-
-	this.currentYPosition -= h;
-
-	FopImage img = area.getImage();
-	    if (img instanceof SVGImage) {
-	        try {
-            SVGSVGElement svg =
-              ((SVGImage) img).getSVGDocument().getRootElement();
-		    currentStream.add("ET\nq\n" + (((float) w) / 1000f) + " 0 0 " +
-				      (((float) h) / 1000f) + " " + 
-				      (((float) x) / 1000f) + " " + 
-				      (((float) (y - h)) / 1000f) + " cm\n");
-//        renderSVG(svg, (int) x, (int) y);
-		    currentStream.add("Q\nBT\n");
-		} catch(FopImageException e) {
-		}
-    	} else {
-		int xObjectNum = this.pdfDoc.addImage(img);
-
-		currentStream.add("ET\nq\n" + (((float) w) / 1000f) + " 0 0 " +
-				  (((float) h) / 1000f) + " " + 
-				  (((float) x) / 1000f) + " " + 
-				  (((float) (y - h)) / 1000f) + " cm\n" +
-				  "/Im" + xObjectNum + " Do\nQ\nBT\n"); 
-		}
+            this.currentYPosition =
+              area.getYPosition() - 2 * area.getPaddingTop() -
+              2 * area.borderWidthTop;
+            this.currentAreaContainerXPosition = area.getXPosition();
+        } else if (area.getPosition() == Position.RELATIVE) {
+            this.currentYPosition -= area.getYPosition();
+            this.currentAreaContainerXPosition += area.getXPosition();
+        } else if (area.getPosition() == Position.STATIC) {
+            this.currentYPosition -=
+              area.getPaddingTop() + area.borderWidthTop;
+            this.currentAreaContainerXPosition +=
+              area.getPaddingLeft() + area.borderWidthLeft;
+        }
+
+        this.currentXPosition = this.currentAreaContainerXPosition;
+        doFrame(area);
+
+        Enumeration e = area.getChildren().elements();
+        while (e.hasMoreElements()) {
+            Box b = (Box) e.nextElement();
+            b.render(this);
+        }
+        if (area.getPosition() != Position.STATIC) {
+            this.currentYPosition = saveY;
+            this.currentAreaContainerXPosition = saveX;
+        } else
+            this.currentYPosition -= area.getHeight();
+    }
+
+    private void doFrame(Area area) {
+        int w, h;
+        int rx = this.currentAreaContainerXPosition;
+        w = area.getContentWidth();
+        if (area instanceof BlockArea)
+            rx += ((BlockArea) area).getStartIndent();
+        h = area.getContentHeight();
+        int ry = this.currentYPosition;
+        ColorType bg = area.getBackgroundColor();
+
+        rx = rx - area.getPaddingLeft();
+        ry = ry + area.getPaddingTop();
+        w = w + area.getPaddingLeft() + area.getPaddingRight();
+        h = h + area.getPaddingTop() + area.getPaddingBottom();
+
+        // I'm not sure I should have to check for bg being null
+        // but I do
+        if ((bg != null) && (bg.alpha() == 0)) {
+            this.addRect(rx, ry, w, -h, new PDFColor(bg), new PDFColor(bg));
+        }
+
+        rx = rx - area.borderWidthLeft;
+        ry = ry + area.borderWidthTop;
+        w = w + area.borderWidthLeft + area.borderWidthRight;
+        h = h + area.borderWidthTop + area.borderWidthBottom;
+
+        if (area.borderWidthTop != 0)
+            addLine(rx, ry, rx + w, ry, area.borderWidthTop,
+                    new PDFColor(area.borderColorTop));
+        if (area.borderWidthLeft != 0)
+            addLine(rx, ry, rx, ry - h, area.borderWidthLeft,
+                    new PDFColor(area.borderColorLeft));
+        if (area.borderWidthRight != 0)
+            addLine(rx + w, ry, rx + w, ry - h, area.borderWidthRight,
+                    new PDFColor(area.borderColorRight));
+        if (area.borderWidthBottom != 0)
+            addLine(rx, ry - h, rx + w, ry - h, area.borderWidthBottom,
+                    new PDFColor(area.borderColorBottom));
+
+    }
+
+
+    /**
+      * render block area to PDF
+      *
+      * @param area the block area to render
+      */
+    public void renderBlockArea(BlockArea area) {
+        doFrame(area);
+        Enumeration e = area.getChildren().elements();
+        while (e.hasMoreElements()) {
+            Box b = (Box) e.nextElement();
+            b.render(this);
+        }
+    }
+
+    /**
+      * render display space to PDF
+      *
+      * @param space the display space to render
+      */
+    public void renderDisplaySpace(DisplaySpace space) {
+        int d = space.getSize();
+        this.currentYPosition -= d;
+    }
+
+    /**
+      * render image area to PDF
+      *
+      * @param area the image area to render
+      */
+    public void renderImageArea(ImageArea area) {
+        // adapted from contribution by BoBoGi
+        int x = this.currentAreaContainerXPosition + area.getXOffset();
+        int y = this.currentYPosition;
+        int w = area.getContentWidth();
+        int h = area.getHeight();
+
+        this.currentYPosition -= h;
+
+        FopImage img = area.getImage();
+        if (img instanceof SVGImage) {
+            try {
+                SVGSVGElement svg =
+                  ((SVGImage) img).getSVGDocument().getRootElement();
+                currentStream.add("ET\nq\n" + (((float) w) / 1000f) +
+                                  " 0 0 " + (((float) h) / 1000f) + " " +
+                                  (((float) x) / 1000f) + " " +
+                                  (((float)(y - h)) / 1000f) + " cm\n");
+                //        renderSVG(svg, (int) x, (int) y);
+                currentStream.add("Q\nBT\n");
+            } catch (FopImageException e) {
+            }
+        } else {
+            int xObjectNum = this.pdfDoc.addImage(img);
+
+            currentStream.add("ET\nq\n" + (((float) w) / 1000f) +
+                              " 0 0 " + (((float) h) / 1000f) + " " +
+                              (((float) x) / 1000f) + " " +
+                              (((float)(y - h)) / 1000f) + " cm\n" + "/Im" +
+                              xObjectNum + " Do\nQ\nBT\n");
+        }
     }
 
     /** render a foreign object area */
-    public void renderForeignObjectArea(ForeignObjectArea area)
-    {
+    public void renderForeignObjectArea(ForeignObjectArea area) {
         // if necessary need to scale and align the content
-		this.currentXPosition = this.currentXPosition + area.getXOffset();
-		this.currentYPosition = this.currentYPosition;
-		switch(area.getAlign()) {
-		    case TextAlign.START:
-		    break;
-		    case TextAlign.END:
-		    break;
-		    case TextAlign.CENTER:
-		    case TextAlign.JUSTIFY:
-		    break;
-		}
-		switch(area.getVerticalAlign()) {
-		    case VerticalAlign.BASELINE:
-		    break;
-		    case VerticalAlign.MIDDLE:
-		    break;
-		    case VerticalAlign.SUB:
-		    break;
-		    case VerticalAlign.SUPER:
-		    break;
-		    case VerticalAlign.TEXT_TOP:
-		    break;
-		    case VerticalAlign.TEXT_BOTTOM:
-		    break;
-		    case VerticalAlign.TOP:
-		    break;
-		    case VerticalAlign.BOTTOM:
-		    break;
-		}
-		// in general the content will not be text
-		currentStream.add("ET\n");
-		// align and scale
-		currentStream.add("q\n");
-		switch(area.scalingMethod()) {
-		    case Scaling.UNIFORM:
-		    break;
-		    case Scaling.NON_UNIFORM:
-		    break;
-		}
-		// if the overflow is auto (default), scroll or visible
-		// then the contents should not be clipped, since this
-		// is considered a printing medium.
-		switch(area.getOverflow()) {
-		    case Overflow.VISIBLE:
-		    case Overflow.SCROLL:
-		    case Overflow.AUTO:
-		    break;
-		    case Overflow.HIDDEN:
-		    break;
-		}
+        this.currentXPosition = this.currentXPosition + area.getXOffset();
+        this.currentYPosition = this.currentYPosition;
+        switch (area.getAlign()) {
+            case TextAlign.START:
+                break;
+            case TextAlign.END:
+                break;
+            case TextAlign.CENTER:
+            case TextAlign.JUSTIFY:
+                break;
+        }
+        switch (area.getVerticalAlign()) {
+            case VerticalAlign.BASELINE:
+                break;
+            case VerticalAlign.MIDDLE:
+                break;
+            case VerticalAlign.SUB:
+                break;
+            case VerticalAlign.SUPER:
+                break;
+            case VerticalAlign.TEXT_TOP:
+                break;
+            case VerticalAlign.TEXT_BOTTOM:
+                break;
+            case VerticalAlign.TOP:
+                break;
+            case VerticalAlign.BOTTOM:
+                break;
+        }
+        // in general the content will not be text
+        currentStream.add("ET\n");
+        // align and scale
+        currentStream.add("q\n");
+        switch (area.scalingMethod()) {
+            case Scaling.UNIFORM:
+                break;
+            case Scaling.NON_UNIFORM:
+                break;
+        }
+        // if the overflow is auto (default), scroll or visible
+        // then the contents should not be clipped, since this
+        // is considered a printing medium.
+        switch (area.getOverflow()) {
+            case Overflow.VISIBLE:
+            case Overflow.SCROLL:
+            case Overflow.AUTO:
+                break;
+            case Overflow.HIDDEN:
+                break;
+        }
         area.getObject().render(this);
-		currentStream.add("Q\n");
-		currentStream.add("BT\n");
-		this.currentXPosition += area.getEffectiveWidth();
-		this.currentYPosition -= area.getEffectiveHeight();
+        currentStream.add("Q\n");
+        currentStream.add("BT\n");
+        this.currentXPosition += area.getEffectiveWidth();
+        this.currentYPosition -= area.getEffectiveHeight();
     }
 
     /**
-     * render SVG area to PDF
-     *
-     * @param area the SVG area to render
-     */
-	public void renderSVGArea(SVGArea area) {
-		int x = this.currentXPosition;
-		int y = this.currentYPosition;
-		SVGSVGElement svg = area.getSVGDocument().getRootElement();
-		int w = (int)(svg.getWidth().getBaseVal().getValue() * 1000);
-		int h = (int)(svg.getHeight().getBaseVal().getValue() * 1000);
-
-		/*
-		 * Clip to the svg area.
-		 * Note: To have the svg overlay (under) a text area then use
-		 * an fo:block-container
-		 */
-		currentStream.add("q\n");
-		currentStream.add(x / 1000f + " " + y / 1000f + " m\n");
-		currentStream.add((x + w) / 1000f + " " + y / 1000f + " l\n");
-		currentStream.add((x + w) / 1000f + " " + (y - h) / 1000f + " l\n");
-		currentStream.add(x / 1000f + " " + (y - h) / 1000f + " l\n");
-		currentStream.add("h\n");
-		currentStream.add("W\n");
-		currentStream.add("n\n");
-		// transform so that the coordinates (0,0) is from the top left
-		// and positive is down and to the right
-		currentStream.add(1 + " " + 0 + " " + 0 + " " + (-1) + " " + x / 1000f + " " + y / 1000f + " cm\n");
-
-		// TODO - translate and clip to viewbox
-
-		SVGRenderer svgRenderer = new SVGRenderer(area.getFontState(), pdfDoc, currentFontName, currentFontSize, currentXPosition, currentYPosition);
-		svgRenderer.renderSVG(svg, x, y);
-		currentStream.add(svgRenderer.getString());
-
-		currentStream.add("Q\n");
-	}
+      * render SVG area to PDF
+      *
+      * @param area the SVG area to render
+      */
+    public void renderSVGArea(SVGArea area) {
+        int x = this.currentXPosition;
+        int y = this.currentYPosition;
+        SVGSVGElement svg = area.getSVGDocument().getRootElement();
+        int w = (int)(svg.getWidth().getBaseVal().getValue() * 1000);
+        int h = (int)(svg.getHeight().getBaseVal().getValue() * 1000);
+
+        /*
+         * Clip to the svg area.
+         * Note: To have the svg overlay (under) a text area then use
+         * an fo:block-container
+         */
+        currentStream.add("q\n");
+        currentStream.add(x / 1000f + " " + y / 1000f + " m\n");
+        currentStream.add((x + w) / 1000f + " " + y / 1000f + " l\n");
+        currentStream.add((x + w) / 1000f + " " + (y - h) / 1000f + " l\n");
+        currentStream.add(x / 1000f + " " + (y - h) / 1000f + " l\n");
+        currentStream.add("h\n");
+        currentStream.add("W\n");
+        currentStream.add("n\n");
+        // transform so that the coordinates (0,0) is from the top left
+        // and positive is down and to the right
+        currentStream.add(1 + " " + 0 + " " + 0 + " " + (-1) + " " +
+                          x / 1000f + " " + y / 1000f + " cm\n");
+
+        // TODO - translate and clip to viewbox
+
+        SVGRenderer svgRenderer =
+          new SVGRenderer(area.getFontState(), pdfDoc,
+                          currentFontName, currentFontSize, currentXPosition,
+                          currentYPosition);
+        svgRenderer.renderSVG(svg, x, y);
+        currentStream.add(svgRenderer.getString());
+
+        currentStream.add("Q\n");
+    }
 
     /**
-     * render inline area to PDF
-     *
-     * @param area inline area to render
-     */
+      * render inline area to PDF
+      *
+      * @param area inline area to render
+      */
     public void renderInlineArea(InlineArea area) {
-	char ch;
-	StringBuffer pdf = new StringBuffer();
-		
-	String name = area.getFontState().getFontName();
-	int size = area.getFontState().getFontSize();
-	
-	PDFColor theAreaColor = new PDFColor(
-				(double)area.getRed(),
-				(double)area.getGreen(),
-				(double)area.getBlue()  );
-		
-	if ((!name.equals(this.currentFontName))
-		|| (size != this.currentFontSize)) {
-		this.currentFontName = name;
-		this.currentFontSize = size;
-		pdf = pdf.append("/" + name + " " + (size/1000) + " Tf\n");
-	}
-
-	//if (theAreaColor.isEquivalent(this.currentFill)) {
-		this.currentFill = theAreaColor;
-		
-		pdf = pdf.append(this.currentFill.getColorSpaceOut(true));
-	//}
-		
-	int rx = this.currentXPosition;
-	int bl = this.currentYPosition;
-
-	pdf = pdf.append("1 0 0 1 "
-			 +(rx/1000f) + " " + (bl/1000f)
-			 + " Tm (");
-
-	String s;
-	if ( area.getPageNumberID()!=null ) { // this text is a page number, so resolve it
-            s = idReferences.getPageNumber(area.getPageNumberID());            
-            if(s==null)
-            {
-                s="";
-            }
+        char ch;
+        StringBuffer pdf = new StringBuffer();
+
+        String name = area.getFontState().getFontName();
+        int size = area.getFontState().getFontSize();
+
+        PDFColor theAreaColor = new PDFColor((double) area.getRed(),
+                                             (double) area.getGreen(), (double) area.getBlue());
+
+        if ((!name.equals(this.currentFontName)) ||
+                (size != this.currentFontSize)) {
+            this.currentFontName = name;
+            this.currentFontSize = size;
+            pdf = pdf.append("/" + name + " " + (size / 1000) + " Tf\n");
         }
-        else {
+
+        //if (theAreaColor.isEquivalent(this.currentFill)) {
+        this.currentFill = theAreaColor;
+
+        pdf = pdf.append(this.currentFill.getColorSpaceOut(true));
+        //}
+
+        int rx = this.currentXPosition;
+        int bl = this.currentYPosition;
+
+        pdf = pdf.append("1 0 0 1 " +(rx / 1000f) + " " + (bl / 1000f) +
+                         " Tm (");
+
+        String s;
+        if (area.getPageNumberID() != null) { // this text is a page number, so resolve it
+            s = idReferences.getPageNumber(area.getPageNumberID());
+            if (s == null) {
+                s = "";
+            }
+        } else {
             s = area.getText();
         }
-	
-	int l = s.length();
-
-	for (int i=0; i < l; i++) {
-		ch = s.charAt(i);
-		if (ch > 127) {
-		pdf = pdf.append("\\");
-		pdf = pdf.append(Integer.toOctalString((int)ch));
-		} else {
-		switch (ch) {
-		case '('  : pdf = pdf.append("\\("); break;
-		case ')'  : pdf = pdf.append("\\)"); break;
-		case '\\' : pdf = pdf.append("\\\\"); break;
-		default   : pdf = pdf.append(ch); break;
-		}
-		}
-	}
-	pdf = pdf.append(") Tj\n");
-
-	if (area.getUnderlined()) {
-		addLine(rx, bl - size/10, rx + area.getContentWidth(),
-		        bl - size/10, size/14, theAreaColor);
-	}
-
-	currentStream.add(pdf.toString());
-
-	this.currentXPosition += area.getContentWidth();
-	}
-
-	/**
-	 * render inline space to PDF
-	 *
-	 * @param space space to render
-	 */
-	public void renderInlineSpace(InlineSpace space) {
-	this.currentXPosition += space.getSize();
-	}
-
-	/**
-	 * render line area to PDF
-	 *
-	 * @param area area to render
-	 */
-	public void renderLineArea(LineArea area) {
-	int rx = this.currentAreaContainerXPosition
-		+ area.getStartIndent();
-	int ry = this.currentYPosition;
-	int w = area.getContentWidth();
-	int h = area.getHeight();
-
-	this.currentYPosition -= area.getPlacementOffset();
-	this.currentXPosition = rx;
-
-	int bl = this.currentYPosition;
-
-	Enumeration e = area.getChildren().elements();
-	while (e.hasMoreElements()) {
-		Box b = (Box) e.nextElement();
-		this.currentYPosition = ry - area.getPlacementOffset();
-		b.render(this);
-	}
-
-	this.currentYPosition = ry-h;
-	this.currentXPosition = rx;
-	}
-
-	/**
-	 * render page into PDF
-	 *
-	 * @param page page to render
-	 */
-	public void renderPage(Page page) {
-	AreaContainer body, before, after;
-	  
-	currentStream = this.pdfDoc.makeStream();
-	body = page.getBody();
-	before = page.getBefore();
-	after = page.getAfter();
-
-	this.currentFontName = "";
-	this.currentFontSize = 0;
-
-	currentStream.add("BT\n");
-
-	renderAreaContainer(body);
-
-	if (before != null) {
-		renderAreaContainer(before);
-	}
-
-	if (after != null) {
-		renderAreaContainer(after);
-	}
-	
-	currentStream.add("ET\n");
-
-	currentPage = this.pdfDoc.makePage(this.pdfResources, currentStream,
-				 page.getWidth()/1000,
-				 page.getHeight()/1000, page);
-
-	if (page.hasLinks()) {
-		currentAnnotList = this.pdfDoc.makeAnnotList();
-		currentPage.setAnnotList(currentAnnotList);
-
-		Enumeration e = page.getLinkSets().elements();
-		while (e.hasMoreElements()) {
-		LinkSet linkSet = (LinkSet) e.nextElement();
-
-		linkSet.align();
-		String dest = linkSet.getDest();
+
+        int l = s.length();
+
+        for (int i = 0; i < l; i++) {
+            ch = s.charAt(i);
+            if (ch > 127) {
+                pdf = pdf.append("\\");
+                pdf = pdf.append(Integer.toOctalString((int) ch));
+            } else {
+                switch (ch) {
+                    case '(' :
+                        pdf = pdf.append("\\(");
+                        break;
+                    case ')' :
+                        pdf = pdf.append("\\)");
+                        break;
+                    case '\\' :
+                        pdf = pdf.append("\\\\");
+                        break;
+                    default :
+                        pdf = pdf.append(ch);
+                        break;
+                }
+            }
+        }
+        pdf = pdf.append(") Tj\n");
+
+        if (area.getUnderlined()) {
+            addLine(rx, bl - size / 10, rx + area.getContentWidth(),
+                    bl - size / 10, size / 14, theAreaColor);
+        }
+
+        currentStream.add(pdf.toString());
+
+        this.currentXPosition += area.getContentWidth();
+    }
+
+    /**
+      * render inline space to PDF
+      *
+      * @param space space to render
+      */
+    public void renderInlineSpace(InlineSpace space) {
+        this.currentXPosition += space.getSize();
+    }
+
+    /**
+      * render line area to PDF
+      *
+      * @param area area to render
+      */
+    public void renderLineArea(LineArea area) {
+        int rx = this.currentAreaContainerXPosition + area.getStartIndent();
+        int ry = this.currentYPosition;
+        int w = area.getContentWidth();
+        int h = area.getHeight();
+
+        this.currentYPosition -= area.getPlacementOffset();
+        this.currentXPosition = rx;
+
+        int bl = this.currentYPosition;
+
+        Enumeration e = area.getChildren().elements();
+        while (e.hasMoreElements()) {
+            Box b = (Box) e.nextElement();
+            this.currentYPosition = ry - area.getPlacementOffset();
+            b.render(this);
+        }
+
+        this.currentYPosition = ry - h;
+        this.currentXPosition = rx;
+    }
+
+    /**
+      * render page into PDF
+      *
+      * @param page page to render
+      */
+    public void renderPage(Page page) {
+        AreaContainer body, before, after;
+
+        currentStream = this.pdfDoc.makeStream();
+        body = page.getBody();
+        before = page.getBefore();
+        after = page.getAfter();
+
+        this.currentFontName = "";
+        this.currentFontSize = 0;
+
+        currentStream.add("BT\n");
+
+        renderAreaContainer(body);
+
+        if (before != null) {
+            renderAreaContainer(before);
+        }
+
+        if (after != null) {
+            renderAreaContainer(after);
+        }
+
+        currentStream.add("ET\n");
+
+        currentPage = this.pdfDoc.makePage(this.pdfResources, currentStream,
+                                           page.getWidth() / 1000, page.getHeight() / 1000, page);
+
+        if (page.hasLinks()) {
+            currentAnnotList = this.pdfDoc.makeAnnotList();
+            currentPage.setAnnotList(currentAnnotList);
+
+            Enumeration e = page.getLinkSets().elements();
+            while (e.hasMoreElements()) {
+                LinkSet linkSet = (LinkSet) e.nextElement();
+
+                linkSet.align();
+                String dest = linkSet.getDest();
                 int linkType = linkSet.getLinkType();
-		Enumeration f = linkSet.getRects().elements();
-		while (f.hasMoreElements()) {
-			LinkedRectangle lrect = (LinkedRectangle) f.nextElement();
-			currentAnnotList.addLink(
-				this.pdfDoc.makeLink(lrect.getRectangle(), dest, linkType));
-		}
-		}
-	} else {
-		// just to be on the safe side
-		currentAnnotList = null;
-	}
-	}
-
-	/**
-	 * render leader area into PDF
-	 *
-	 * @param area area to render
-	 */
-	public void renderLeaderArea(LeaderArea area) {
-	int rx = this.currentXPosition;;
-	int ry = this.currentYPosition;
-	int w = area.getContentWidth();
-	int h = area.getHeight();
-	int th = area.getRuleThickness();
-        int st = area.getRuleStyle();   //not used at the moment
-
-	addLine(rx, ry, rx+w, ry, th, new PDFColor(area.getRed(), area.getGreen(),area.getBlue()));
-	this.currentXPosition += area.getContentWidth();
-	}
-
-	/**
-	 * set up the font info
-	 *
-	 * @param fontInfo font info to set up
-	 */
-	public void setupFontInfo(FontInfo fontInfo) {
-	FontSetup.setup(fontInfo);
-	FontSetup.addToResources(this.pdfDoc, fontInfo);
-	}
+                Enumeration f = linkSet.getRects().elements();
+                while (f.hasMoreElements()) {
+                    LinkedRectangle lrect =
+                      (LinkedRectangle) f.nextElement();
+                    currentAnnotList.addLink(
+                      this.pdfDoc.makeLink(lrect.getRectangle(),
+                                           dest, linkType));
+                }
+            }
+        } else {
+            // just to be on the safe side
+            currentAnnotList = null;
+        }
+    }
+
+    /**
+      * render leader area into PDF
+      *
+      * @param area area to render
+      */
+    public void renderLeaderArea(LeaderArea area) {
+        int rx = this.currentXPosition;
+        ;
+        int ry = this.currentYPosition;
+        int w = area.getContentWidth();
+        int h = area.getHeight();
+        int th = area.getRuleThickness();
+        int st = area.getRuleStyle();
+        String rs = setRuleStylePattern(st);
+        //checks whether thickness is = 0, because of bug in pdf (or where?), 
+        //a line with thickness 0 is still displayed
+        if (th != 0) {
+            switch (st) {
+                case org.apache.fop.fo.properties.RuleStyle.DOUBLE:
+                    addLine(rx, ry, rx + w, ry, th / 3, rs,
+                            new PDFColor(area.getRed(),
+                                         area.getGreen(), area.getBlue()));
+                    addLine(rx, ry + (2 * th / 3), rx + w,
+                            ry + (2 * th / 3), th / 3, rs,
+                            new PDFColor(area.getRed(),
+                                         area.getGreen(), area.getBlue()));
+                    break;
+                case org.apache.fop.fo.properties.RuleStyle.GROOVE:
+                    addLine(rx, ry, rx + w, ry, th / 2, rs,
+                            new PDFColor(area.getRed(),
+                                         area.getGreen(), area.getBlue()));
+                    addLine(rx, ry + (th / 2), rx + w, ry + (th / 2),
+                            th / 2, rs, new PDFColor(255, 255, 255));
+                    break;
+                case org.apache.fop.fo.properties.RuleStyle.RIDGE:
+                    addLine(rx, ry, rx + w, ry, th / 2, rs,
+                            new PDFColor(255, 255, 255));
+                    addLine(rx, ry + (th / 2), rx + w, ry + (th / 2),
+                            th / 2, rs,
+                            new PDFColor(area.getRed(),
+                                         area.getGreen(), area.getBlue()));
+                    break;
+                default:
+                    addLine(rx, ry, rx + w, ry, th, rs,
+                            new PDFColor(area.getRed(),
+                                         area.getGreen(), area.getBlue()));
+            }
+            this.currentXPosition += area.getContentWidth();
+            this.currentYPosition += th;
+        }
+    }
+
+    /**
+      * set up the font info
+      *
+      * @param fontInfo font info to set up
+      */
+    public void setupFontInfo(FontInfo fontInfo) {
+        FontSetup.setup(fontInfo);
+        FontSetup.addToResources(this.pdfDoc, fontInfo);
+    }
+
+    /**
+      * defines a string containing dashArray and dashPhase for the rule style
+      */
+    private String setRuleStylePattern (int style) {
+        String rs = "";
+        switch (style) {
+            case org.apache.fop.fo.properties.RuleStyle.SOLID:
+                rs = "[] 0 d ";
+                break;
+            case org.apache.fop.fo.properties.RuleStyle.DASHED:
+                rs = "[3 3] 0 d ";
+                break;
+            case org.apache.fop.fo.properties.RuleStyle.DOTTED:
+                rs = "[1 3] 0 d ";
+                break;
+            case org.apache.fop.fo.properties.RuleStyle.DOUBLE:
+                rs = "[] 0 d ";
+                break;
+            default:
+                rs = "[] 0 d ";
+        }
+        return rs;
+    }
+
 }