foray-commit — FOray repository commit log messages

[FOray-commit] SF.net SVN: foray: [7715] trunk/foray/foray-render/src/java/org/foray/render

[<vic...@us...>]

Revision: 7715
Author:   victormote
Date:     2006-06-19 15:29:06 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7715&view=rev

Log Message:
-----------
Separate SVG logic from other graphic logic a bit more.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 21:23:06 UTC (rev 7714)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 22:29:06 UTC (rev 7715)
@@ -74,6 +74,7 @@
 import java.awt.Color;
 import java.awt.Rectangle;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.util.List;
 
@@ -191,7 +192,7 @@
                         // no x clipping, no y clipping
                         contentRectangle = new Rectangle(currentX, currentY,
                                 imgW, imgH);
-                        drawImage(area, backgroundImage, contentRectangle,
+                        drawGraphic(area, backgroundImage, contentRectangle,
                                 null);
                     } else {
                         // no x clipping, y clipping
@@ -199,7 +200,7 @@
                                 imgW, imgH);
                         clipRectangle = new Rectangle(currentX,
                                 currentY - clipH, imgW, clipH);
-                        drawImage(area, backgroundImage, contentRectangle,
+                        drawGraphic(area, backgroundImage, contentRectangle,
                                 clipRectangle);
                     }
                 } else {
@@ -210,7 +211,7 @@
                                 imgW, imgH);
                         clipRectangle = new Rectangle(currentX + clipW,
                                 currentY, clipW, imgH);
-                        drawImage(area, backgroundImage, contentRectangle,
+                        drawGraphic(area, backgroundImage, contentRectangle,
                                 clipRectangle);
                     } else {
                         // x clipping, y clipping
@@ -218,7 +219,7 @@
                                 imgW, imgH);
                         clipRectangle = new Rectangle(currentX + clipW,
                                 currentY - clipH, clipW, clipH);
-                        drawImage(area, backgroundImage, contentRectangle,
+                        drawGraphic(area, backgroundImage, contentRectangle,
                                 clipRectangle);
                     }
                 }
@@ -418,7 +419,7 @@
         }
         Rectangle contentRect = new Rectangle(area.rrOriginX(),
                 area.rrOriginY(), area.rrIPD(), area.rrBPD());
-        drawImage(area, graphic, contentRect, null);
+        drawGraphic(area, graphic, contentRect, null);
     }
 
     /**
@@ -557,4 +558,21 @@
         return new BridgeContext(userAgent);
     }
 
+    /**
+     * Converts a Rectangle storing millipoints to one storing points.
+     * @param input A rectangle whose dimensions are stored as millipoints.
+     * @return A new rectangle whose dimensions are stored as points.
+     */
+    public static Rectangle2D.Float convertMillipointRectangle(
+            Rectangle input) {
+        if (input == null) {
+            return null;
+        }
+        return new Rectangle2D.Float(
+                input.x / 1000f,
+                input.y / 1000,
+                input.width / 1000f,
+                input.height / 1000f);
+    }
+
 }

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-19 21:23:06 UTC (rev 7714)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-19 22:29:06 UTC (rev 7715)
@@ -215,17 +215,10 @@
      */
     protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
-        Rectangle2D.Float pdfContentRectangle = new Rectangle2D.Float(
-                contentRectangle.x / 1000f, contentRectangle.y / 1000,
-                contentRectangle.width / 1000f,
-                contentRectangle.height / 1000f);
-        Rectangle2D.Float pdfClipRectangle = null;
-        if (clipRectangle != null) {
-            pdfClipRectangle = new Rectangle2D.Float(
-                    clipRectangle.x / 1000f, clipRectangle.y / 1000,
-                    clipRectangle.width / 1000f,
-                    clipRectangle.height / 1000f);
-        }
+        Rectangle2D.Float pdfContentRectangle = convertMillipointRectangle(
+                contentRectangle);
+        Rectangle2D.Float pdfClipRectangle = convertMillipointRectangle(
+                clipRectangle);
         FontUse font = area.getPrimaryFont();
         float fontSize = area.traitFontSize()/1000;
         float letterSpacing = area.actualLetterSpacing() / 1000f;
@@ -239,7 +232,16 @@
      */
     protected void drawSVG(Area area, SVGGraphic graphic,
             Rectangle contentRectangle, Rectangle clipRectangle) {
-        /* TODO: Implement this. */
+        Rectangle2D.Float pdfContentRectangle = convertMillipointRectangle(
+                contentRectangle);
+        Rectangle2D.Float pdfClipRectangle = convertMillipointRectangle(
+                clipRectangle);
+        FontUse font = area.getPrimaryFont();
+        float fontSize = area.traitFontSize()/1000;
+        float letterSpacing = area.actualLetterSpacing() / 1000f;
+        getContentStream().drawGraphic(pdfContentRectangle, pdfClipRectangle,
+                graphic, font, fontSize, letterSpacing,
+                getStrokeSVGText());
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7714] trunk/foray/foray-render/src/java/org/foray/render

[<vic...@us...>]

Revision: 7714
Author:   victormote
Date:     2006-06-19 14:23:06 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7714&view=rev

Log Message:
-----------
Add new method for drawing SVG.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 21:06:47 UTC (rev 7713)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 21:23:06 UTC (rev 7714)
@@ -66,6 +66,7 @@
 import org.axsl.areaR.TextArea;
 import org.axsl.graphicR.Graphic;
 import org.axsl.graphicR.GraphicException;
+import org.axsl.graphicR.SVGGraphic;
 
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.commons.logging.Log;
@@ -280,20 +281,41 @@
             Color fillColor) ;
 
     /**
-     * Renders an image, scaling it to a given contentRectangle, and clipping it
-     * within a given clip rectangle.
+     * Renders a generic Graphic, regardless of type to a given
+     * contentRectangle, and clipping it within a given clip rectangle.
      * If the content rectangle is the same as the intrinsic dimensions of the
      * image, no scaling is done.
      * @param area The Area instance from which to obtain traits.
-     * @param image the image to be rendered
+     * @param graphic The graphic to be rendered.
      * @param contentRectangle The rectangle to which the graphic should be
      * scaled during drawing.
      * @param clipRectangle The rectangle to which the content should be clipped
      * after any scaling.
      */
+    protected void drawGraphic(Area area, Graphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) {
+        if (graphic instanceof SVGGraphic) {
+            SVGGraphic svg = (SVGGraphic) graphic;
+            drawSVG(area, svg, contentRectangle, clipRectangle);
+            return;
+        }
+        drawImage(area, graphic, contentRectangle, clipRectangle);
+    }
+
+    /**
+     * The same as {@link #drawGraphic(Area, Graphic, Rectangle, Rectangle)},
+     * except for the specific case of bitmapped images.
+     */
     protected abstract void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle);
 
+    /**
+     * The same as {@link #drawGraphic(Area, Graphic, Rectangle, Rectangle)},
+     * except for the specific case of SVG graphics.
+     */
+    protected abstract void drawSVG(Area area, SVGGraphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) ;
+
     public void render(AreaNode node) {
         renderChildren(node);
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-06-19 21:23:06 UTC (rev 7714)
@@ -479,6 +479,14 @@
     // TODO: implement this
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected void drawSVG(Area area, SVGGraphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) {
+        /* TODO: Implement this. */
+    }
+
     public void render(ExternalGraphicArea area) {
         int x = area.rrOriginX();
         int y = area.rrOriginY();

Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2006-06-19 21:23:06 UTC (rev 7714)
@@ -47,6 +47,7 @@
 import org.axsl.fontR.Font;
 import org.axsl.graphicR.Graphic;
 import org.axsl.graphicR.GraphicException;
+import org.axsl.graphicR.SVGGraphic;
 
 import org.apache.commons.logging.Log;
 
@@ -240,6 +241,14 @@
     // TODO: implement this
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected void drawSVG(Area area, SVGGraphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) {
+        /* TODO: Implement this. */
+    }
+
     boolean printBMP(Graphic img, int x, int y, int w,
                      int h) throws GraphicException {
         // Print the passed image file in PCL.

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-19 21:23:06 UTC (rev 7714)
@@ -48,6 +48,7 @@
 import org.axsl.common.Constants;
 import org.axsl.fontR.FontUse;
 import org.axsl.graphicR.Graphic;
+import org.axsl.graphicR.SVGGraphic;
 import org.axsl.pdfW.PDFColor;
 import org.axsl.pdfW.PDFContentStream;
 import org.axsl.pdfW.PDFDocument;
@@ -234,6 +235,14 @@
     }
 
     /**
+     * {@inheritDoc}
+     */
+    protected void drawSVG(Area area, SVGGraphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) {
+        /* TODO: Implement this. */
+    }
+
+    /**
      * render a foreign object area
      *
      * @param area  the foreign object area to be rendered

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-06-19 21:23:06 UTC (rev 7714)
@@ -570,6 +570,14 @@
         write("grestore");
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected void drawSVG(Area area, SVGGraphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) {
+        /* TODO: Implement this. */
+    }
+
     public void renderEPS(EPSGraphic img, int x, int y, int w, int h) {
         try {
             out.writeByteArr(epsToPostScript(img, x, y, w, h));

Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-06-19 21:23:06 UTC (rev 7714)
@@ -339,6 +339,14 @@
     // TODO: implement this
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected void drawSVG(Area area, SVGGraphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) {
+        /* TODO: Implement this. */
+    }
+
     public void render(ExternalGraphicArea area) {
         int x = area.rrOriginX();
         int y = area.rrOriginY();

Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-06-19 21:23:06 UTC (rev 7714)
@@ -38,6 +38,7 @@
 import org.axsl.common.Constants;
 import org.axsl.graphicR.Graphic;
 import org.axsl.graphicR.GraphicException;
+import org.axsl.graphicR.SVGGraphic;
 
 import org.apache.commons.logging.Log;
 
@@ -338,6 +339,14 @@
     // TODO: implement this
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected void drawSVG(Area area, SVGGraphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) {
+        /* TODO: Implement this. */
+    }
+
     boolean printBMP(Graphic img, int x, int y, int w,
                      int h) throws GraphicException {
         getLogger().debug("TXTRenderer.printBMP(" + img + ", " + x

Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-19 21:23:06 UTC (rev 7714)
@@ -61,6 +61,7 @@
 import org.axsl.common.Constants;
 import org.axsl.fontR.FontConsumer;
 import org.axsl.graphicR.Graphic;
+import org.axsl.graphicR.SVGGraphic;
 
 import org.apache.commons.logging.Log;
 
@@ -203,10 +204,18 @@
      */
     protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
-    // TODO: implement this
+        /* There is nothing to do here. */
     }
 
     /**
+     * {@inheritDoc}
+     */
+    protected void drawSVG(Area area, SVGGraphic graphic,
+            Rectangle contentRectangle, Rectangle clipRectangle) {
+        /* There is nothing to do here. */
+    }
+
+    /**
      * render an area container to XML
      *
      * @param area the area container to render


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7713] trunk/foray/foray-render/src/java/org/foray/render

[<vic...@us...>]

Revision: 7713
Author:   victormote
Date:     2006-06-19 14:06:47 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7713&view=rev

Log Message:
-----------
Rename method for future expansion.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 20:58:29 UTC (rev 7712)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 21:06:47 UTC (rev 7713)
@@ -190,7 +190,7 @@
                         // no x clipping, no y clipping
                         contentRectangle = new Rectangle(currentX, currentY,
                                 imgW, imgH);
-                        drawGraphic(area, backgroundImage, contentRectangle,
+                        drawImage(area, backgroundImage, contentRectangle,
                                 null);
                     } else {
                         // no x clipping, y clipping
@@ -198,7 +198,7 @@
                                 imgW, imgH);
                         clipRectangle = new Rectangle(currentX,
                                 currentY - clipH, imgW, clipH);
-                        drawGraphic(area, backgroundImage, contentRectangle,
+                        drawImage(area, backgroundImage, contentRectangle,
                                 clipRectangle);
                     }
                 } else {
@@ -209,7 +209,7 @@
                                 imgW, imgH);
                         clipRectangle = new Rectangle(currentX + clipW,
                                 currentY, clipW, imgH);
-                        drawGraphic(area, backgroundImage, contentRectangle,
+                        drawImage(area, backgroundImage, contentRectangle,
                                 clipRectangle);
                     } else {
                         // x clipping, y clipping
@@ -217,7 +217,7 @@
                                 imgW, imgH);
                         clipRectangle = new Rectangle(currentX + clipW,
                                 currentY - clipH, clipW, clipH);
-                        drawGraphic(area, backgroundImage, contentRectangle,
+                        drawImage(area, backgroundImage, contentRectangle,
                                 clipRectangle);
                     }
                 }
@@ -280,9 +280,10 @@
             Color fillColor) ;
 
     /**
-     * Renders an image, scaling it to the given width and height.
-     * If the scaled width and height is the same intrinsic size
-     * of the image, the image is not scaled.
+     * Renders an image, scaling it to a given contentRectangle, and clipping it
+     * within a given clip rectangle.
+     * If the content rectangle is the same as the intrinsic dimensions of the
+     * image, no scaling is done.
      * @param area The Area instance from which to obtain traits.
      * @param image the image to be rendered
      * @param contentRectangle The rectangle to which the graphic should be
@@ -290,7 +291,7 @@
      * @param clipRectangle The rectangle to which the content should be clipped
      * after any scaling.
      */
-    protected abstract void drawGraphic(Area area, Graphic image,
+    protected abstract void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle);
 
     public void render(AreaNode node) {
@@ -395,7 +396,7 @@
         }
         Rectangle contentRect = new Rectangle(area.rrOriginX(),
                 area.rrOriginY(), area.rrIPD(), area.rrBPD());
-        drawGraphic(area, graphic, contentRect, null);
+        drawImage(area, graphic, contentRect, null);
     }
 
     /**

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-06-19 20:58:29 UTC (rev 7712)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
@@ -474,7 +474,7 @@
     /**
      * {@inheritDoc}
      */
-    protected void drawGraphic(Area area, Graphic image,
+    protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
     // TODO: implement this
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2006-06-19 20:58:29 UTC (rev 7712)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
@@ -235,7 +235,7 @@
     /**
      * {@inheritDoc}
      */
-    protected void drawGraphic(Area area, Graphic image,
+    protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
     // TODO: implement this
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-19 20:58:29 UTC (rev 7712)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
@@ -212,7 +212,7 @@
     /**
      * {@inheritDoc}
      */
-    protected void drawGraphic(Area area, Graphic image,
+    protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
         Rectangle2D.Float pdfContentRectangle = new Rectangle2D.Float(
                 contentRectangle.x / 1000f, contentRectangle.y / 1000,

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-06-19 20:58:29 UTC (rev 7712)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
@@ -527,7 +527,7 @@
     /**
      * {@inheritDoc}
      */
-    protected void drawGraphic(Area area, Graphic image,
+    protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
         if (clipRectangle.width > 0 || clipRectangle.height >0) {
             drawImageClipped(contentRectangle.x, contentRectangle.y,
@@ -562,7 +562,7 @@
             int w = image.pixelWidth() * 1000;
             int h = image.pixelHeight() * 1000;
             Rectangle rect = new Rectangle(x, y, w, h);
-            drawGraphic(area, image, rect, null);
+            drawImage(area, image, rect, null);
         } catch (GraphicException e) {
             getLogger().error("Error getting image extents");
             getLogger().error(e.getMessage());
@@ -761,7 +761,7 @@
                     + "null");
         } else {
             Rectangle rect = new Rectangle(x, y, w, h);
-            drawGraphic(area, img, rect, null);
+            drawImage(area, img, rect, null);
         }
     }
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-06-19 20:58:29 UTC (rev 7712)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
@@ -334,7 +334,7 @@
     /**
      * {@inheritDoc}
      */
-    protected void drawGraphic(Area area, Graphic image,
+    protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
     // TODO: implement this
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-06-19 20:58:29 UTC (rev 7712)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
@@ -333,7 +333,7 @@
     /**
      * {@inheritDoc}
      */
-    protected void drawGraphic(Area area, Graphic image,
+    protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
     // TODO: implement this
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-19 20:58:29 UTC (rev 7712)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-19 21:06:47 UTC (rev 7713)
@@ -201,7 +201,7 @@
     /**
      * {@inheritDoc}
      */
-    protected void drawGraphic(Area area, Graphic image,
+    protected void drawImage(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle) {
     // TODO: implement this
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7712] trunk/foray/foray-render/src/java/org/foray/render

[<vic...@us...>]

Revision: 7712
Author:   victormote
Date:     2006-06-19 13:58:29 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7712&view=rev

Log Message:
-----------
Conform to axsl change: Remove unneeded interface.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 20:58:22 UTC (rev 7711)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 20:58:29 UTC (rev 7712)
@@ -63,7 +63,6 @@
 import org.axsl.areaR.SpanArea;
 import org.axsl.areaR.TableArea;
 import org.axsl.areaR.TableCellArea;
-import org.axsl.areaR.TableRowContainer;
 import org.axsl.areaR.TextArea;
 import org.axsl.graphicR.Graphic;
 import org.axsl.graphicR.GraphicException;
@@ -419,12 +418,6 @@
         renderChildren(area);
     }
 
-    public void render(TableRowContainer area) {
-        markBorder(area);
-        markBackground(area);
-        renderChildren(area);
-    }
-
     /**
      * render area container
      *

Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-19 20:58:22 UTC (rev 7711)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-06-19 20:58:29 UTC (rev 7712)
@@ -57,7 +57,6 @@
 import org.axsl.areaR.SpanArea;
 import org.axsl.areaR.TableArea;
 import org.axsl.areaR.TableCellArea;
-import org.axsl.areaR.TableRowContainer;
 import org.axsl.areaR.TextArea;
 import org.axsl.common.Constants;
 import org.axsl.fontR.FontConsumer;
@@ -508,16 +507,6 @@
         writeEndTag(area);
     }
 
-    public void render(TableRowContainer area) {
-        StringBuffer buffer = new StringBuffer();
-        outputGeneratedBy(area, buffer);
-        outputDimension(area, buffer);
-        writeStartTag(area, buffer);
-        outputAllRectangles(area);
-        renderChildren(area);
-        writeEndTag(area);
-    }
-
     public void render(TableCellArea area) {
         StringBuffer buffer = new StringBuffer();
         outputGeneratedBy(area, buffer);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7711] trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java

[<vic...@us...>]

Revision: 7711
Author:   victormote
Date:     2006-06-19 13:58:22 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7711&view=rev

Log Message:
-----------
Conform to axsl change: Remove unneeded interface.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java	2006-06-19 20:02:39 UTC (rev 7710)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java	2006-06-19 20:58:22 UTC (rev 7711)
@@ -37,8 +37,7 @@
  * Note that fo:table-row does not really generate any areas.
  */
 public class TableRowContainer extends ContainerRA
-        implements org.axsl.areaR.TableRowContainer,
-        org.axsl.areaW.TableRowContainer {
+        implements org.axsl.areaW.TableRowContainer {
 
     public TableRowContainer(TableRow generatedBy, Area parentArea,
             RetrieveMarker retrieveMarker) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7710] trunk/foray/foray-render/src/java/org/foray/render/Renderer.java

[<vic...@us...>]

Revision: 7710
Author:   victormote
Date:     2006-06-19 13:02:39 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7710&view=rev

Log Message:
-----------
Clear some javadoc to-do items.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 19:07:26 UTC (rev 7709)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-19 20:02:39 UTC (rev 7710)
@@ -286,8 +286,10 @@
      * of the image, the image is not scaled.
      * @param area The Area instance from which to obtain traits.
      * @param image the image to be rendered
-     * @param contentRectangle TODO
-     * @param clipRectangle TODO
+     * @param contentRectangle The rectangle to which the graphic should be
+     * scaled during drawing.
+     * @param clipRectangle The rectangle to which the content should be clipped
+     * after any scaling.
      */
     protected abstract void drawGraphic(Area area, Graphic image,
             Rectangle contentRectangle, Rectangle clipRectangle);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7709] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7709
Author:   victormote
Date:     2006-06-19 12:07:26 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7709&view=rev

Log Message:
-----------
Conform to axsl change: Add and use interface for all AreaNodes that have a graphic attached.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java
    trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
    trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java	2006-06-19 18:01:56 UTC (rev 7708)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java	2006-06-19 19:07:26 UTC (rev 7709)
@@ -24,13 +24,16 @@
 
 package org.foray.area;
 
+import org.axsl.areaR.BackgroundArea;
 import org.axsl.areaW.TableRowContainer;
 import org.axsl.foR.FObj;
 import org.axsl.foR.fo.RetrieveMarker;
 import org.axsl.foR.fo.TableRow;
+import org.axsl.graphicR.Graphic;
 
 public abstract class AbstractTableContainer extends GenericContainer
-        implements org.axsl.areaW.AbstractTableContainer {
+        implements BackgroundArea,
+        org.axsl.areaW.AbstractTableContainer {
 
     public AbstractTableContainer(FObj generatedBy, Area parentArea,
             RetrieveMarker retrieveMarker) {
@@ -42,4 +45,8 @@
         return new org.foray.area.TableRowContainer(node, this, retrieveMarker);
     }
 
+    public Graphic getGraphic() {
+        return this.traitBackgroundImage();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java	2006-06-19 18:01:56 UTC (rev 7708)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java	2006-06-19 19:07:26 UTC (rev 7709)
@@ -29,6 +29,7 @@
 import org.axsl.common.Constants;
 import org.axsl.foR.FObj;
 import org.axsl.foR.fo.RetrieveMarker;
+import org.axsl.graphicR.Graphic;
 
 /**
  * The container area for the contents of a block-container FO.
@@ -82,4 +83,8 @@
         visitor.render(this);
     }
 
+    public Graphic getGraphic() {
+        return this.traitBackgroundImage();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2006-06-19 18:01:56 UTC (rev 7708)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2006-06-19 19:07:26 UTC (rev 7709)
@@ -33,6 +33,7 @@
 import org.axsl.foR.fo.PageNumber;
 import org.axsl.foR.fo.PageNumberCitation;
 import org.axsl.foR.fo.RetrieveMarker;
+import org.axsl.graphicR.Graphic;
 
 /**
  * Areas generated by the fo:inline object.
@@ -97,4 +98,8 @@
         visitor.render(this);
     }
 
+    public Graphic getGraphic() {
+        return this.traitBackgroundImage();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-06-19 18:01:56 UTC (rev 7708)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-06-19 19:07:26 UTC (rev 7709)
@@ -32,6 +32,7 @@
 import org.axsl.foR.fo.ListItemLabel;
 import org.axsl.foR.fo.RegionBody;
 import org.axsl.foR.fo.RetrieveMarker;
+import org.axsl.graphicR.Graphic;
 
 /**
  * This class represents a Block Area.
@@ -182,4 +183,8 @@
         visitor.render(this);
     }
 
+    public Graphic getGraphic() {
+        return this.traitBackgroundImage();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java	2006-06-19 18:01:56 UTC (rev 7708)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java	2006-06-19 19:07:26 UTC (rev 7709)
@@ -31,6 +31,7 @@
 import org.axsl.foR.fo.RegionBefore;
 import org.axsl.foR.fo.RegionEnd;
 import org.axsl.foR.fo.RegionStart;
+import org.axsl.graphicR.Graphic;
 
 /**
  * This class is used to manage a region-reference-area.
@@ -120,4 +121,8 @@
         visitor.render(this);
     }
 
+    public Graphic getGraphic() {
+        return this.traitBackgroundImage();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-06-19 18:01:56 UTC (rev 7708)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-06-19 19:07:26 UTC (rev 7709)
@@ -31,6 +31,7 @@
 import org.axsl.common.Constants;
 import org.axsl.foR.fo.RegionBody;
 import org.axsl.foR.fo.SimplePageMaster;
+import org.axsl.graphicR.Graphic;
 
 public class RegionRABody extends AreaFixed implements RegionBodyArea,
         org.axsl.areaW.RegionRABody {
@@ -226,4 +227,8 @@
         visitor.render(this);
     }
 
+    public Graphic getGraphic() {
+        return this.traitBackgroundImage();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java	2006-06-19 18:01:56 UTC (rev 7708)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java	2006-06-19 19:07:26 UTC (rev 7709)
@@ -28,6 +28,7 @@
 import org.axsl.areaW.AreaWException;
 import org.axsl.foR.fo.RetrieveMarker;
 import org.axsl.foR.svg.SVGElement;
+import org.axsl.graphicR.Graphic;
 
 import org.w3c.dom.svg.SVGDocument;
 
@@ -68,4 +69,8 @@
         visitor.render(this);
     }
 
+    public Graphic getGraphic() {
+        return this.traitBackgroundImage();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2006-06-19 18:01:56 UTC (rev 7708)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2006-06-19 19:07:26 UTC (rev 7709)
@@ -29,6 +29,7 @@
 import org.axsl.common.Constants;
 import org.axsl.foR.fo.RetrieveMarker;
 import org.axsl.foR.fo.TableCell;
+import org.axsl.graphicR.Graphic;
 
 public class TableCellRA extends ContainerRA implements TableCellArea,
         org.axsl.areaW.TableCellArea {
@@ -165,4 +166,8 @@
         visitor.render(this);
     }
 
+    public Graphic getGraphic() {
+        return this.traitBackgroundImage();
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7708] trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java

[<vic...@us...>]

Revision: 7708
Author:   victormote
Date:     2006-06-19 11:01:56 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7708&view=rev

Log Message:
-----------
Minor javadoc fix.

Modified Paths:
--------------
    trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java	2006-06-19 17:09:34 UTC (rev 7707)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java	2006-06-19 18:01:56 UTC (rev 7708)
@@ -119,11 +119,10 @@
     }
 
     /**
-     * Allows third-party GraphicReader instances to be registered with the
-     * Server, so that they can be included in the list of factories that are
-     * tried as a Graphic is created.
-     * @param factory The GraphicReader instance that should be added to the
-     * list of factories.
+     * Registers a third-party {@link GraphicFactory} implementation with the
+     * Server, so that it can be included in the list of factories that are
+     * tried as a {@link Graphic} is created.
+     * @param factory The factory that should be added to the list of factories.
      * @return True if the factory was successfully registered, false if not.
      */
     public boolean registerFactory(GraphicFactory factory) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7707] trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java

[<vic...@us...>]

Revision: 7707
Author:   victormote
Date:     2006-06-19 10:09:34 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7707&view=rev

Log Message:
-----------
Move and rename the ClasspathHandler class to a location where the java property scheme can find it.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java
Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java	2006-06-19 17:09:24 UTC (rev 7706)
+++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java	2006-06-19 17:09:34 UTC (rev 7707)
@@ -24,10 +24,10 @@
 
 package org.foray.font;
 
-import org.foray.common.ClasspathHandler;
 import org.foray.common.Environment;
 import org.foray.common.RandomReader;
 import org.foray.common.URLBuilder;
+import org.foray.common.url.classpath.Handler;
 import org.foray.ps.encode.EncodingParser;
 import org.foray.ps.encode.EncodingVector;
 import org.foray.ps.encode.GlyphList;
@@ -126,7 +126,7 @@
      * only once, hence a static statement.
      */
     static {
-        ClasspathHandler.register();
+        Handler.register();
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7706] trunk/foray/foray-common/src/java/org/foray/common

[<vic...@us...>]

Revision: 7706
Author:   victormote
Date:     2006-06-19 10:09:24 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7706&view=rev

Log Message:
-----------
Move and rename the ClasspathHandler class to a location where the java property scheme can find it.

Modified Paths:
--------------
    trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java

Added Paths:
-----------
    trunk/foray/foray-common/src/java/org/foray/common/url/
    trunk/foray/foray-common/src/java/org/foray/common/url/classpath/
    trunk/foray/foray-common/src/java/org/foray/common/url/classpath/Handler.java

Removed Paths:
-------------
    trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java
Modified: trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java	2006-06-19 17:02:20 UTC (rev 7705)
+++ trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java	2006-06-19 17:09:24 UTC (rev 7706)
@@ -92,7 +92,7 @@
                 classPath.length());
 
         /* Validate the class name. */
-        if (!  className.equals("Handler")) {
+        if (! className.equals("Handler")) {
             return;
         }
 

Deleted: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java	2006-06-19 17:02:20 UTC (rev 7705)
+++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java	2006-06-19 17:09:24 UTC (rev 7706)
@@ -1,79 +0,0 @@
-/*
- * Copyright 2006 The FOray Project.
- *      http://www.foray.org
- *
- * Licensed 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.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/* $Id$ */
-
-/* Known contributors:
- *     Vincent Hennebert (original author)
- */
-
-package org.foray.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-
-/**
- * Stream handler for URLs with the <code>classpath</code> protocol. Such URLs
- * are used to refer to resources in the CLASSPATH. The two following syntaxes
- * are allowed, but the first one is preferred:
- * <ul>
- *   <li><code>classpath:/path/to/the/resource</code></li>
- *   <li><code>classpath:path/to/the/resource</code></li>
- * </ul>
- */
-public class ClasspathHandler extends AbstractURLStreamHandler {
-
-    private static final String PROTOCOL = "classpath";
-
-    protected URLConnection openConnection(URL u) {
-        return new URLConnection(u) {
-            public void connect() {}
-
-            public InputStream getInputStream() throws IOException {
-                String path = url.getPath();
-                String resourcePath =
-                        (path.charAt(0) == '/')? path.substring(1): path;
-                InputStream inputStream = getClass().getClassLoader().
-                        getResourceAsStream(resourcePath);
-                if (inputStream == null) {
-                    throw new IOException("Unable to open input stream for: "
-                            + url.toString());
-                }
-                return inputStream;
-            }
-        };
-    }
-
-    /**
-     * Register an instance of this class with the custom
-     * URLStreamHandlerFactory so that this handler will be used for URLs of
-     * protocol "classpath".
-     */
-    public static void register() {
-        URLStreamHandler handler = new ClasspathHandler();
-        AbstractURLStreamHandler.register(ClasspathHandler.PROTOCOL, handler);
-    }
-
-}

Added: trunk/foray/foray-common/src/java/org/foray/common/url/classpath/Handler.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/url/classpath/Handler.java	                        (rev 0)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/classpath/Handler.java	2006-06-19 17:09:24 UTC (rev 7706)
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2006 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed 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.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/* $Id$ */
+
+/* Known contributors:
+ *     Vincent Hennebert (original author)
+ */
+
+package org.foray.common.url.classpath;
+
+import org.foray.common.AbstractURLStreamHandler;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+
+/**
+ * Stream handler for URLs with the <code>classpath</code> protocol. Such URLs
+ * are used to refer to resources in the CLASSPATH. The two following syntaxes
+ * are allowed, but the first one is preferred:
+ * <ul>
+ *   <li><code>classpath:/path/to/the/resource</code></li>
+ *   <li><code>classpath:path/to/the/resource</code></li>
+ * </ul>
+ */
+public class Handler extends AbstractURLStreamHandler {
+
+    private static final String PROTOCOL = "classpath";
+
+    protected URLConnection openConnection(URL u) {
+        return new URLConnection(u) {
+            public void connect() {}
+
+            public InputStream getInputStream() throws IOException {
+                String path = url.getPath();
+                String resourcePath =
+                        (path.charAt(0) == '/')? path.substring(1): path;
+                InputStream inputStream = getClass().getClassLoader().
+                        getResourceAsStream(resourcePath);
+                if (inputStream == null) {
+                    throw new IOException("Unable to open input stream for: "
+                            + url.toString());
+                }
+                return inputStream;
+            }
+        };
+    }
+
+    /**
+     * Register an instance of this class with the custom
+     * URLStreamHandlerFactory so that this handler will be used for URLs of
+     * protocol "classpath".
+     */
+    public static void register() {
+        URLStreamHandler handler = new Handler();
+        AbstractURLStreamHandler.register(Handler.PROTOCOL, handler);
+    }
+
+}


Property changes on: trunk/foray/foray-common/src/java/org/foray/common/url/classpath/Handler.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7705] trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java

[<vic...@us...>]

Revision: 7705
Author:   victormote
Date:     2006-06-19 10:02:20 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7705&view=rev

Log Message:
-----------
Add backup scheme to find the class using java.protocol.handler.pkgs, as per Vincent Hennebert's original plan.

Modified Paths:
--------------
    trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java
Modified: trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java	2006-06-19 16:07:09 UTC (rev 7704)
+++ trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java	2006-06-19 17:02:20 UTC (rev 7705)
@@ -30,6 +30,7 @@
 
 import java.io.IOException;
 import java.net.URLStreamHandler;
+import java.util.StringTokenizer;
 
 /**
  * Abstract superclass for all URLStreamHandlers using the FOray scheme for
@@ -75,6 +76,63 @@
              * about it either. */
             return;
         }
+
+        /* The FOray Factory will not be able to register itself with Java in a
+         * case where other software running has already registered another
+         * URLStreamHandlerFactory first.
+         * Therefore, we will give Java another opportunity to find our custom
+         * handler by placing its location in the Java environment.
+         */
+
+        /* Parse the path. */
+        Class theClass = handler.getClass();
+        String classPath = theClass.getName();
+        int lastTokenDelimiter = classPath.lastIndexOf('.');
+        String className = classPath.substring(lastTokenDelimiter + 1,
+                classPath.length());
+
+        /* Validate the class name. */
+        if (!  className.equals("Handler")) {
+            return;
+        }
+
+        Package thePackage = theClass.getPackage();
+        String packageName = thePackage.getName();
+        lastTokenDelimiter = packageName.lastIndexOf('.');
+        String lastSubPackage = packageName.substring(lastTokenDelimiter + 1,
+                packageName.length());
+        /* The last sub-package must be equal to the name of the protocol, or
+         * Java won't find it. */
+        if (! lastSubPackage.equals(protocol)) {
+            return;
+        }
+
+        /* Add the packagePrefix to the Java search path. */
+        String packagePrefix = packageName.substring(0, lastTokenDelimiter);
+        String javaProperty = "java.protocol.handler.pkgs";
+        String searchPath = System.getProperty(javaProperty);
+
+        /* The search path doesn't exist. Create it. */
+        if (searchPath == null) {
+            System.setProperty(javaProperty, packagePrefix);
+            return;
+        }
+
+        /* The search path does exist. See if the package prefix is already
+         * registered. */
+        StringTokenizer packagePrefixIter = new StringTokenizer(
+                searchPath, "|");
+        while (packagePrefixIter.hasMoreTokens()) {
+            String token = packagePrefixIter.nextToken();
+            if (token.equals(packagePrefix)) {
+                /* It is already registered. No need to do it again. */
+                return;
+            }
+        }
+
+        /* It is not registered, so we need to add it. */
+        searchPath += "|" + packagePrefix;
+        System.setProperty(javaProperty, searchPath);
     }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7704] trunk/foray/foray-common/src/java/org/foray/common

[<vic...@us...>]

Revision: 7704
Author:   victormote
Date:     2006-06-19 09:07:09 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7704&view=rev

Log Message:
-----------
Add abstract superclass to handle the details that it can handle.

Modified Paths:
--------------
    trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java

Added Paths:
-----------
    trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java
Added: trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java	                        (rev 0)
+++ trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java	2006-06-19 16:07:09 UTC (rev 7704)
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2006 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed 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.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/* $Id$ */
+
+/* Known contributors:
+ *     Vincent Hennebert (original author)
+ */
+
+package org.foray.common;
+
+import java.io.IOException;
+import java.net.URLStreamHandler;
+
+/**
+ * Abstract superclass for all URLStreamHandlers using the FOray scheme for
+ * custom URLStreamHandler registration.
+ */
+public abstract class AbstractURLStreamHandler extends URLStreamHandler {
+
+    /**
+     * Register an instance of this class with the custom
+     * URLStreamHandlerFactory so that this handler will be used for URLs of
+     * protocol "classpath".
+     */
+    protected static void register(String protocol, URLStreamHandler handler) {
+        /* Validate the input. */
+        if (protocol == null) {
+            return;
+        }
+        if (handler == null) {
+            return;
+        }
+
+        /* Get the Factory instance. */
+        FOrayURLStreamHandlerFactory factory =
+                FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory();
+
+        /* See if this protocol is already registered with the factory. */
+        URLStreamHandler registeredHandler = factory.createURLStreamHandler(
+                protocol);
+        if (registeredHandler != null) {
+            /* If already registed, that one is the one being used, and there
+             * is no way to change it. */
+            return;
+        }
+
+        /* Register the protocol with the Factory. */
+        try {
+            factory.registerProtocol(protocol, handler);
+        } catch (IOException e) {
+            /* This should never happen. We have already checked whether the
+             * protocol is previously registered, and we know that neither the
+             * protocol or handler are null. The only thing we could do is
+             * pass the exception upstream, but there is nothing they can do
+             * about it either. */
+            return;
+        }
+    }
+
+}


Property changes on: trunk/foray/foray-common/src/java/org/foray/common/AbstractURLStreamHandler.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java	2006-06-19 15:38:32 UTC (rev 7703)
+++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java	2006-06-19 16:07:09 UTC (rev 7704)
@@ -43,7 +43,7 @@
  *   <li><code>classpath:path/to/the/resource</code></li>
  * </ul>
  */
-public class ClasspathHandler extends URLStreamHandler {
+public class ClasspathHandler extends AbstractURLStreamHandler {
 
     private static final String PROTOCOL = "classpath";
 
@@ -72,29 +72,8 @@
      * protocol "classpath".
      */
     public static void register() {
-        FOrayURLStreamHandlerFactory factory =
-                FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory();
-        URLStreamHandler handler = factory.createURLStreamHandler(
-                ClasspathHandler.PROTOCOL);
-        if (handler != null) {
-            /* If already registed, that one is the one being used, and there
-             * is no way to change it. */
-            return;
-        }
-        handler = new ClasspathHandler();
-        if (handler == null) {
-            return;
-        }
-        try {
-            factory.registerProtocol(ClasspathHandler.PROTOCOL, handler);
-        } catch (IOException e) {
-            /* This should never happen. We have already checked whether the
-             * protocol is previously registered, and we know that neither the
-             * protocol or handler are null. The only thing we could do is
-             * pass the exception upstream, but there is nothing they can do
-             * about it either. */
-            return;
-        }
+        URLStreamHandler handler = new ClasspathHandler();
+        AbstractURLStreamHandler.register(ClasspathHandler.PROTOCOL, handler);
     }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7703] trunk/foray/foray-common/src/java/org/foray/common

[<vic...@us...>]

Revision: 7703
Author:   victormote
Date:     2006-06-19 08:38:32 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7703&view=rev

Log Message:
-----------
These changes made per Vincent Hennebert's suggestions:
1. Synchronize getter method.
2. Remove method duplicating another method.

Modified Paths:
--------------
    trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java
    trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java
Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java	2006-06-17 22:26:34 UTC (rev 7702)
+++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java	2006-06-19 15:38:32 UTC (rev 7703)
@@ -74,7 +74,7 @@
     public static void register() {
         FOrayURLStreamHandlerFactory factory =
                 FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory();
-        URLStreamHandler handler = factory.getHandler(
+        URLStreamHandler handler = factory.createURLStreamHandler(
                 ClasspathHandler.PROTOCOL);
         if (handler != null) {
             /* If already registed, that one is the one being used, and there

Modified: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java	2006-06-17 22:26:34 UTC (rev 7702)
+++ trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java	2006-06-19 15:38:32 UTC (rev 7703)
@@ -102,21 +102,12 @@
     }
 
     /**
-     * Provides the handler for a given protocol.
-     * @param protocol The protocol whose handler is desired.
-     * @return True iff <code>protocol</code> has previously been registered.
-     */
-    public URLStreamHandler getHandler(String protocol) {
-        Object object = this.protocols.get(protocol);
-        return (URLStreamHandler) object;
-    }
-
-    /**
      * Provides access to a custom URLStreamHandlerFactory instance, creating
      * it and registering it with Java if needed.
      * @return The custom URLStreamHandlerFactory instance for this session.
      */
-    public static FOrayURLStreamHandlerFactory getURLStreamHandlerFactory() {
+    public static synchronized FOrayURLStreamHandlerFactory
+            getURLStreamHandlerFactory() {
         if (FOrayURLStreamHandlerFactory.urlSHFactory == null) {
             FOrayURLStreamHandlerFactory.urlSHFactory
                     = new FOrayURLStreamHandlerFactory();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7702] trunk/foray/lib

[<vic...@us...>]

Revision: 7702
Author:   victormote
Date:     2006-06-17 15:26:34 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7702&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/lib/avalon.LICENSE.txt
    trunk/foray/lib/batik.LICENSE.txt
    trunk/foray/lib/servlet.LICENSE.txt
    trunk/foray/lib/xalan.LICENSE.txt
Modified: trunk/foray/lib/avalon.LICENSE.txt
===================================================================
--- trunk/foray/lib/avalon.LICENSE.txt	2006-06-17 22:19:08 UTC (rev 7701)
+++ trunk/foray/lib/avalon.LICENSE.txt	2006-06-17 22:26:34 UTC (rev 7702)
@@ -3,34 +3,34 @@
  ============================================================================
                    The Apache Software License, Version 1.1
  ============================================================================
- 
+
  Copyright (C) @year@ 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 "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
     Framework" 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 ap...@ap....
- 
+
  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,10 +41,10 @@
  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
- Stefano Mazzocchi  <st...@ap...>. For more  information on the Apache 
+ Stefano Mazzocchi  <st...@ap...>. For more  information on the Apache
  Software Foundation, please see <http://www.apache.org/>.
- 
+
 */

Modified: trunk/foray/lib/batik.LICENSE.txt
===================================================================
--- trunk/foray/lib/batik.LICENSE.txt	2006-06-17 22:19:08 UTC (rev 7701)
+++ trunk/foray/lib/batik.LICENSE.txt	2006-06-17 22:26:34 UTC (rev 7702)
@@ -1,34 +1,34 @@
  ============================================================================
                    The Apache Software License, Version 1.1
  ============================================================================
- 
+
  Copyright (C) 2000 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 "Batik" 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
     ap...@ap....
- 
+
  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
@@ -39,7 +39,7 @@
  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. For more  information on the
  Apache Software Foundation, please see <http://www.apache.org/>.

Modified: trunk/foray/lib/servlet.LICENSE.txt
===================================================================
--- trunk/foray/lib/servlet.LICENSE.txt	2006-06-17 22:19:08 UTC (rev 7701)
+++ trunk/foray/lib/servlet.LICENSE.txt	2006-06-17 22:26:34 UTC (rev 7702)
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 1999 The Apache Software Foundation.  All rights 
+ * Copyright (c) 1999 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    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
@@ -17,15 +17,15 @@
  *    distribution.
  *
  * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:  
- *       "This product includes software developed by the 
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
  *        Apache Software Foundation (http://www.apache.org/)."
  *    Alternately, this acknowlegement may appear in the software itself,
  *    if and wherever such third-party acknowlegements normally appear.
  *
  * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written 
+ *    from this software without prior written permission. For written
  *    permission, please contact ap...@ap....
  *
  * 5. Products derived from this software may not be called "Apache"
@@ -56,4 +56,4 @@
  * This source code implements specifications defined by the Java
  * Community Process. In order to remain compliant with the specification
  * DO NOT add / change / or delete method signatures!
- */ 
+ */

Modified: trunk/foray/lib/xalan.LICENSE.txt
===================================================================
--- trunk/foray/lib/xalan.LICENSE.txt	2006-06-17 22:19:08 UTC (rev 7701)
+++ trunk/foray/lib/xalan.LICENSE.txt	2006-06-17 22:26:34 UTC (rev 7702)
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 1999 The Apache Software Foundation.  All rights 
+ * Copyright (c) 1999 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    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
@@ -17,7 +17,7 @@
  *    distribution.
  *
  * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
+ *    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,
@@ -25,7 +25,7 @@
  *
  * 4. The names "Xalan" and "Apache Software Foundation" must
  *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
+ *    software without prior written permission. For written
  *    permission, please contact ap...@ap....
  *
  * 5. Products derived from this software may not be called "Apache",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7701] trunk/foray/resource/fo-examples/advanced/cid-fonts.pdf

[<vic...@us...>]

Revision: 7701
Author:   victormote
Date:     2006-06-17 15:19:08 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7701&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/resource/fo-examples/advanced/cid-fonts.pdf
Modified: trunk/foray/resource/fo-examples/advanced/cid-fonts.pdf
===================================================================
--- trunk/foray/resource/fo-examples/advanced/cid-fonts.pdf	2006-06-17 22:14:48 UTC (rev 7700)
+++ trunk/foray/resource/fo-examples/advanced/cid-fonts.pdf	2006-06-17 22:19:08 UTC (rev 7701)
@@ -17,9 +17,9 @@
 /Producer (null) >>
 endobj
 4 0 obj
-<< 
-/Font << /F3 51 0 R /F1 52 0 R /F9 53 0 R /F15 57 0 R /F5 59 0 R /F11 60 0 R >> 
-/ProcSet [ /PDF /ImageC /Text ] >> 
+<<
+/Font << /F3 51 0 R /F1 52 0 R /F9 53 0 R /F15 57 0 R /F5 59 0 R /F11 60 0 R >>
+/ProcSet [ /PDF /ImageC /Text ] >>
 endobj
 5 0 obj
 << /Length 2691 /Filter [ /ASCII85Decode /FlateDecode ]
@@ -402,7 +402,7 @@
 54 0 obj
 << /Type /FontDescriptor
 /FontName /1E1e3eMSGothic
-/FontBBox  [0 -136 996 859] 
+/FontBBox  [0 -136 996 859]
 /Flags 33
 /CapHeight 0
 /Ascent 859
@@ -465,12 +465,12 @@
 endobj
 58 0 obj
 << /Type /Font
-/BaseFont /1E1e3eMSGothic 
+/BaseFont /1E1e3eMSGothic
 /Subtype /CIDFontType2
 /CIDSystemInfo << /Registry (Adobe)/Ordering (UCS)/Supplement 0 >>
 /FontDescriptor 54 0 R
 /DW 0
-/W [ 0 [1000 0 500 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 ] ] 
+/W [ 0 [1000 0 500 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 ] ]
 >>
 endobj
 59 0 obj
@@ -489,67 +489,67 @@
 endobj
 xref
 0 61
-0000000000 65535 f 
-0000000015 00000 n 
-0000000107 00000 n 
-0000000178 00000 n 
-0000000228 00000 n 
-0000000364 00000 n 
-0000003147 00000 n 
-0000003253 00000 n 
-0000005777 00000 n 
-0000005897 00000 n 
-0000005972 00000 n 
-0000006109 00000 n 
-0000006173 00000 n 
-0000006310 00000 n 
-0000006447 00000 n 
-0000006584 00000 n 
-0000006721 00000 n 
-0000006924 00000 n 
-0000007127 00000 n 
-0000007327 00000 n 
-0000007757 00000 n 
-0000007865 00000 n 
-0000007916 00000 n 
-0000007980 00000 n 
-0000008073 00000 n 
-0000008137 00000 n 
-0000008295 00000 n 
-0000008359 00000 n 
-0000008463 00000 n 
-0000008566 00000 n 
-0000008630 00000 n 
-0000008790 00000 n 
-0000008854 00000 n 
-0000008958 00000 n 
-0000009021 00000 n 
-0000009129 00000 n 
-0000009193 00000 n 
-0000009296 00000 n 
-0000009360 00000 n 
-0000009474 00000 n 
-0000009538 00000 n 
-0000009692 00000 n 
-0000009756 00000 n 
-0000009845 00000 n 
-0000009909 00000 n 
-0000010020 00000 n 
-0000010084 00000 n 
-0000010189 00000 n 
-0000010253 00000 n 
-0000010353 00000 n 
-0000010417 00000 n 
-0000010508 00000 n 
-0000010621 00000 n 
-0000010729 00000 n 
-0000010835 00000 n 
-0000011045 00000 n 
-0000021391 00000 n 
-0000022015 00000 n 
-0000022148 00000 n 
-0000022541 00000 n 
-0000022651 00000 n 
+0000000000 65535 f-
+0000000015 00000 n-
+0000000107 00000 n-
+0000000178 00000 n-
+0000000228 00000 n-
+0000000364 00000 n-
+0000003147 00000 n-
+0000003253 00000 n-
+0000005777 00000 n-
+0000005897 00000 n-
+0000005972 00000 n-
+0000006109 00000 n-
+0000006173 00000 n-
+0000006310 00000 n-
+0000006447 00000 n-
+0000006584 00000 n-
+0000006721 00000 n-
+0000006924 00000 n-
+0000007127 00000 n-
+0000007327 00000 n-
+0000007757 00000 n-
+0000007865 00000 n-
+0000007916 00000 n-
+0000007980 00000 n-
+0000008073 00000 n-
+0000008137 00000 n-
+0000008295 00000 n-
+0000008359 00000 n-
+0000008463 00000 n-
+0000008566 00000 n-
+0000008630 00000 n-
+0000008790 00000 n-
+0000008854 00000 n-
+0000008958 00000 n-
+0000009021 00000 n-
+0000009129 00000 n-
+0000009193 00000 n-
+0000009296 00000 n-
+0000009360 00000 n-
+0000009474 00000 n-
+0000009538 00000 n-
+0000009692 00000 n-
+0000009756 00000 n-
+0000009845 00000 n-
+0000009909 00000 n-
+0000010020 00000 n-
+0000010084 00000 n-
+0000010189 00000 n-
+0000010253 00000 n-
+0000010353 00000 n-
+0000010417 00000 n-
+0000010508 00000 n-
+0000010621 00000 n-
+0000010729 00000 n-
+0000010835 00000 n-
+0000011045 00000 n-
+0000021391 00000 n-
+0000022015 00000 n-
+0000022148 00000 n-
+0000022541 00000 n-
+0000022651 00000 n-
 trailer
 <<
 /Size 61


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7700] trunk/foray/resource/test/errors

[<vic...@us...>]

Revision: 7700
Author:   victormote
Date:     2006-06-17 15:14:48 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7700&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/resource/test/errors/unknown.fo
    trunk/foray/resource/test/xml/bugtests/external-graphic.fo
    trunk/foray/resource/test/xml/bugtests/font-family.fo
    trunk/foray/resource/test/xml/bugtests/font-size.fo
    trunk/foray/resource/test/xml/bugtests/image.fo
    trunk/foray/resource/test/xml/bugtests/list-mountjoy.fo
    trunk/foray/resource/test/xml/bugtests/list-nested-breaks.fo
    trunk/foray/resource/test/xml/bugtests/list-nested.fo
    trunk/foray/resource/test/xml/bugtests/simple-link.fo
    trunk/foray/resource/test/xml/bugtests/wrap.fo
Modified: trunk/foray/resource/test/errors/unknown.fo
===================================================================
--- trunk/foray/resource/test/errors/unknown.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/errors/unknown.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -29,7 +29,7 @@
 <a>
 </a>
 </fake>
-</fo:instream-foreign-object>    
+</fo:instream-foreign-object>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>

Modified: trunk/foray/resource/test/xml/bugtests/external-graphic.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/external-graphic.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/external-graphic.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -2,11 +2,11 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
     <fo:layout-master-set>
         <fo:simple-page-master master-name="simplePM"
-                      page-height="25cm" 
+                      page-height="25cm"
                       page-width="20cm"
-                      margin-top="1cm" 
-                      margin-bottom="1cm" 
-                      margin-left="1.5cm" 
+                      margin-top="1cm"
+                      margin-bottom="1cm"
+                      margin-left="1.5cm"
                       margin-right="1.5cm">
           <fo:region-body/>
         </fo:simple-page-master>

Modified: trunk/foray/resource/test/xml/bugtests/font-family.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/font-family.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/font-family.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -2,11 +2,11 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
     <fo:layout-master-set>
         <fo:simple-page-master master-name="simplePM"
-                      page-height="25cm" 
+                      page-height="25cm"
                       page-width="20cm"
-                      margin-top="1cm" 
-                      margin-bottom="1cm" 
-                      margin-left="1.5cm" 
+                      margin-top="1cm"
+                      margin-bottom="1cm"
+                      margin-left="1.5cm"
                       margin-right="1.5cm">
           <fo:region-before extent="2.5cm"/>
           <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
@@ -70,7 +70,7 @@
             <fo:block text-align="center" font-family="ZapfDingbats">
                 This is a simple fo text in ZapfDingBats font.
             </fo:block>
-            
+
         </fo:flow>
     </fo:page-sequence>
 </fo:root>

Modified: trunk/foray/resource/test/xml/bugtests/font-size.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/font-size.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/font-size.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -2,11 +2,11 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
     <fo:layout-master-set>
         <fo:simple-page-master master-name="simplePM"
-                      page-height="25cm" 
+                      page-height="25cm"
                       page-width="20cm"
-                      margin-top="1cm" 
-                      margin-bottom="1cm" 
-                      margin-left="1.5cm" 
+                      margin-top="1cm"
+                      margin-bottom="1cm"
+                      margin-left="1.5cm"
                       margin-right="1.5cm">
           <fo:region-before extent="2.5cm"/>
           <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
@@ -47,7 +47,7 @@
             <fo:block font-family="Courier" font-size="32pt">
                 This is a simple fo text in 32pt font.
             </fo:block>
-            
+
         </fo:flow>
     </fo:page-sequence>
 </fo:root>

Modified: trunk/foray/resource/test/xml/bugtests/image.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/image.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/image.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -2,11 +2,11 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
     <fo:layout-master-set>
         <fo:simple-page-master master-name="simplePM"
-                      page-height="25cm" 
+                      page-height="25cm"
                       page-width="10cm"
-                      margin-top="3cm" 
-                      margin-bottom="2cm" 
-                      margin-left="3cm" 
+                      margin-top="3cm"
+                      margin-bottom="2cm"
+                      margin-left="3cm"
                       margin-right="2cm">
           <fo:region-body/>
         </fo:simple-page-master>
@@ -27,10 +27,10 @@
                 <fo:external-graphic height="3in" src="file:../graphics/page.gif"/>
                 height="3in"
             </fo:block>
-            
+
             <fo:block>
                 <fo:external-graphic width="1.5in" src="file:../graphics/page.gif"/>
-                width="1.5in" 
+                width="1.5in"
             </fo:block>
 
             <fo:block>

Modified: trunk/foray/resource/test/xml/bugtests/list-mountjoy.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/list-mountjoy.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/list-mountjoy.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -3,11 +3,11 @@
 
   <!-- defines the layout master -->
   <fo:layout-master-set>
-    <fo:simple-page-master master-name="first" 
-                           page-height="29.7cm" page-width="21cm" 
-                           margin-top="1cm" 
-                           margin-bottom="2cm" 
-                           margin-left="2.5cm" 
+    <fo:simple-page-master master-name="first"
+                           page-height="29.7cm" page-width="21cm"
+                           margin-top="1cm"
+                           margin-bottom="2cm"
+                           margin-left="2.5cm"
                            margin-right="2.5cm">
     <fo:region-body margin-top="3cm"/>
      <fo:region-before extent="3cm"/>
@@ -28,38 +28,38 @@
   <fo:flow flow-name="xsl-region-body">
 
       <!-- title -->
-      <fo:block font-size="14pt" 
-                font-family="sans-serif" 
-                line-height="18pt" 
-                space-before.optimum="3pt" 
-                space-after.optimum="3pt" 
-                font-weight="bold" 
+      <fo:block font-size="14pt"
+                font-family="sans-serif"
+                line-height="18pt"
+                space-before.optimum="3pt"
+                space-after.optimum="3pt"
+                font-weight="bold"
                 start-indent="15pt">
           Validity Constraint: Standalone Document Declaration
       </fo:block>
 
       <!-- normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
-                line-height="15pt" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                line-height="15pt"
                 space-after.optimum="3pt" >
-          The standalone document declaration must have the value "no" if 
+          The standalone document declaration must have the value "no" if
           any external markup declarations contain declarations of:
       </fo:block>
 
       <!-- list -->
       <fo:list-block>
-        
+
         <!-- list item -->
         <fo:list-item>
           <!-- insert a bullet -->
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or 
+              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -70,10 +70,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or 
+              entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -84,7 +84,7 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
               attributes with values subject to normalization, where the attribute appears in the document with a value which will
@@ -98,10 +98,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              change as a result of normalization, or 
+              change as a result of normalization, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -112,12 +112,12 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
 
               element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfsssssssssssssss thin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssss
-              element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. sfg sfd gdg d d 
+              element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. sfg sfd gdg d d
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -126,20 +126,20 @@
 
 
  <fo:list-item>
-  <fo:list-item-label end-indent="label-end()"> <fo:block/></fo:list-item-label>  
+  <fo:list-item-label end-indent="label-end()"> <fo:block/></fo:list-item-label>
    <fo:list-item-body start-indent="body-start()">
    <fo:list-block>
-        
+
          <!-- list item -->
         <fo:list-item>
           <!-- insert a bullet -->
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or 
+              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -149,10 +149,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or 
+              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -162,10 +162,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or 
+              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -175,10 +175,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or 
+              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -193,10 +193,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. 
+              element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types.
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -206,10 +206,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. 
+              element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types.
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -219,10 +219,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. 
+              element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types.
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -233,7 +233,7 @@
 
 
 
-    
+
       </fo:list-block>
 
 

Modified: trunk/foray/resource/test/xml/bugtests/list-nested-breaks.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/list-nested-breaks.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/list-nested-breaks.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -3,11 +3,11 @@
 
   <!-- defines the layout master -->
   <fo:layout-master-set>
-    <fo:simple-page-master master-name="first" 
-                           page-height="29.7cm" page-width="21cm" 
-                           margin-top="1cm" 
-                           margin-bottom="2cm" 
-                           margin-left="2.5cm" 
+    <fo:simple-page-master master-name="first"
+                           page-height="29.7cm" page-width="21cm"
+                           margin-top="1cm"
+                           margin-bottom="2cm"
+                           margin-left="2.5cm"
                            margin-right="2.5cm">
       <fo:region-body margin-top="3cm"/>
       <fo:region-before extent="3cm"/>
@@ -28,38 +28,38 @@
   <fo:flow flow-name="xsl-region-body">
 
       <!-- title -->
-      <fo:block font-size="14pt" 
-                font-family="sans-serif" 
-                line-height="18pt" 
-                space-before.optimum="3pt" 
-                space-after.optimum="3pt" 
-                font-weight="bold" 
+      <fo:block font-size="14pt"
+                font-family="sans-serif"
+                line-height="18pt"
+                space-before.optimum="3pt"
+                space-after.optimum="3pt"
+                font-weight="bold"
                 start-indent="15pt">
           Validity Constraint: Standalone Document Declaration
       </fo:block>
 
       <!-- normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
-                line-height="15pt" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                line-height="15pt"
                 space-after.optimum="3pt" >
-          The standalone document declaration must have the value "no" if 
+          The standalone document declaration must have the value "no" if
           any external markup declarations contain declarations of:
       </fo:block>
 
       <!-- list -->
       <fo:list-block>
-        
+
         <!-- list item -->
         <fo:list-item>
           <!-- insert a bullet -->
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or 
+              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -70,10 +70,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or 
+              entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -84,7 +84,7 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
               attributes with values subject to normalization, where the attribute appears in the document with a value which will
@@ -98,10 +98,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              change as a result of normalization, or 
+              change as a result of normalization, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -112,10 +112,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              element types with element content, if white space occurs directly within any instance of those types. 
+              element types with element content, if white space occurs directly within any instance of those types.
                <fo:list-block>
                  <fo:list-item>
                    <fo:list-item-label end-indent="label-end()">

Modified: trunk/foray/resource/test/xml/bugtests/list-nested.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/list-nested.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/list-nested.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -3,11 +3,11 @@
 
   <!-- defines the layout master -->
   <fo:layout-master-set>
-    <fo:simple-page-master master-name="first" 
-                           page-height="29.7cm" page-width="21cm" 
-                           margin-top="1cm" 
-                           margin-bottom="2cm" 
-                           margin-left="2.5cm" 
+    <fo:simple-page-master master-name="first"
+                           page-height="29.7cm" page-width="21cm"
+                           margin-top="1cm"
+                           margin-bottom="2cm"
+                           margin-left="2.5cm"
                            margin-right="2.5cm">
       <fo:region-body margin-top="3cm"/>
       <fo:region-before extent="3cm"/>
@@ -28,38 +28,38 @@
   <fo:flow flow-name="xsl-region-body">
 
       <!-- title -->
-      <fo:block font-size="14pt" 
-                font-family="sans-serif" 
-                line-height="18pt" 
-                space-before.optimum="3pt" 
-                space-after.optimum="3pt" 
-                font-weight="bold" 
+      <fo:block font-size="14pt"
+                font-family="sans-serif"
+                line-height="18pt"
+                space-before.optimum="3pt"
+                space-after.optimum="3pt"
+                font-weight="bold"
                 start-indent="15pt">
           Validity Constraint: Standalone Document Declaration
       </fo:block>
 
       <!-- normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
-                line-height="15pt" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
+                line-height="15pt"
                 space-after.optimum="3pt" >
-          The standalone document declaration must have the value "no" if 
+          The standalone document declaration must have the value "no" if
           any external markup declarations contain declarations of:
       </fo:block>
 
       <!-- list -->
       <fo:list-block>
-        
+
         <!-- list item -->
         <fo:list-item>
           <!-- insert a bullet -->
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or 
+              attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -70,10 +70,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or 
+              entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -84,7 +84,7 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
               attributes with values subject to normalization, where the attribute appears in the document with a value which will
@@ -98,10 +98,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              change as a result of normalization, or 
+              change as a result of normalization, or
             </fo:block>
           </fo:list-item-body>
         </fo:list-item>
@@ -112,10 +112,10 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#183;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
-              element types with element content, if white space occurs directly within any instance of those types. 
+              element types with element content, if white space occurs directly within any instance of those types.
                <fo:list-block>
                  <fo:list-item>
                    <fo:list-item-label end-indent="label-end()">

Modified: trunk/foray/resource/test/xml/bugtests/simple-link.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/simple-link.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/simple-link.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -2,11 +2,11 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
     <fo:layout-master-set>
         <fo:simple-page-master master-name="simplePM"
-                      page-height="25cm" 
+                      page-height="25cm"
                       page-width="20cm"
-                      margin-top="1cm" 
-                      margin-bottom="1cm" 
-                      margin-left="1.5cm" 
+                      margin-top="1cm"
+                      margin-bottom="1cm"
+                      margin-left="1.5cm"
                       margin-right="1.5cm">
           <fo:region-before extent="2.5cm"/>
           <fo:region-body margin-top="3cm" margin-bottom="3cm"/>

Modified: trunk/foray/resource/test/xml/bugtests/wrap.fo
===================================================================
--- trunk/foray/resource/test/xml/bugtests/wrap.fo	2006-06-17 22:08:55 UTC (rev 7699)
+++ trunk/foray/resource/test/xml/bugtests/wrap.fo	2006-06-17 22:14:48 UTC (rev 7700)
@@ -2,11 +2,11 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
     <fo:layout-master-set>
         <fo:simple-page-master master-name="simplePM"
-                      page-height="25cm" 
+                      page-height="25cm"
                       page-width="20cm"
-                      margin-top="1cm" 
-                      margin-bottom="1cm" 
-                      margin-left="1.5cm" 
+                      margin-top="1cm"
+                      margin-bottom="1cm"
+                      margin-left="1.5cm"
                       margin-right="1.5cm">
           <fo:region-before extent="2.5cm"/>
           <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
@@ -36,7 +36,7 @@
                 <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline>
                 <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline>
                 <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline>
-                
+
                 <fo:block space-before.optimum="1cm" wrap-option="wrap">
                     <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline>
                     <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7699] trunk/foray/resource/fo-examples/svg

[<vic...@us...>]

Revision: 7699
Author:   victormote
Date:     2006-06-17 15:08:55 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7699&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/resource/fo-examples/basic/bgimage.fo
    trunk/foray/resource/fo-examples/basic/border.fo
    trunk/foray/resource/fo-examples/basic/bordershorthand.fo
    trunk/foray/resource/fo-examples/basic/character.fo
    trunk/foray/resource/fo-examples/basic/corresprop.fo
    trunk/foray/resource/fo-examples/basic/extensive.fo
    trunk/foray/resource/fo-examples/basic/hyphen.fo
    trunk/foray/resource/fo-examples/basic/inhprop.fo
    trunk/foray/resource/fo-examples/basic/inline.fo
    trunk/foray/resource/fo-examples/basic/list.fo
    trunk/foray/resource/fo-examples/basic/normalex.fo
    trunk/foray/resource/fo-examples/basic/simple.fo
    trunk/foray/resource/fo-examples/basic/tableunits.fo
    trunk/foray/resource/fo-examples/basic/textdeko.fo
    trunk/foray/resource/fo-examples/footnotes/columns.fo
    trunk/foray/resource/fo-examples/keeps-and-breaks/columnlevel1.fo
    trunk/foray/resource/fo-examples/keeps-and-breaks/pagelevel1.fo
    trunk/foray/resource/fo-examples/keeps-and-breaks/pagelevel2.fo
    trunk/foray/resource/fo-examples/keeps-and-breaks/pagelevel3.fo
    trunk/foray/resource/fo-examples/keeps-and-breaks/pagelevel4.fo
    trunk/foray/resource/fo-examples/markers/glossary.xsl
    trunk/foray/resource/fo-examples/pagination/basic1.fo
    trunk/foray/resource/fo-examples/pagination/basic2.fo
    trunk/foray/resource/fo-examples/pagination/franklin_2pageseqs.fo
    trunk/foray/resource/fo-examples/pagination/franklin_alt.fo
    trunk/foray/resource/fo-examples/region-body/simplecol.fo
    trunk/foray/resource/fo-examples/region-body/simplecol2.fo
    trunk/foray/resource/fo-examples/region-body/simplecol3.fo
    trunk/foray/resource/fo-examples/region-body/simplecol4.fo
    trunk/foray/resource/fo-examples/svg/embedding.fo
    trunk/foray/resource/fo-examples/tables/background.fo
    trunk/foray/resource/fo-examples/tables/borders.fo
    trunk/foray/resource/fo-examples/tables/break.fo
    trunk/foray/resource/fo-examples/tables/keep.fo
    trunk/foray/resource/fo-examples/tables/omit.fo
    trunk/foray/resource/fo-examples/tables/space.fo
    trunk/foray/resource/fo-examples/tables/widowsorphans.fo
Modified: trunk/foray/resource/fo-examples/basic/bgimage.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/bgimage.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/bgimage.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -39,8 +39,8 @@
 </fo:page-sequence>
 
 </fo:root>
-	  
 
 
 
 
+

Modified: trunk/foray/resource/fo-examples/basic/border.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/border.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/border.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -10,7 +10,7 @@
             page-width="21cm" page-height="29.7cm" master-name="rest">
             <fo:region-body></fo:region-body>
         </fo:simple-page-master>
-        
+
         <fo:page-sequence-master master-name="psmA">
             <fo:repeatable-page-master-alternatives>
                 <fo:conditional-page-master-reference master-reference="first"
@@ -35,7 +35,7 @@
                     Newburyport, MA 01950
                 </fo:block>
                 <fo:block text-align="start" line-height="18pt" font-family="sans-serif" font-weight="bold" font-size="14pt">
-                    978-462-1152    
+                    978-462-1152
                 </fo:block>
             </fo:block-container>
             <fo:block-container height="1cm" width="6cm" top="0cm" left="14cm" position="absolute">
@@ -43,7 +43,7 @@
                    Sales Receipt
                 </fo:block>
             </fo:block-container>
-            
+
             <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="2.49cm" top="1.2cm" left="13.8cm" padding=".6mm" position="absolute">
                 <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt">
                    DATE
@@ -64,7 +64,7 @@
                     1
                 </fo:block>
             </fo:block-container>
-            
+
             <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="8.95cm" top="3cm" left="0cm" padding=".6mm" position="absolute">
                 <fo:block text-align="start" line-height="14pt" font-family="sans-serif" font-size="12pt">
                     SOLD TO
@@ -84,7 +84,7 @@
                 </fo:block>
             </fo:block-container>
 
-            
+
             <fo:block-container border-color="black" border-style="solid" border-width=".5mm" height="0.5cm" width="3.96cm" top="7.25cm" left="10.74cm" padding="1mm" position="absolute">
                 <fo:block text-align="start" space-after.optimum="3pt" line-height="14pt" font-family="sans-serif" font-size="12pt">
                    PMT METHOD
@@ -105,8 +105,8 @@
                     1234
                 </fo:block>
             </fo:block-container>
-            
-            
+
+
             <fo:block-container height="17cm" width="19cm" top="9.4cm" left="0cm" position="absolute">
                 <fo:table table-layout="fixed" border-collapse="separate" border-color="yellow" border-style="solid" border-width=".6mm" height="17cm">
                     <fo:table-column column-width="2.5cm"/>

Modified: trunk/foray/resource/fo-examples/basic/bordershorthand.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/bordershorthand.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/bordershorthand.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<!-- example for a simple fo file. At the beginning the page layout is set. 
-Below fo:root there is always 
+<!-- example for a simple fo file. At the beginning the page layout is set.
+Below fo:root there is always
 - a single fo:layout-master-set which defines one or more page layouts
 - an optional fo:declarations,
 - and a sequence of one or more fo:page-sequences containing the text and formatting instructions -->
@@ -10,23 +10,23 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <fo:layout-master-set>
-  <!-- fo:layout-master-set defines in its children the page layout: 
+  <!-- fo:layout-master-set defines in its children the page layout:
        the pagination and layout specifications
-       - page-masters: have the role of describing the intended subdivisions 
-                       of a page and the geometry of these subdivisions 
-       - page-sequence-masters: have the role of describing the sequence 
-                                of page-masters that will be used to generate 
-                                pages during the formatting of an fo:page-sequence  
+       - page-masters: have the role of describing the intended subdivisions
+                       of a page and the geometry of these subdivisions
+       - page-sequence-masters: have the role of describing the sequence
+                                of page-masters that will be used to generate
+                                pages during the formatting of an fo:page-sequence
 
   -->
 
     <!-- layout for the first page -->
     <fo:simple-page-master master-name="first"
-                  page-height="29.7cm" 
+                  page-height="29.7cm"
                   page-width="21cm"
-                  margin-top="1cm" 
-                  margin-bottom="2cm" 
-                  margin-left="2.0cm + 0.5cm" 
+                  margin-top="1cm"
+                  margin-bottom="2cm"
+                  margin-left="2.0cm + 0.5cm"
                   margin-right="(5cm * 1cm) div 2cm">
       <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
@@ -37,9 +37,9 @@
     <fo:simple-page-master master-name="rest"
                   page-height="abs(-30cm + .3cm)"
                   page-width="(10cm * 2) + 1cm"
-                  margin-top="round(.5) * 1cm" 
+                  margin-top="round(.5) * 1cm"
                   margin-bottom="round(2.4) * 1cm"
-                  margin-left="2.5 * 1cm" 
+                  margin-left="2.5 * 1cm"
                   margin-right="5.5cm - 3cm">
       <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
@@ -65,20 +65,20 @@
 
     <!-- header -->
     <fo:static-content flow-name="xsl-region-before">
-      <fo:block text-align="end" 
-            font-size="10pt" 
-            font-family="serif" 
+      <fo:block text-align="end"
+            font-size="10pt"
+            font-family="serif"
             line-height="1em + 4pt"
 	>
         Border and Padding Shorthand Tests - p. <fo:page-number/>
       </fo:block>
-    </fo:static-content> 
+    </fo:static-content>
 
     <fo:flow flow-name="xsl-region-body">
 
       <!-- defines text title level 1-->
-      <fo:block font-size="min(18pt,20pt)" 
-            font-family="sans-serif" 
+      <fo:block font-size="min(18pt,20pt)"
+            font-family="sans-serif"
             line-height="max(24pt,18pt)"
             space-after.optimum="5 mod 3 * 7.5pt"
             background-color="rgb(128,128,128)"
@@ -89,8 +89,8 @@
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-after="12pt"
                 text-align="start"
@@ -106,8 +106,8 @@
 padding-left, padding-right, padding-top, and padding-bottom, etc.
 According to the specification, a request for the absolute (top, bottom, left, right) versions of these properties should use the relative ones if they are specified.
 </fo:block>
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-after="12pt"
                 text-align="start"
@@ -123,8 +123,8 @@
 </fo:block>
 
       <!-- Normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-after="3pt"
                 text-align="start"
@@ -143,8 +143,8 @@
 </fo:block>
 
       <!-- Normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-after="3pt"
                 text-align="start"
@@ -158,7 +158,7 @@
                 border-before-width="2pt" border-after-width="2pt"
                 border-before-color="rgb(200,200,200)"
 		border-after-color="rgb(100,100,100)">
-In this example, padding and border properties are specified using 
+In this example, padding and border properties are specified using
 shorthand and writing-mode relative properties:
 padding-before, padding-after, padding-start, and padding-end, etc.
 According to the specification, a request for the absolute (top, bottom, left, right) versions of these properties should use the relative ones if they are specified.

Modified: trunk/foray/resource/fo-examples/basic/character.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/character.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/character.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- example for a simple fo file. At the beginning the page layout is set. 
-  Below fo:root there is always 
+<!-- example for a simple fo file. At the beginning the page layout is set.
+  Below fo:root there is always
 - a single fo:layout-master-set which defines one or more page layouts
-- an optional fo:declarations 
-- and a sequence of one or more fo:page-sequences containing the text and formatting instructions 
+- an optional fo:declarations
+- and a sequence of one or more fo:page-sequences containing the text and formatting instructions
 -->
 
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <fo:layout-master-set>
-  <!-- fo:layout-master-set defines in its children the page layout: 
+  <!-- fo:layout-master-set defines in its children the page layout:
        the pagination and layout specifications
-      - page-masters: have the role of describing the intended subdivisions 
-                       of a page and the geometry of these subdivisions 
-                      In this case there is only a simple-page-master which defines the 
+      - page-masters: have the role of describing the intended subdivisions
+                       of a page and the geometry of these subdivisions
+                      In this case there is only a simple-page-master which defines the
                       layout for all pages of the text
   -->
     <!-- layout information -->
     <fo:simple-page-master master-name="simple"
-                  page-height="29.7cm" 
+                  page-height="29.7cm"
                   page-width="21cm"
-                  margin-top="1cm" 
-                  margin-bottom="2cm" 
-                  margin-left="2.5cm" 
+                  margin-top="1cm"
+                  margin-bottom="2cm"
+                  margin-left="2.5cm"
                   margin-right="2.5cm">
       <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
@@ -35,25 +35,25 @@
 
   <!-- start page-sequence
        here comes the text (contained in flow objects)
-       the page-sequence can contain different fo:flows 
+       the page-sequence can contain different fo:flows
        the attribute value of master-name refers to the page layout
        which is to be used to layout the text contained in this
        page-sequence-->
   <fo:page-sequence master-reference="simple">
 
       <!-- start fo:flow
-           each flow is targeted 
+           each flow is targeted
            at one (and only one) of the following:
            xsl-region-body (usually: normal text)
            xsl-region-before (usually: header)
            xsl-region-after  (usually: footer)
-           xsl-region-start  (usually: left margin) 
+           xsl-region-start  (usually: left margin)
            xsl-region-end    (usually: right margin)
-           ['usually' applies here to languages with left-right and top-down 
+           ['usually' applies here to languages with left-right and top-down
             writing direction like English]
            in this case there is only one target: xsl-region-body
         -->
-    <fo:flow flow-name="xsl-region-body" 
+    <fo:flow flow-name="xsl-region-body"
                 text-align="justify">
 
       <!-- each paragraph is encapsulated in a block element
@@ -62,13 +62,13 @@
 
 
       <!-- this defines normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 >
-1. Why <fo:character character="T" font-size="16pt" color="red"/><fo:character character="E" font-size="16pt" color="blue"/><fo:character character="I" font-size="16pt" color="green"/>? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. <fo:character character="Y"/>ou should use it too. 
-Why T<fo:character character="E"/>I? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. <fo:character character="Y"/>ou should use it too. 
+1. Why <fo:character character="T" font-size="16pt" color="red"/><fo:character character="E" font-size="16pt" color="blue"/><fo:character character="I" font-size="16pt" color="green"/>? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. <fo:character character="Y"/>ou should use it too.
+Why T<fo:character character="E"/>I? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. <fo:character character="Y"/>ou should use it too.
 Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. <fo:character character="Y"/>ou should use it too.
 Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. <fo:character character="Y"/>ou should use it too.
 Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. <fo:character character="Y"/>ou should use it too.
@@ -77,23 +77,23 @@
       </fo:block>
 
       <!-- this defines normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 >
-1. Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too. 
-Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too. 
+1. Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too.
 Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too.
 Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too.
 Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too.
 Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too.
 Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too.
+Why TEI? I know, you know, I know (Paul Grice). Using TEI is quite a challenge. ou should use it too.
       </fo:block>
 
       <!-- this defines normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 >

Modified: trunk/foray/resource/fo-examples/basic/corresprop.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/corresprop.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/corresprop.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<!-- example for a simple fo file. At the beginning the page layout is set. 
-Below fo:root there is always 
+<!-- example for a simple fo file. At the beginning the page layout is set.
+Below fo:root there is always
 - a single fo:layout-master-set which defines one or more page layouts
 - an optional fo:declarations,
 - and a sequence of one or more fo:page-sequences containing the text and formatting instructions -->
@@ -10,23 +10,23 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <fo:layout-master-set>
-  <!-- fo:layout-master-set defines in its children the page layout: 
+  <!-- fo:layout-master-set defines in its children the page layout:
        the pagination and layout specifications
-       - page-masters: have the role of describing the intended subdivisions 
-                       of a page and the geometry of these subdivisions 
-       - page-sequence-masters: have the role of describing the sequence 
-                                of page-masters that will be used to generate 
-                                pages during the formatting of an fo:page-sequence  
+       - page-masters: have the role of describing the intended subdivisions
+                       of a page and the geometry of these subdivisions
+       - page-sequence-masters: have the role of describing the sequence
+                                of page-masters that will be used to generate
+                                pages during the formatting of an fo:page-sequence
 
   -->
 
     <!-- layout for the first page -->
     <fo:simple-page-master master-name="first"
-                  page-height="29.7cm" 
+                  page-height="29.7cm"
                   page-width="21cm"
-                  margin-top="1cm" 
-                  margin-bottom="2cm" 
-                  margin-left="2.0cm + 0.5cm" 
+                  margin-top="1cm"
+                  margin-bottom="2cm"
+                  margin-left="2.0cm + 0.5cm"
                   margin-right="(5cm * 1cm) div 2cm">
       <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
@@ -37,9 +37,9 @@
     <fo:simple-page-master master-name="rest"
                   page-height="abs(-30cm + .3cm)"
                   page-width="(10cm * 2) + 1cm"
-                  margin-top="round(.5) * 1cm" 
+                  margin-top="round(.5) * 1cm"
                   margin-bottom="round(2.4) * 1cm"
-                  margin-left="2.5 * 1cm" 
+                  margin-left="2.5 * 1cm"
                   margin-right="5.5cm - 3cm">
       <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
@@ -65,19 +65,19 @@
 
     <!-- header -->
     <fo:static-content flow-name="xsl-region-before">
-      <fo:block text-align="end" 
-            font-size="10pt" 
-            font-family="serif" 
+      <fo:block text-align="end"
+            font-size="10pt"
+            font-family="serif"
             line-height="1em + 4pt" >
         Corresponding Property Tests - p. <fo:page-number/>
       </fo:block>
-    </fo:static-content> 
+    </fo:static-content>
 
     <fo:flow flow-name="xsl-region-body">
 
       <!-- defines text title level 1-->
-      <fo:block font-size="min(18pt,20pt)" 
-            font-family="sans-serif" 
+      <fo:block font-size="min(18pt,20pt)"
+            font-family="sans-serif"
             line-height="max(24pt,18pt)"
             space-after.optimum="5 mod 3 * 7.5pt"
             background-color="rgb(0,0,255)"
@@ -88,8 +88,8 @@
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-after="12pt"
                 text-align="start"
@@ -106,8 +106,8 @@
 </fo:block>
 
       <!-- Normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-after="3pt"
                 text-align="start"
@@ -122,9 +122,9 @@
 padding-before, padding-after, padding-start, and padding-end, etc.
 According to the specification, a request for the absolute (top, bottom, left, right) versions of these properties should use the relative ones if they are specified.
 </fo:block>
- 
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"
@@ -132,9 +132,9 @@
 		start-indent="1cm">
 	This block has a start-indent of 1cm and no borders or padding. It has
 no margin-left set. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text to fill out the block.
-	</fo:block> 
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+	</fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"
@@ -143,8 +143,8 @@
 	This block has a margin-left of 1cm and no borders or padding. It has
 no start-indent set. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text to fill out the block.
 	</fo:block>
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"
@@ -153,9 +153,9 @@
 		padding-left="4mm" border-left-width="1mm">
 	This block has a start-indent of 1cm, padding-left of 4mm and border-left-width of 1mm. It has
 no margin-left set. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text to fill out the block.
-	</fo:block> 
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+	</fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"
@@ -176,8 +176,8 @@
 	    break-before="page">
         End-indent tests
       </fo:block>
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"
@@ -185,9 +185,9 @@
 		end-indent="1cm">
 	This block has an end-indent of 1cm and no borders or padding. It has
 no margin-right set. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text to fill out the block.
-	</fo:block> 
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+	</fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"
@@ -196,8 +196,8 @@
 	This block has a margin-right of 1cm and no borders or padding. It has
 no end-indent set. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text to fill out the block.
 	</fo:block>
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"
@@ -206,9 +206,9 @@
 		padding-end="4mm" border-end-width="1mm">
 	This block has an end-indent of 1cm, padding-end of 4mm and border-end-width of 1mm. It has
 no margin-right set. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text to fill out the block.
-	</fo:block> 
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+	</fo:block>
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"
@@ -219,8 +219,8 @@
 border-right-width of 1mm. (Margin is outside the border rectangle.) It has
 no end-indent set. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text. Here is some more text to fill out the block. Here is some more text to fill out the block. Here is some more text to fill out the block.
 	</fo:block>
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-before="12pt"
                 space-after="3pt"

Modified: trunk/foray/resource/fo-examples/basic/extensive.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/extensive.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/extensive.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -128,7 +128,7 @@
 <fo:block>This            is            default!</fo:block>
 <fo:block white-space-collapse="false">This            is            false!</fo:block>
 <fo:block white-space-collapse="true">This            is            true!</fo:block>
-<fo:block font-family="monospace" white-space-collapse="false"> 
+<fo:block font-family="monospace" white-space-collapse="false">
 <![CDATA[
 <?xml version="1.0"?>
 <document>

Modified: trunk/foray/resource/fo-examples/basic/hyphen.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/hyphen.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/hyphen.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- example for a simple fo file. At the beginning the page layout is set. 
-  Below fo:root there is always 
+<!-- example for a simple fo file. At the beginning the page layout is set.
+  Below fo:root there is always
 - a single fo:layout-master-set which defines one or more page layouts
-- an optional fo:declarations 
-- and a sequence of one or more fo:page-sequences containing the text and formatting instructions 
+- an optional fo:declarations
+- and a sequence of one or more fo:page-sequences containing the text and formatting instructions
 -->
 
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <fo:layout-master-set>
-  <!-- fo:layout-master-set defines in its children the page layout: 
+  <!-- fo:layout-master-set defines in its children the page layout:
        the pagination and layout specifications
-      - page-masters: have the role of describing the intended subdivisions 
-                       of a page and the geometry of these subdivisions 
-                      In this case there is only a simple-page-master which defines the 
+      - page-masters: have the role of describing the intended subdivisions
+                       of a page and the geometry of these subdivisions
+                      In this case there is only a simple-page-master which defines the
                       layout for all pages of the text
   -->
     <!-- layout information -->
     <fo:simple-page-master master-name="simple"
-                  page-height="29.7cm" 
+                  page-height="29.7cm"
                   page-width="21cm"
-                  margin-top="1cm" 
-                  margin-bottom="2cm" 
-                  margin-left="7cm" 
+                  margin-top="1cm"
+                  margin-bottom="2cm"
+                  margin-left="7cm"
                   margin-right="3cm">
       <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
@@ -35,25 +35,25 @@
 
   <!-- start page-sequence
        here comes the text (contained in flow objects)
-       the page-sequence can contain different fo:flows 
+       the page-sequence can contain different fo:flows
        the attribute value of master-name refers to the page layout
        which is to be used to layout the text contained in this
        page-sequence-->
   <fo:page-sequence master-reference="simple">
 
       <!-- start fo:flow
-           each flow is targeted 
+           each flow is targeted
            at one (and only one) of the following:
            xsl-region-body (usually: normal text)
            xsl-region-before (usually: header)
            xsl-region-after  (usually: footer)
-           xsl-region-start  (usually: left margin) 
+           xsl-region-start  (usually: left margin)
            xsl-region-end    (usually: right margin)
-           ['usually' applies here to languages with left-right and top-down 
+           ['usually' applies here to languages with left-right and top-down
             writing direction like English]
            in this case there is only one target: xsl-region-body
         -->
-    <fo:flow flow-name="xsl-region-body" 
+    <fo:flow flow-name="xsl-region-body"
                 text-align="justify">
 
       <!-- each paragraph is encapsulated in a block element
@@ -61,20 +61,20 @@
            font-family and size, line-heigth etc. -->
 
       <!-- this defines a title -->
-      <fo:block font-size="18pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="18pt"
+            font-family="sans-serif"
             line-height="24pt"
             space-after.optimum="15pt"
             background-color="blue"
             color="white"
             text-align="center"
             padding-top="3pt">
-        Hyphenation tests 
+        Hyphenation tests
       </fo:block>
 
       <!-- this defines a title -->
-      <fo:block font-size="12pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
             line-height="12pt"
             background-color="blue"
             color="white"
@@ -83,8 +83,8 @@
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 text-align="justify"
@@ -101,8 +101,8 @@
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 text-align="justify"
@@ -115,13 +115,13 @@
         This document specifies a syntax created by subsetting an existing, widely used international text processing standard
         (Standard Generalized Markup Language, ISO 8879:1986(E) as amended and corrected) for use on the World Wide Web. It
         is a product of the W3C XML Activity, details of which can be found at the w3c website. A list of current W3C
-        Recommendations and other technical documents can be found there too. 
+        Recommendations and other technical documents can be found there too.
       </fo:block>
 
 
       <!-- this defines a title -->
-      <fo:block font-size="12pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
             line-height="12pt"
             background-color="blue"
             color="white"
@@ -130,8 +130,8 @@
       </fo:block>
 
       <!-- this defines normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 background-color="rgb(173, 216, 230)"
@@ -140,66 +140,66 @@
                 hyphenation-push-character-count="2"
                 hyphenation-remain-character-count="2"                >
         1. Warum TEI?
-        Die Verwendungszeit elektronischer Editionen wird von mehreren 
-        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu 
-        ihrer Darstellung verwendet werden, der etwas längeren der 
-        Betriebssysteme, unter denen die Darstellungsprogramme laufen, 
-        der logischen Einrichtung des Datenträgers, auf dem sich die 
-        Edition befindet, und dessen physischer Dauer. Um die besonders 
-        unangenehme Abhängigkeit elektronischer Texte von bestimmten 
-        Programmen und Betriebssystemen zu vermeiden, haben 
-        Wissenschaftler ein Textauszeichnungssystem für philologische 
-        Belange entwickelt, das nach dem Entwicklerteam "Text Encoding 
-        Initiative" (TEI) genannt wird (1). 
+        Die Verwendungszeit elektronischer Editionen wird von mehreren
+        Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+        ihrer Darstellung verwendet werden, der etwas längeren der
+        Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+        der logischen Einrichtung des Datenträgers, auf dem sich die
+        Edition befindet, und dessen physischer Dauer. Um die besonders
+        unangenehme Abhängigkeit elektronischer Texte von bestimmten
+        Programmen und Betriebssystemen zu vermeiden, haben
+        Wissenschaftler ein Textauszeichnungssystem für philologische
+        Belange entwickelt, das nach dem Entwicklerteam "Text Encoding
+        Initiative" (TEI) genannt wird (1).
       </fo:block>
 
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 background-color="rgb(173, 216, 230)"
                 language="de"
                 hyphenate="true">
-        Das Auszeichnungssystem TEI ist eine Anwendung der Metasprache 
-        zur Beschreibung programmunabhängiger Auszeichnungssysteme SGML 
-        (Standard Generalized Markup Language), so wie auch HTML, mit 
-        dem die meisten Texte des Internets zur Zeit ausgezeichnet 
-        sind, eine Anwendung von SGML ist. Daten, die entsprechend den 
-        TEI-Richtlinien ausgezeichnet worden sind, können also mit 
-        jedem Programm, das SGML-Daten verarbeiten kann, dargestellt, 
+        Das Auszeichnungssystem TEI ist eine Anwendung der Metasprache
+        zur Beschreibung programmunabhängiger Auszeichnungssysteme SGML
+        (Standard Generalized Markup Language), so wie auch HTML, mit
+        dem die meisten Texte des Internets zur Zeit ausgezeichnet
+        sind, eine Anwendung von SGML ist. Daten, die entsprechend den
+        TEI-Richtlinien ausgezeichnet worden sind, können also mit
+        jedem Programm, das SGML-Daten verarbeiten kann, dargestellt,
         umgewandelt oder durchsucht werden. (2)
       </fo:block>
 
       <!-- this defines normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 background-color="rgb(173, 216, 230)"
                 language="de"
                 hyphenate="true">
-                
-        Verwendet wurde für die Auszeichnung 'teilite', das eine 
-        Teilmenge des gesamten Auszeichnungssystems TEI bietet, aber 
-        auf einige der komplexeren Merkmale verzichtet und deshalb auch 
-        eine einfache Konvertierung der Daten zu neueren Metasprachen 
-        für Auszeichnungssysteme wie XML, einer Teilmenge von SGML, 
+
+        Verwendet wurde für die Auszeichnung 'teilite', das eine
+        Teilmenge des gesamten Auszeichnungssystems TEI bietet, aber
+        auf einige der komplexeren Merkmale verzichtet und deshalb auch
+        eine einfache Konvertierung der Daten zu neueren Metasprachen
+        für Auszeichnungssysteme wie XML, einer Teilmenge von SGML,
         ermöglicht.
-        SGML-Programme mit der Leistungsfähigkeit von Folio Views sind 
-        z.Zt. noch relativ teuer, daher wurde für die vorliegende 
-        Edition der Weg gewählt, den Text doppelt auf die CD zu legen: 
-        Einmal für die sofortige Nutzung mit einer komfortablen 
-        Oberfläche und einmal ohne Software in einem Format, das seine 
-        langfristige Verwendbarkeit garantiert. 
+        SGML-Programme mit der Leistungsfähigkeit von Folio Views sind
+        z.Zt. noch relativ teuer, daher wurde für die vorliegende
+        Edition der Weg gewählt, den Text doppelt auf die CD zu legen:
+        Einmal für die sofortige Nutzung mit einer komfortablen
+        Oberfläche und einmal ohne Software in einem Format, das seine
+        langfristige Verwendbarkeit garantiert.
         Das Nachstehende soll einige Hinweise zur Einrichtung der TEI-
-        Dateien geben, um deren weitere Verwendung zu erleichtern. 
+        Dateien geben, um deren weitere Verwendung zu erleichtern.
       </fo:block>
 
 
 
       <!-- Finnish example sent in by Jarno  Elovirta -->
-      <fo:block font-size="12pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
             line-height="12pt"
             background-color="blue"
             color="white"
@@ -249,17 +249,17 @@
           markkaa. Uuden yhdistyneen yrityksen nimenä säilyy Macromedia ja sen johdossa
           jatkaa Macromedian nykyinen toimitusjohtaja Rob Burgess. Yrityksen tuotteisiin
           lukeutuvat mm. Macromedia Dreamweaver, Macromedia Flash, Allaire ColdFusion ja
-          Allaire JRun. Lue juttu.</fo:block> 
+          Allaire JRun. Lue juttu.</fo:block>
         </fo:block>
 
       <!-- Italian example sent in by Stéphane Bline-->
-      <fo:block font-size="12pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
             line-height="12pt"
             background-color="blue"
             color="white"
             text-align="start">
-        Italian 
+        Italian
       </fo:block>
 
         <fo:block background-color="rgb(173, 216, 230)"
@@ -293,12 +293,12 @@
         contratto d'abbonamento a un'applicazione di servizio perfettamente adattata. Le
         società e B scambiano informazioni relative all'utilizzo online di questa
         applicazione, come il costo del servizio, le modalitàdi pagamento e la gestione
-        degli account utente come i profili.</fo:block> </fo:block> 
+        degli account utente come i profili.</fo:block> </fo:block>
 
 
       <!-- this defines a title -->
-      <fo:block font-size="12pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
             line-height="12pt"
             background-color="blue"
             color="white"
@@ -316,7 +316,7 @@
         </fo:block>
 
         <fo:block background-color="rgb(173, 216, 230)"
-                  language="da" 
+                  language="da"
                   hyphenate="true">
         Bekendtgørelsens regler hindrer
         ikke import, salg og anvendelse af produkter, der på tidspunktet for
@@ -326,11 +326,11 @@
         begrænsning af motorbenzins indhold af blyforbindelser og benzen.
         </fo:block>
         <fo:block background-color="rgb(173, 216, 230)"
-                  language="da" 
+                  language="da"
                   hyphenate="true">
         Import og salg af produkter, der
         indeholder kemiske forbindelser af bly, er forbudt fra 1. marts 2001.
-        Uanset forbudet i stk. 
+        Uanset forbudet i stk.
         1 er import og salg af produkter, der indeholder kemiske forbindelser af
         bly, fortsat tilladt for de produktkategorier, som er nævnt i bilag
         1 til denne bekendtgørelse, indtil de i bilaget anførte
@@ -339,8 +339,8 @@
 
 
       <!-- this defines a title -->
-      <fo:block font-size="12pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
             line-height="12pt"
             background-color="blue"
             color="white"
@@ -349,14 +349,14 @@
       </fo:block>
 
       <!-- this defines normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 background-color="rgb(173, 216, 230)"
                 language="no"
                 hyphenate="true">
-       
+
        <fo:block>
 Av forståelige grunner har året 1814 vært av de mest omdiskuterte i norsk historieforskning.
 Med denne bibliografien vil man for første gang få en samlet oversikt over den viktigste
@@ -373,12 +373,12 @@
 Litteraturen om 1814 kan klassifiseres på flere måter. Grovt sett går det et skille mellom
 tre genrer: historiske oversiktsverker, historiske spesialstudier, erindringer og dagbøker
 og kilde- og dokumentutgivelser. Av oversiktsverker peker de store Norgeshistoriene seg ut
-med sin relativt omfattende behandling av 1814: Nevnes kan 
+med sin relativt omfattende behandling av 1814: Nevnes kan
 <fo:inline font-style="italic">Norges historie fremstillet for
-det norske folk</fo:inline>, bd. VI.1 (1913), 
-<fo:inline font-style="italic">Det norske folks liv og historie</fo:inline> bd. VII (1933), 
-<fo:inline font-style="italic">Vårt folks historie</fo:inline> bd. 6 (1964), 
-<fo:inline font-style="italic">Cappelens Norges historie</fo:inline> bd. 9 (1978) og 
+det norske folk</fo:inline>, bd. VI.1 (1913),
+<fo:inline font-style="italic">Det norske folks liv og historie</fo:inline> bd. VII (1933),
+<fo:inline font-style="italic">Vårt folks historie</fo:inline> bd. 6 (1964),
+<fo:inline font-style="italic">Cappelens Norges historie</fo:inline> bd. 9 (1978) og
 <fo:inline font-style="italic">Aschehougs Norgeshistorie</fo:inline> bd. 7 (1996). Disse oversiktene er i vesentlig grad bygd på den omfattende
 spesiallitteraturen i bok- eller artikkelform som har et meget vidt spenn, fra biografier
 over lokale Eidsvollsmenn til krigshistoriske analyser av felttoget. Mye tidligere skjult
@@ -387,7 +387,7 @@
 til å endre forskningsbildet flere ganger.
        </fo:block>
 	<fo:block font-weight="bold">
-1814-1864 
+1814-1864
        </fo:block>
 	<fo:block>
 Det norske samfunnet etter 1814 ble rekonstruert på den nye Grunnlovens grunn, og vernet om
@@ -415,19 +415,19 @@
 	<fo:block>
 Rimeligvis ble da forholdet til Danmark snarere enn forholdet til Sverige ett av de første
 alvorlige stridsspørsmål i perioden. Presten og Eidsvollsmannen Nicolai Wergeland ble
-beryktet for den danskfiendtlige og unionsvennlige posisjon han inntok i boken 
+beryktet for den danskfiendtlige og unionsvennlige posisjon han inntok i boken
 <fo:inline font-style="italic">En sandfærdig Beretning om Danmarks politiske Forbrydelser imod Kongeriget Norge
 </fo:inline> (anonymt, 1816) som
 fulgte nasjonalhistorien helt opp til Kielfreden. Skriftet vakte debatt og kraftige
 reaksjoner ikke minst blant det gamle selvstendighetsparti. Blant annet publiserte Christian
 Magnus Falsen to motskrifter i 1817. Falsen prøvde også å popularisere Grunnlovens innhold
-for den mindre "oplyste" borgerklasse og allmue gjennom skriftet 
+for den mindre "oplyste" borgerklasse og allmue gjennom skriftet
 <fo:inline font-style="italic">Norges Grundlov gjennemgaaet i Spørgs-maal og Svar
 </fo:inline> (1818, forkortet versjon 1825). Men det må kunne påstås
 at den mer detaljerte historien om grunnlovsverkets tilblivelse og første fase lenge ble
 stående i noe av et halvmørke både for det alminnelige folk og for de nye generasjoner, og
 at dette skyldtes den politiske situasjonen. Det var Nicolai Wergeland som leverte selve
-pionerarbeidet blant de personlige kildesamlingene, 
+pionerarbeidet blant de personlige kildesamlingene,
 <fo:inline font-style="italic">Fortrolige Breve til en Ven, Skrevne fra
 Eidsvold i Aaret 1814</fo:inline> (anonymt, 1830). Men det var først da det unionspolitiske klimaet
 mildnet etter 1837 at det ble åpnet for en grundigere historisk analyse av Grunnlovens
@@ -435,8 +435,8 @@
        </fo:block>
       </fo:block>
       <!-- this defines a title -->
-      <fo:block font-size="12pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="12pt"
+            font-family="sans-serif"
             line-height="12pt"
             background-color="blue"
             color="white"
@@ -445,14 +445,14 @@
       </fo:block>
 
       <!-- this defines normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="15pt"
                 space-after.optimum="3pt"
                 background-color="rgb(173, 216, 230)"
                 language="cs"
                 hyphenate="true">
-       
+
        <fo:block font-weight="bold">Úryvek z knihy Alenka v říši divů</fo:block>
        <fo:block>
 Alenka si ani trochu neublížila a v mžiku byla na nohou: pohlédla nad sebe a kolem sebe,

Modified: trunk/foray/resource/fo-examples/basic/inhprop.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/inhprop.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/inhprop.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<!-- example for a simple fo file. At the beginning the page layout is set. 
-Below fo:root there is always 
+<!-- example for a simple fo file. At the beginning the page layout is set.
+Below fo:root there is always
 - a single fo:layout-master-set which defines one or more page layouts
 - an optional fo:declarations,
 - and a sequence of one or more fo:page-sequences containing the text and formatting instructions -->
@@ -10,23 +10,23 @@
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <fo:layout-master-set>
-  <!-- fo:layout-master-set defines in its children the page layout: 
+  <!-- fo:layout-master-set defines in its children the page layout:
        the pagination and layout specifications
-       - page-masters: have the role of describing the intended subdivisions 
-                       of a page and the geometry of these subdivisions 
-       - page-sequence-masters: have the role of describing the sequence 
-                                of page-masters that will be used to generate 
-                                pages during the formatting of an fo:page-sequence  
+       - page-masters: have the role of describing the intended subdivisions
+                       of a page and the geometry of these subdivisions
+       - page-sequence-masters: have the role of describing the sequence
+                                of page-masters that will be used to generate
+                                pages during the formatting of an fo:page-sequence
 
   -->
 
     <!-- layout for the first page -->
     <fo:simple-page-master master-name="first"
-                  page-height="29.7cm" 
+                  page-height="29.7cm"
                   page-width="21cm"
-                  margin-top="1cm" 
-                  margin-bottom="2cm" 
-                  margin-left="2.0cm + 0.5cm" 
+                  margin-top="1cm"
+                  margin-bottom="2cm"
+                  margin-left="2.0cm + 0.5cm"
                   margin-right="(5cm * 1cm) div 2cm">
       <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="3cm"/>
@@ -37,9 +37,9 @@
     <fo:simple-page-master master-name="rest"
                   page-height="abs(-30cm + .3cm)"
                   page-width="(10cm * 2) + 1cm"
-                  margin-top="round(.5) * 1cm" 
+                  margin-top="round(.5) * 1cm"
                   margin-bottom="round(2.4) * 1cm"
-                  margin-left="2.5 * 1cm" 
+                  margin-left="2.5 * 1cm"
                   margin-right="5.5cm - 3cm">
       <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2.5cm"/>
@@ -65,19 +65,19 @@
 
     <!-- header -->
     <fo:static-content flow-name="xsl-region-before">
-      <fo:block text-align="end" 
-            font-size="10pt" 
-            font-family="serif" 
+      <fo:block text-align="end"
+            font-size="10pt"
+            font-family="serif"
             line-height="1em + 4pt" >
         Property Function Tests - p. <fo:page-number/>
       </fo:block>
-    </fo:static-content> 
+    </fo:static-content>
 
     <fo:flow flow-name="xsl-region-body">
 
       <!-- defines text title level 1-->
-      <fo:block font-size="min(18pt,20pt)" 
-            font-family="sans-serif" 
+      <fo:block font-size="min(18pt,20pt)"
+            font-family="sans-serif"
             line-height="max(24pt,18pt)"
             space-after.optimum="5 mod 3 * 7.5pt"
             background-color="rgb(0,0,255)"
@@ -88,8 +88,8 @@
       </fo:block>
 
       <!-- defines text title level 2-->
-      <fo:block font-size="floor(16.3) * 1pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="floor(16.3) * 1pt"
+            font-family="sans-serif"
             line-height="2pt * ceiling(9.3)"
             space-before.optimum="10pt"
             space-after.optimum="10pt"
@@ -97,12 +97,12 @@
 	    keep-with-next.within-page="always"
 	    keep-together.within-page="always"
             padding-top="3pt">
-	Function: object from-parent( <fo:inline font-weight='bold'>NCName</fo:inline>) 
+	Function: object from-parent( <fo:inline font-weight='bold'>NCName</fo:inline>)
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block font-size="12pt" 
-                font-family="sans-serif" 
+      <fo:block font-size="12pt"
+                font-family="sans-serif"
                 line-height="1.25em"
                 space-after="3pt"
 	        keep-together="auto"
@@ -132,7 +132,7 @@
         <fo:block font-size="from-parent(font-size) + 2pt"
 	        space-before="2pt"
 	        space-after="from-parent(space-after)"
-                font-family="sans-serif" 
+                font-family="sans-serif"
 		start-indent="from-parent(start-indent) + 1cm"
 		end-indent="from-parent(end-indent) + 1cm"
                 text-align="end"

Modified: trunk/foray/resource/fo-examples/basic/inline.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/inline.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/inline.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -50,7 +50,7 @@
 			  an fo:inline to create an area on more than one line. The inline lies
 			  between the &gt; and &lt; characters and should have a light-blue
 			  background: &gt;<fo:inline background-color="rgb(173, 216, 230)">This
-			  is the fo:inline content. It should have a light-blue background, and 
+			  is the fo:inline content. It should have a light-blue background, and
 			  is deliberately long enough to span parts of at least two
 			  lines.</fo:inline>&lt; The remaining text demonstrates that other areas
 			  can be created after the inline has been completed.</fo:block>

Modified: trunk/foray/resource/fo-examples/basic/list.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/list.fo	2006-06-17 22:01:23 UTC (rev 7698)
+++ trunk/foray/resource/fo-examples/basic/list.fo	2006-06-17 22:08:55 UTC (rev 7699)
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- example for use of list elements 
-  At the beginning the page layout is set. 
-  Below fo:root there is always 
+<!-- example for use of list elements
+  At the beginning the page layout is set.
+  Below fo:root there is always
 - a single fo:layout-master-set which defines one or more page layouts
-- an optional fo:declarations 
-- and a sequence of one or more fo:page-sequences containing the text and formatting instructions 
+- an optional fo:declarations
+- and a sequence of one or more fo:page-sequences containing the text and formatting instructions
 
 -->
 
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
   <fo:layout-master-set>
-  <!-- fo:layout-master-set defines in its children the page layout: 
+  <!-- fo:layout-master-set defines in its children the page layout:
        the pagination and layout specifications
-      - page-masters: have the role of describing the intended subdivisions 
-                       of a page and the geometry of these subdivisions 
-                      In this case there is only a simple-page-master which defines the 
+      - page-masters: have the role of describing the intended subdivisions
+                       of a page and the geometry of these subdivisions
+                      In this case there is only a simple-page-master which defines the
                       layout for all pages of the text
   -->
     <!-- layout information -->
     <fo:simple-page-master master-name="simple"
-                  page-height="29.7cm" 
+                  page-height="29.7cm"
                   page-width="21cm"
-                  margin-top="2cm" 
-                  margin-bottom="2cm" 
-                  margin-left="2.5cm" 
+                  margin-top="2cm"
+                  margin-bottom="2cm"
+                  margin-left="2.5cm"
                   margin-right="2.5cm">
       <fo:region-body margin-top="2cm" margin-bottom="1.5cm"/>
       <fo:region-before extent="2cm"/>
@@ -37,21 +37,21 @@
 
   <!-- start page-sequence
        here comes the text (contained in flow objects)
-       the page-sequence can contain different fo:flows 
+       the page-sequence can contain different fo:flows
        the attribute value of master-name refers to the page layout
        which is to be used to layout the text contained in this
        page-sequence-->
   <fo:page-sequence master-reference="simple">
 
       <!-- start fo:flow
-           each flow is targeted 
+           each flow is targeted
            at one (and only one) of the following:
            xsl-region-body (usually: normal text)
            xsl-region-before (usually: header)
            xsl-region-after  (usually: footer)
-           xsl-region-start  (usually: left margin) 
+           xsl-region-start  (usually: left margin)
            xsl-region-end    (usually: right margin)
-           ['usually' applies here to languages with left-right and top-down 
+           ['usually' applies here to languages with left-right and top-down
             writing direction like English]
            in this case there is only one target: xsl-region-body
         -->
@@ -62,8 +62,8 @@
            font-family and size, line-heigth etc. -->
 
       <!-- this defines a title level 1-->
-      <fo:block font-size="18pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="18pt"
+            font-family="sans-serif"
             line-height="24pt"
             space-after.optimum="15pt"
             background-color="blue"
@@ -74,8 +74,8 @@
       </fo:block>
 
       <!-- this defines a title level 2-->
-      <fo:block font-size="16pt" 
-            font-family="sans-serif" 
+      <fo:block font-size="16pt"
+            font-family="sans-serif"
             space-after.optimum="15pt"
             text-align="center">
         A simple list with bullets in list-item-label
@@ -84,14 +84,14 @@
 
       <!-- list -->
       <fo:list-block >
-        
+
         <!-- list item -->
         <fo:list-item>
           <!-- insert a bullet -->
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
           </fo:list-item-label>
-          <!-- list text --> 
+          <!-- list text -->
           <fo:list-item-body start-indent="body-start()">
             <fo:block>
               here is text in the list item body
@@ -105,7 +105,7 @@
           <fo:list-item-label end-indent="label-end()">
             <fo:block><fo:inline font-family="Symbol">&#x2022;</fo:inline></fo:block>
           </f...
 
[truncated message content]

[FOray-commit] SF.net SVN: foray: [7698] trunk/foray/foray-text/src/java/org/foray/text

[<vic...@us...>]

Revision: 7698
Author:   victormote
Date:     2006-06-17 15:01:23 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7698&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/foray-text/src/java/org/foray/text/TextServer.java
    trunk/foray/foray-text/src/java/org/foray/text/line/EagerLineBreaker.java
    trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java
    trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
Modified: trunk/foray/foray-text/src/java/org/foray/text/TextServer.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/TextServer.java	2006-06-17 21:57:31 UTC (rev 7697)
+++ trunk/foray/foray-text/src/java/org/foray/text/TextServer.java	2006-06-17 22:01:23 UTC (rev 7698)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.text;
 
 import org.foray.text.line.solitary.SolitaryLineBreaker;

Modified: trunk/foray/foray-text/src/java/org/foray/text/line/EagerLineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/EagerLineBreaker.java	2006-06-17 21:57:31 UTC (rev 7697)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/EagerLineBreaker.java	2006-06-17 22:01:23 UTC (rev 7698)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -101,7 +101,7 @@
     }
 
     /**
-     * Standard processing of non-text items for eager line breaking systems. 
+     * Standard processing of non-text items for eager line breaking systems.
      * @param nonTextItem The non-text item that should be added to the current
      * line.
      * @return 1 if the item was successfully added to the current line, or 0

Modified: trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java	2006-06-17 21:57:31 UTC (rev 7697)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java	2006-06-17 22:01:23 UTC (rev 7698)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2006-06-17 21:57:31 UTC (rev 7697)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2006-06-17 22:01:23 UTC (rev 7698)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -328,7 +328,7 @@
         boolean everythingWritten = endIndex >= lineText.inlineText().length;
         boolean isLastItemOnLine = true;
         if (everythingWritten) {
-            /* If everything was written, this may not be the last item on 
+            /* If everything was written, this may not be the last item on
              * the line, unless this is the last item in the block. */
             if (! lineText.isLastItemInBlock()) {
                 isLastItemOnLine = false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7697] trunk/foray/foray-render/src/java/org/foray/render

[<vic...@us...>]

Revision: 7697
Author:   victormote
Date:     2006-06-17 14:57:31 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7697&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/java/org/foray/render/TempImage.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/IconToolBar.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessageException.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/ProgressListener.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Translator.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.cs
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.de
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.en
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ja
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ru
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.tr
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.cs
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.de
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.en
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.tr
    trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLStream.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/Finalizable.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSStream.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/RunLengthEncodeOutputStream.java
    trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/svg/SVGUtilities.java
    trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/txt/TXTStream.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render;
 
 import org.foray.output.OutputConfig;

Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-render/src/java/org/foray/render/TempImage.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/TempImage.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/TempImage.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt;
 
 import org.foray.output.OutputConfig;

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt;
 
 import org.foray.output.OutputConfig;

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 /*
  * Juergen Verwohlt: Jue...@jc...,

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 import org.apache.commons.logging.Log;

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/IconToolBar.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/IconToolBar.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/IconToolBar.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 /*

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 import java.io.BufferedReader;

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessageException.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessageException.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessageException.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 import java.awt.BorderLayout;

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 /*

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/ProgressListener.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/ProgressListener.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/ProgressListener.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 /*

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 import org.apache.commons.logging.Log;

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Translator.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Translator.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Translator.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 /**

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.awt.viewer;
 
 import org.apache.commons.logging.Log;

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.cs
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.cs	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.cs	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,25 +1,25 @@
 ###############################################################################
 #
 #  This file contains the czech messages.
-#  
+#
 #  NOTICE:  When defining a new message it has to be created in message files for each language.
-#  
 #
 #
-#  
+#
+#
 #  DEFINING A MESSAGE
 #  ==================
-#  
+#
 #  A message has a uinique CHARACTER ID. It is placed on the left hand side of the equation.
 #  For each message there are additional switches:
 #    - iconType (see below)
 #    - buttonType (see below)
 #    - messageText may contain placeholders for parameters.
-  
+
 #  A placeholder pattern is a "&&&" . See Examplemessage "No_Records_found".
-#  
-#  A messsage definition is placed within a single row, its switches are seperated by a colon ":". 
 #
+#  A messsage definition is placed within a single row, its switches are seperated by a colon ":".
+#
 #  Format:
 #  =======
 #  <MESSAGE_ID>=<iconType>:<buttonType>:<message text>
@@ -35,18 +35,18 @@
 #
 #    buttonType:
 #        STYLE_Y      ("yes" Button)
-#        STYLE_Y_N    ("yes" and "no" Buttons) 
-#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)  
+#        STYLE_Y_N    ("yes" and "no" Buttons)
+#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)
 #
 #
 #  Example with a parameter array:
 #  ================================
 #    Message definition:
 #      No_Records_found=WARNING:STYLE_Y:The Table &&& has no records. Expected at least &&&. Continue?
-#    Aufruf: 
+#    Aufruf:
 #      answer = UserMessage.show("No_Records_found", new String[] {"Employee", "" + minNumber}, aShowFrame);
 #      if (answer == UserMessage.NO)
-#        return;   
+#        return;
 #
 #  Example with an Exception:
 #  =============================
@@ -56,10 +56,10 @@
 #    Aufruf:
 #      try {
 #        String str = null;
-#        int index = str.indexOf("abc"); 
+#        int index = str.indexOf("abc");
 #      } catch (Exception ex) {
-#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);  
-#      } 
+#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);
+#      }
 #
 #
 #

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.de
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.de	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.de	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,24 +1,24 @@
 ###############################################################################
 #
-#  In dieser Datei werden im Abschnitt "Messages" Meldungen auf deutsch 
-#  definiert. 
-#  Zu beachten: Beim Definieren einer neuen neuen Meldung, diese soweit möglich 
-#  in allen Sprachen anlegen. 
+#  In dieser Datei werden im Abschnitt "Messages" Meldungen auf deutsch
+#  definiert.
+#  Zu beachten: Beim Definieren einer neuen neuen Meldung, diese soweit möglich
+#  in allen Sprachen anlegen.
 #
 #
 #
 #  MELDUNG DEFINIEREN
 #  ==================
-#  
+#
 #  Eine Meldung hat eine eindeutige textuelle ID. Diese steht links vom Gleichheitszeichen.
 #  Zu jeder Meldung wird angegeben:
 #    - iconType (Typen siehe unten)
 #    - buttonType  (Typen siehe unten)
 #    - Meldungstext mit evtl. Platzhaltern für Parameter.
 #
-#  Ein Parameterplatzhalter ist ein dreifaches kaumänisches "und". Siehe Beispielmeldung 
-#  "No_Records_found". 
-#  
+#  Ein Parameterplatzhalter ist ein dreifaches kaumänisches "und". Siehe Beispielmeldung
+#  "No_Records_found".
+#
 #  Die Angaben erfolgen in einer Zeile, jeweils durch einen Doppelpunkt getrennt.
 #
 #  Format:
@@ -33,18 +33,18 @@
 #
 #    buttonType:
 #        STYLE_Y      ("yes" Button)
-#        STYLE_Y_N    ("yes" and "no" Buttons) 
-#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)  
+#        STYLE_Y_N    ("yes" and "no" Buttons)
+#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)
 #
 #
 #  Beispiel mit einem String-Array:
 #  ================================
 #    Messagedefinition:
 #      No_Records_found=WARNING:STYLE_Y:Die Tabelle &&& enthält keinen Eintrag. Erwartet mind. &&&. Weitermachen?
-#    Aufruf: 
+#    Aufruf:
 #      answer = UserMessage.show("No_Records_found", new String[] {"Mitarbeiter", "" + minNumber}, aShowFrame);
 #      if (answer == UserMessage.NO)
-#        return;   
+#        return;
 #
 #  Beispiel mit einer Exception:
 #  =============================
@@ -54,10 +54,10 @@
 #    Aufruf:
 #      try {
 #        String str = null;
-#        int index = str.indexOf("abc"); 
+#        int index = str.indexOf("abc");
 #      } catch (Exception ex) {
-#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);  
-#      } 
+#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);
+#      }
 #
 #
 #

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.en
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.en	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.en	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,25 +1,25 @@
 ###############################################################################
 #
 #  This file contains the english messages.
-#  
+#
 #  NOTICE:  When defining a new message it has to be created in message files for each language.
-#  
 #
 #
-#  
+#
+#
 #  DEFINING A MESSAGE
 #  ==================
-#  
+#
 #  A message has a uinique CHARACTER ID. It is placed on the left hand side of the equation.
 #  For each message there are additional switches:
 #    - iconType (see below)
 #    - buttonType (see below)
 #    - messageText may contain placeholders for parameters.
-  
+
 #  A placeholder pattern is a "&&&" . See Examplemessage "No_Records_found".
-#  
-#  A messsage definition is placed within a single row, its switches are seperated by a colon ":". 
 #
+#  A messsage definition is placed within a single row, its switches are seperated by a colon ":".
+#
 #  Format:
 #  =======
 #  <MESSAGE_ID>=<iconType>:<buttonType>:<message text>
@@ -35,18 +35,18 @@
 #
 #    buttonType:
 #        STYLE_Y      ("yes" Button)
-#        STYLE_Y_N    ("yes" and "no" Buttons) 
-#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)  
+#        STYLE_Y_N    ("yes" and "no" Buttons)
+#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)
 #
 #
 #  Example with a parameter array:
 #  ================================
 #    Message definition:
 #      No_Records_found=WARNING:STYLE_Y:The Table &&& has no records. Expected at least &&&. Continue?
-#    Aufruf: 
+#    Aufruf:
 #      answer = UserMessage.show("No_Records_found", new String[] {"Employee", "" + minNumber}, aShowFrame);
 #      if (answer == UserMessage.NO)
-#        return;   
+#        return;
 #
 #  Example with an Exception:
 #  =============================
@@ -56,10 +56,10 @@
 #    Aufruf:
 #      try {
 #        String str = null;
-#        int index = str.indexOf("abc"); 
+#        int index = str.indexOf("abc");
 #      } catch (Exception ex) {
-#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);  
-#      } 
+#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);
+#      }
 #
 #
 #

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ja
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ja	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ja	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,25 +1,25 @@
 ###############################################################################
 #
 #  This file contains the Japanese messages.
-#  
+#
 #  NOTICE:  When defining a new message it has to be created in message files for each language.
-#  
 #
 #
-#  
+#
+#
 #  DEFINING A MESSAGE
 #  ==================
-#  
+#
 #  A message has a uinique CHARACTER ID. It is placed on the left hand side of the equation.
 #  For each message there are additional switches:
 #    - iconType (see below)
 #    - buttonType (see below)
 #    - messageText may contain placeholders for parameters.
-  
+
 #  A placeholder pattern is a "&&&" . See Examplemessage "No_Records_found".
-#  
-#  A messsage definition is placed within a single row, its switches are seperated by a colon ":". 
 #
+#  A messsage definition is placed within a single row, its switches are seperated by a colon ":".
+#
 #  Format:
 #  =======
 #  <MESSAGE_ID>=<iconType>:<buttonType>:<message text>
@@ -35,18 +35,18 @@
 #
 #    buttonType:
 #        STYLE_Y      ("yes" Button)
-#        STYLE_Y_N    ("yes" and "no" Buttons) 
-#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)  
+#        STYLE_Y_N    ("yes" and "no" Buttons)
+#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)
 #
 #
 #  Example with a parameter array:
 #  ================================
 #    Message definition:
 #      No_Records_found=WARNING:STYLE_Y:The Table &&& has no records. Expected at least &&&. Continue?
-#    Aufruf: 
+#    Aufruf:
 #      answer = UserMessage.show("No_Records_found", new String[] {"Employee", "" + minNumber}, aShowFrame);
 #      if (answer == UserMessage.NO)
-#        return;   
+#        return;
 #
 #  Example with an Exception:
 #  =============================
@@ -56,10 +56,10 @@
 #    Aufruf:
 #      try {
 #        String str = null;
-#        int index = str.indexOf("abc"); 
+#        int index = str.indexOf("abc");
 #      } catch (Exception ex) {
-#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);  
-#      } 
+#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);
+#      }
 #
 #
 #

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ru
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ru	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.ru	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,25 +1,25 @@
 ###############################################################################
 #
 #  This file contains the russian messages.
-#  
+#
 #  NOTICE:  When defining a new message it has to be created in message files for each language.
-#  
 #
 #
-#  
+#
+#
 #  DEFINING A MESSAGE
 #  ==================
-#  
+#
 #  A message has a uinique CHARACTER ID. It is placed on the left hand side of the equation.
 #  For each message there are additional switches:
 #    - iconType (see below)
 #    - buttonType (see below)
 #    - messageText may contain placeholders for parameters.
-  
+
 #  A placeholder pattern is a "&&&" . See Examplemessage "No_Records_found".
-#  
-#  A messsage definition is placed within a single row, its switches are seperated by a colon ":". 
 #
+#  A messsage definition is placed within a single row, its switches are seperated by a colon ":".
+#
 #  Format:
 #  =======
 #  <MESSAGE_ID>=<iconType>:<buttonType>:<message text>
@@ -35,18 +35,18 @@
 #
 #    buttonType:
 #        STYLE_Y      ("yes" Button)
-#        STYLE_Y_N    ("yes" and "no" Buttons) 
-#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)  
+#        STYLE_Y_N    ("yes" and "no" Buttons)
+#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)
 #
 #
 #  Example with a parameter array:
 #  ================================
 #    Message definition:
 #      No_Records_found=WARNING:STYLE_Y:The Table &&& has no records. Expected at least &&&. Continue?
-#    Aufruf: 
+#    Aufruf:
 #      answer = UserMessage.show("No_Records_found", new String[] {"Employee", "" + minNumber}, aShowFrame);
 #      if (answer == UserMessage.NO)
-#        return;   
+#        return;
 #
 #  Example with an Exception:
 #  =============================
@@ -56,10 +56,10 @@
 #    Aufruf:
 #      try {
 #        String str = null;
-#        int index = str.indexOf("abc"); 
+#        int index = str.indexOf("abc");
 #      } catch (Exception ex) {
-#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);  
-#      } 
+#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);
+#      }
 #
 #
 #

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.tr
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.tr	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/messages.tr	2006-06-17 21:57:31 UTC (rev 7697)
@@ -3,23 +3,23 @@
 #  This file contains the turkish messages.
 #  Togan Muftuoglu <to...@us...> 04/02/2003
 #  NOTICE:  When defining a new message it has to be created in message files for each language.
-#  
 #
 #
-#  
+#
+#
 #  DEFINING A MESSAGE
 #  ==================
-#  
+#
 #  A message has a uinique CHARACTER ID. It is placed on the left hand side of the equation.
 #  For each message there are additional switches:
 #    - iconType (see below)
 #    - buttonType (see below)
 #    - messageText may contain placeholders for parameters.
-  
+
 #  A placeholder pattern is a "&&&" . See Examplemessage "No_Records_found".
-#  
-#  A messsage definition is placed within a single row, its switches are seperated by a colon ":". 
 #
+#  A messsage definition is placed within a single row, its switches are seperated by a colon ":".
+#
 #  Format:
 #  =======
 #  <MESSAGE_ID>=<iconType>:<buttonType>:<message text>
@@ -35,18 +35,18 @@
 #
 #    buttonType:
 #        STYLE_Y      ("yes" Button)
-#        STYLE_Y_N    ("yes" and "no" Buttons) 
-#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)  
+#        STYLE_Y_N    ("yes" and "no" Buttons)
+#        STYLE_Y_N_C  ("yes", "no" and "cancel" Buttons)
 #
 #
 #  Example with a parameter array:
 #  ================================
 #    Message definition:
 #      No_Records_found=WARNING:STYLE_Y:The Table &&& has no records. Expected at least &&&. Continue?
-#    Aufruf: 
+#    Aufruf:
 #      answer = UserMessage.show("No_Records_found", new String[] {"Employee", "" + minNumber}, aShowFrame);
 #      if (answer == UserMessage.NO)
-#        return;   
+#        return;
 #
 #  Example with an Exception:
 #  =============================
@@ -56,10 +56,10 @@
 #    Aufruf:
 #      try {
 #        String str = null;
-#        int index = str.indexOf("abc"); 
+#        int index = str.indexOf("abc");
 #      } catch (Exception ex) {
-#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);  
-#      } 
+#        UserMessage.show("UNEXPECTED_EXCEPTION", ex);
+#      }
 #
 #
 #

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.cs
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.cs	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.cs	2006-06-17 21:57:31 UTC (rev 7697)
@@ -16,7 +16,7 @@
 of=z
 Preview=Náhled
 Init parser=Inicializuji parser
-Init mappings=Inicializuji mapování 
+Init mappings=Inicializuji mapování
 Build FO tree=Vytvářím strom FO
 Layout FO tree=Formátuji strom FO
 Render=Generuji

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.de
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.de	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.de	2006-06-17 21:57:31 UTC (rev 7697)
@@ -15,7 +15,7 @@
 Page=Seite
 of=von
 Init parser=Initializiere Parser
-Init mappings=Initializiere Abbildung 
+Init mappings=Initializiere Abbildung
 Build FO tree=Baue FO-Baum
 Layout FO tree=Formatiere FO-Baum
 Render=Gebe aus

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.en
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.en	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.en	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,4 +1,4 @@
-# Diese Datei ist nur dafür da, daß die Warnung 
+# Diese Datei ist nur dafür da, daß die Warnung
 # "Übersetzungsdatei nicht gefunden" nicht hochkommt.
-# Die Suchschlüssel für die zu übersetzenden Begriffe sind 
+# Die Suchschlüssel für die zu übersetzenden Begriffe sind
 # englisch. Daher wäre eine Übersetzung redundant.

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.tr
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.tr	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/resources/resources.tr	2006-06-17 21:57:31 UTC (rev 7697)
@@ -16,7 +16,7 @@
 of=
 Zoom=Zum (Yakınlaştırmak)
 Init parser=Grammer İnceleyiciyi (Parser)  başlat
-Init mappings=Eşlemeleri Başlat 
+Init mappings=Eşlemeleri Başlat
 Build FO tree=FO ağacını yarat
 Layout FO tree=FO ağacı düzeni
 Render=Çevir

Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -27,7 +27,7 @@
  * Arthur E Welch III (while at M&I EastPoint Technology --
  *     donated by EastPoint March 2, 2001)
  * Mark Lillywhite (mailto:mar...@in...)
- * 
+ *
  */
 
 package org.foray.render.pcl;

Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLStream.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLStream.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLStream.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.pcl;
 
 import java.io.IOException;

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -325,7 +325,7 @@
 
         /* Current font is the primary font & can paint the glyph. No change.
          * This should be the normal case. */
-        if (primaryFont == currentFont 
+        if (primaryFont == currentFont
                 && primaryFont.glyphAvailable(c)) {
                 return currentFont;
         }

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.ps;
 
 import java.io.FilterOutputStream;
@@ -30,7 +30,7 @@
 
 /**
  * This class applies a ASCII85 encoding to the stream.
- * 
+ *
  * TODO: This class needs to be deprecated in favor of
  * org.foray.ps.filter.ASCII85Filter. Make sure any features in this class
  * are merged into that one.

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/Finalizable.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/Finalizable.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/Finalizable.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.ps;
 
 import java.io.IOException;

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.ps;
 
 import java.io.IOException;

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSFont.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.ps;
 
 import org.axsl.fontR.FontUse;

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.ps;
 
 import org.foray.ps.PSColor;

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -26,7 +26,7 @@
  * Known Contributors:
  * Mark Lillywhite, Inomial
  */
- 
+
 package org.foray.render.ps;
 
 import org.foray.output.OutputConfig;
@@ -1083,7 +1083,7 @@
         /* Write proc for including EPS */
         write("%%BeginResource: procset EPSprocs");
         write("%%Title: EPS encapsulation procs");
-        
+
         write("/BeginEPSF { %def");
         write("/b4_Inc_state save def         "
                 + "% Save state for cleanup");
@@ -1109,7 +1109,7 @@
         write("} if");
         write("} if");
         write("} bind def");
-        
+
         write("/EndEPSF { %def");
         write("count op_count sub {pop} repeat            % Clean up stacks");
         write("countdictstack dict_count sub {end} repeat");

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSStream.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSStream.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSStream.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.render.ps;
 
 import java.io.FilterOutputStream;

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/RunLengthEncodeOutputStream.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/RunLengthEncodeOutputStream.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/RunLengthEncodeOutputStream.java	2006-06-17 21:57:31 UTC (rev 7697)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -23,7 +23,7 @@
 /*
 $Id$
 */
- 
+
 package org.foray.render.ps;
 
 import java.io.FilterOutputStream;

Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-06-17 21:57:22 UTC (rev 7696)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SV...
 
[truncated message content]

[FOray-commit] SF.net SVN: foray: [7696] trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo

[<vic...@us...>]

Revision: 7696
Author:   victormote
Date:     2006-06-17 14:57:22 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7696&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoFrame.java
    trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoPanel.java
    trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/Main.java
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoFrame.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoFrame.java	2006-06-17 21:48:54 UTC (rev 7695)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoFrame.java	2006-06-17 21:57:22 UTC (rev 7696)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.java2d.demo;
 
 
@@ -47,12 +47,12 @@
         buildGUI();
         setSize(500, 400);
     }
-    
+
     private void buildGUI() {
         DemoPanel bcpanel = new DemoPanel(this.fileName);
         add("Center", bcpanel);
     }
-    
+
     private class WindowHandler extends WindowAdapter {
         public void windowClosing(WindowEvent we) {
             System.exit(0);

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoPanel.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoPanel.java	2006-06-17 21:48:54 UTC (rev 7695)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoPanel.java	2006-06-17 21:57:22 UTC (rev 7696)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.java2d.demo;
 
 
@@ -79,7 +79,7 @@
                 RenderingHints.VALUE_ANTIALIAS_ON);
         g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
                 RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-        
+
         AffineTransform baktrans = g2d.getTransform();
         g2d.translate(rect.getX(), rect.getY());
         g2d.scale(1, -1);
@@ -102,7 +102,7 @@
         } catch (PSException e) {
             System.out.print(e.getMessage());
         }
-        
+
         g2d.setTransform(baktrans);
     }
 

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/Main.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/Main.java	2006-06-17 21:48:54 UTC (rev 7695)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/Main.java	2006-06-17 21:57:22 UTC (rev 7696)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.java2d.demo;
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7695] trunk/foray/foray-pretty/src/java/org/foray/pretty

[<vic...@us...>]

Revision: 7695
Author:   victormote
Date:     2006-06-17 14:48:54 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7695&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java
    trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
    trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDTokenizer.java
Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java	2006-06-17 21:48:10 UTC (rev 7694)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java	2006-06-17 21:48:54 UTC (rev 7695)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java	2006-06-17 21:48:10 UTC (rev 7694)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java	2006-06-17 21:48:54 UTC (rev 7695)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2006 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDTokenizer.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDTokenizer.java	2006-06-17 21:48:10 UTC (rev 7694)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDTokenizer.java	2006-06-17 21:48:54 UTC (rev 7695)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2006 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7694] trunk/foray/foray-ps/src/java/org/foray/ps

[<vic...@us...>]

Revision: 7694
Author:   victormote
Date:     2006-06-17 14:48:10 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7694&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/foray-ps/src/java/org/foray/ps/PSBoolean.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSColorSpace.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSDictionary.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSFile.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSFileFilter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSFileReal.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSFontID.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSGraphicsState.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSInput.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSInputFile.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSInteger.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSMark.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSName.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSObject.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSReal.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSStackGS.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSStackObject.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSString.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingParser.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListParser.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCIIHexFilter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/DCTFilter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/EncryptFilter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/FlateFilter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/PSFilter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/PSFilterException.java
    trunk/foray/foray-ps/src/java/org/foray/ps/java2d/Java2DSystemDict.java
    trunk/foray/foray-ps/src/java/org/foray/ps/pdf/PDFSystemDict.java
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSBoolean.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSBoolean.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSBoolean.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSColor.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2006 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -79,7 +79,7 @@
                          + PSReal.doubleOut(rgbColors[2])
                          + " rg" + eol);
             }
-        // stroke/border                
+        // stroke/border
         } else {
             if (isGray) {
                 buffer.append(PSReal.doubleOut(rgbColors[0]) + " G" + eol);

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSColorSpace.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSColorSpace.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSColorSpace.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSDictionary.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSDictionary.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSDictionary.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 import java.util.HashMap;

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSException.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSFile.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSFile.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSFile.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 import java.io.IOException;

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSFileFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSFileFilter.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSFileFilter.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 import org.foray.ps.filter.PSFilter;

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSFileReal.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSFileReal.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSFileReal.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 import java.io.File;

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSFontID.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSFontID.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSFontID.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSGraphicsState.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSGraphicsState.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSGraphicsState.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSInput.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSInput.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSInput.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 import java.io.IOException;
@@ -34,7 +34,7 @@
  * be unwrapped (and sometimes decoded) before they can be consumed by the
  * PostScript interpreter. This interface allows other classes to do that work
  * and pass the results through to the interpreter.
- * 
+ *
  * Please note that the implementing class is responsible for any buffering of
  * the data for i/o efficiency purposes.
  */

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSInputFile.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSInputFile.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSInputFile.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 import java.io.File;

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSInteger.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSInteger.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSInteger.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 /**
@@ -200,7 +200,7 @@
             return -1;
         }
         return placeValue;
-    } 
+    }
 
     protected PSObject duplicate() {
         return new PSInteger(interpreter, value);

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004-2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 import org.foray.ps.encode.EncodingVector;
@@ -376,7 +376,7 @@
             int newExecutionStackSize = executionStack.size();
             /*
              * If the execution stack size increased as a result of the
-             * consumeToken(), we need to 
+             * consumeToken(), we need to
              */
             if (newExecutionStackSize > oldExecutionStackSize) {
                 assert newExecutionStackSize == oldExecutionStackSize + 1:
@@ -584,7 +584,7 @@
         boolean doneExecuting = false;
         for (int i = 0; i < dictionaryStack.size() && !doneExecuting; i++) {
             currentDict = (PSDictionary) (dictionaryStack.peek(i));
-            doneExecuting = currentDict.execute(nameObject); 
+            doneExecuting = currentDict.execute(nameObject);
         }
         if (! doneExecuting) {
             logger.error("PostScript name '" + nameObject.value

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSMark.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSMark.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSMark.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSName.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSName.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSName.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSObject.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSObject.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSObject.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSReal.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSReal.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSReal.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004-2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 /**
@@ -130,7 +130,7 @@
     protected PSName getTypeName() {
         return new PSName(interpreter, "realtype", true, false);
     }
-    
+
     public double getValue() {
         return this.value;
     }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSStackGS.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSStackGS.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSStackGS.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSStackObject.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSStackObject.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSStackObject.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSString.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSString.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSString.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004-2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps;
 
 import org.foray.ps.filter.EncryptFilter;
@@ -898,7 +898,7 @@
         if (! (object instanceof PSDictionary)) {
             throw new PSException(interpreter, PSErrorDict.TYPECHECK,
                     PSOperator.OPER_BEGIN);
-        }  
+        }
         interpreter.getDictionaryStack().push(object);
     }
 
@@ -1121,7 +1121,7 @@
                 (charsRead == string.value.length()));
         pushOperand(newBoolean);
     }
-    
+
     protected void roll() throws PSException {
         try {
             int j = ((PSInteger) popOperand(PSOperator.OPER_ROLL)).value;
@@ -1242,7 +1242,7 @@
                     PSOperator.OPER_PUT);
         }
         psinteger = (PSInteger) what;
-        char replacementChar = (char) psinteger.value; 
+        char replacementChar = (char) psinteger.value;
         char[] charArray = new char[string.value.length()];
         string.value.getChars(0, string.value.length(), charArray, 0);
         charArray[index] = replacementChar;
@@ -1418,7 +1418,7 @@
                 PSOperator.OPER_NEG, "only integers and reals supported: "
                 + object);
     }
-    
+
     protected void not() throws PSException {
         PSObject object = popOperand(PSOperator.OPER_NOT);
         if (object instanceof PSBoolean) {

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2006 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.encode;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.encode;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2006 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.encode;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2006 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id: CMap04Entry.java 6871 2006-03-04 12:06:03Z victormote $ */
- 
+
 package org.foray.ps.encode;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -29,7 +29,7 @@
  * character codes to array indexes.
  * Such mapping is usually used for indexes into glyph description arrays in
  * fonts.</p>
- * 
+ *
  * <p>Note that this definition of <em>Encoding </em>is a superset of the
  * PostScript and PDF concept of the same name.
  * That concept is encapsulated in the class {@link EncodingVector}, and is

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingParser.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingParser.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingParser.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.encode;
 
 import org.foray.common.Logging;

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -30,7 +30,7 @@
  * Encoding Vector documented at PDF Reference, 5th Edition, Appendix D.3.
  * It is identical to that documented at PostScript Language Reference,
  * 3rd Edition, Appendix E.12.
- * 
+ *
  * <p>Note that this encoding is not a built-in standard encoding in either
  * PostScript or PDF. However, it is built in to the Symbol font, which is a
  * standard font for both PostScript and PDF. The purpose of this hard-coded

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -46,7 +46,7 @@
  * 2. The name objects created in step 1 are then used as the key into a
  * dictionary (contained in the Font dictionary) whose values contain the
  * PostScript instructions needed to actually paint the glyph.</p>
- * 
+ *
  * <p>Nowhere in the above scheme is Unicode encoding contemplated or supported.
  * Applications that <em>create </em> PostScript output from Unicode input need
  * a way to convert from that Unicode input to the indexes that are expected
@@ -64,7 +64,7 @@
  *   <li>Use an Encoding instance to obtain the index in that Encoding for the
  * glyph name obtained above.</li>
  * </ol>
- * 
+ *
  * <p>However, for efficiency, an Encoding combines the above two steps and
  * provides a direct mapping from a Unicode code point to the encoded index.
  * Two parallel arrays are used to make this process efficient.
@@ -270,7 +270,7 @@
     /**
      * Sorts the codePoints array by its contents, and sorts the parallel
      * codePointIndexes arrays in a parallel manner, keeping its elements
-     * synchronized with those in codePoints. 
+     * synchronized with those in codePoints.
      * @param codePoints The array of Unicode code points to be sorted.
      * @param codePointIndexes The array of encoding indexes that whose elements
      * correspond to elements in codePoints.
@@ -309,7 +309,7 @@
         }
         StringBuffer buffer = new StringBuffer();
         buffer.append("/Differences\n");
-        buffer.append("[ 0 \n");     
+        buffer.append("[ 0 \n");
         buffer.append(indent);
         int lineLength = indent.length();
         for (int i = 0; i < glyphNames.length; i++) {

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -28,7 +28,7 @@
 /**
  * Class containing hard-coded values that represent the ZapfDingbats
  * Encoding Vector documented at PDF Reference, 5th Edition, Appendix D.4.
- * 
+ *
  * <p>Note that this encoding is not a built-in standard encoding in either
  * PostScript or PDF. However, it is built in to the Symbol font, which is a
  * standard font for both PostScript and PDF. The purpose of this hard-coded

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -34,7 +34,7 @@
  * to glyph names. Each set can be though of as a key-value pair, with the keys
  * being in one array and the values being in the other, and the two joined
  * together by a common index. In each set, the "key" array is sorted, which
- * allows an efficient binary search. 
+ * allows an efficient binary search.
  */
 public class GlyphList {
 
@@ -87,7 +87,7 @@
     private short[] glyphNamesForCodePoints = null;
 
     /**
-     * 
+     *
      */
     public GlyphList(String name, String[] sortedGlyphNames,
             char[][] codePointsForGlyphNames, char[] sortedCodePoints,

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListParser.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListParser.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphListParser.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.encode;
 
 import org.foray.common.Logging;
@@ -323,7 +323,7 @@
 
     /**
      * Main method useful for parsing a glyph list file from the command-line
-     * and generating the java code that encapsulates that glyph list. 
+     * and generating the java code that encapsulates that glyph list.
      * @param args Element 0 is the URL of the glyph list to be parsed.
      * Element 1 is the URL of the file to which the java source code should be
      * written.

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCII85Filter.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.filter;
 
 import java.io.ByteArrayOutputStream;

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCIIHexFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCIIHexFilter.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/ASCIIHexFilter.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.filter;
 
 import org.foray.common.StringUtil;
@@ -78,13 +78,13 @@
             return null;
         }
         // Save the leftover byte
-        byte savedLeftoverByte = leftoverByte;        
+        byte savedLeftoverByte = leftoverByte;
         int dataBytes = 0;
         if (leftoverByte > -1) {
             dataBytes++;
         }
         /*
-         * Scan the input, looking for end-of-data character & counting data 
+         * Scan the input, looking for end-of-data character & counting data
          * bytes.
          */
         for (int i = 0; i < input.length && eodLocation < 0; i ++) {

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/CCITTFaxFilter.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.filter;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/DCTFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/DCTFilter.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/DCTFilter.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.filter;
 
 /**

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/EncryptFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/EncryptFilter.java	2006-06-17 21:39:56 UTC (rev 7693)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/EncryptFilter.java	2006-06-17 21:48:10 UTC (rev 7694)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.ps.filter;
 
 import org.foray.common.StringUtil;
@@ -30,13 +30,13 @@
  * Handles the PostScript encryption used in the "eexec" operator, usually used
  * in Type1 fonts to encrypt the actual glyph-drawing data and the /Private
  * dictionary.
- * 
+ *
  * Please note that although this is a true filter, it should not be used
  * directly in PostScript or PDF output. It is used by PostScript interpreters
  * to decode contents processed by the "eexec" operator, and is used by font
  * writing or embedding programs that need to encrypt code to be used by that
  * operator. It is not (to our knowledge) available as a standard filter.
- * 
+ *
  * This filter is designed to allow chunks of data to be encoded or decoded at
  * a time. In other words, the entire set of data does not have to be encoded
  * or decoded as the same time, but can be done in pieces. (This was done to
@@ -49,15 +49,15 @@
  * dependent on keeping track of their state from one chunk to the next.
  * Of course, there is nothing wrong with encoding or decoding your entire
  * input in one chunk, if you wish to do so.
- * 
- * 
+ *
+ *
  * Type1 fonts actually use a double layer of encryption, whereby the glyph
  * definitions are encrypted using this algorithm, then a large chunk of the
  * font file, which includes the glyph definitions, is encrypted again, also
  * using this algorithm (although with different seeding and constants). This
  * situation can be handled by using two instances of this class, one for the
  * inside encryption and one for the outside.
- * 
+ *
  * The definition of the algorithms implemented in this class can be found in
  * Chapter 7 of the Adobe Type 1 Font Format Specification. The PostScript
  * Language Reference Manual (2nd Edition) cites this document as the
@@ -191,7 +191,7 @@
         long temp2 = unsignedCipherText + encryptionKey;
         temp2 *= ENCRYPTION_CONSTANT_1;
         temp2 += ENCRYPTION_CONSTANT_2;
-        temp2 %= 65536; 
+   ...
 
[truncated message content]

[FOray-commit] SF.net SVN: foray: [7693] trunk/foray/foray-pdf/src/java/org/foray/pdf

[<vic...@us...>]

Revision: 7693
Author:   victormote
Date:     2006-06-17 14:39:56 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7693&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAction.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotList.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFArray.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFBorderStyle.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFontDescriptor.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDSystemInfo.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCMap.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCharProcs.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDate.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDestination.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEmbeddedFileStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoTo.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoToRemote.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFICCStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFInfo.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNameTree.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNamedDestination.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutline.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineItem.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineParent.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPages.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFRectangle.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFResources.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFRoot.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFShading.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFToUnicodeCMap.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFUri.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFWArray.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXForm.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXImage.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXObject.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXReference.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFAElementBridge.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFANode.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFDocumentGraphics2D.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFImageElementBridge.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTranscoder.java
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/PDFGraphicsState.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAction.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAction.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAction.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotList.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotList.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotList.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.util.ArrayList;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.awt.geom.Rectangle2D;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFArray.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFArray.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFArray.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.foray.common.StringUtil;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFBorderStyle.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFBorderStyle.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFBorderStyle.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -25,7 +25,7 @@
 /* Known Contributors:
  *      based on work by Takayuki Takeuchi
  */
- 
+
 package org.foray.pdf.object;
 
 import org.axsl.fontR.Font;
@@ -228,7 +228,7 @@
         p.append(" " + start + " " + end + " " + widthArray[start]);
         return end;
     }
-        
+
     /**
      * Find the start of the next run of 3 or more equal values in the array.
      * A run of less than 3 equal values will generally not result in a space

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFontDescriptor.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFontDescriptor.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFontDescriptor.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 // based on work by Takayuki Takeuchi

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDSystemInfo.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDSystemInfo.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDSystemInfo.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 // based on work by Takayuki Takeuchi

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCMap.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCMap.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCMap.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.io.IOException;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCharProcs.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCharProcs.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCharProcs.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.util.HashMap;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.foray.ps.PSColor;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDate.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDate.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDate.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2005 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -31,7 +31,7 @@
  * Represents a Date object in PDF. Date is listed as a PDF Data Type in PDF
  * Reference, 3rd Edition, Table 3.22. The Date data type is discussed at
  * Section 3.8.2.
- * 
+ *
  * <p>Dates are technically PDF strings, probably actually PDF text strings,
  * so it is tempting to make this class a subclass of PDFTextString. However,
  * since the output will always be ASCII characters (as far as we know), there

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDestination.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDestination.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDestination.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -29,7 +29,7 @@
  *      Image support modified from work of BoBoGi
  *      Font support based on work by Takayuki Takeuchi
  */
- 
+
 package org.foray.pdf.object;
 
 import org.foray.pdf.PDFGraphicsState;
@@ -133,7 +133,7 @@
     private ColorSpace colorspace = ColorSpace.getInstance
             (ColorSpace.CS_sRGB);
 
-    
+
     private PDFGraphicsState currentGraphicsState;
 
     /** The counter for Pattern name numbering. */
@@ -417,7 +417,7 @@
         return pdfBytes.length;
     }
 
-    /** 
+    /**
      * Increment the object count and return it.
      */
     public void registerIndirectObject(PDFObject object) {
@@ -436,7 +436,7 @@
         this.indirectObjectsLast.add(object);
     }
 
-    /** 
+    /**
      * Increment the shadingCount and return it.
      * @return The incremented shading count.
      */
@@ -446,7 +446,7 @@
         return ++this.lastShadingAssigned;
     }
 
-    /** 
+    /**
      * Increment the patternCount and return it.
      * @return The incremented pattern count.
      */
@@ -456,7 +456,7 @@
         return ++this.lastPatternAssigned;
     }
 
-    /** 
+    /**
      * Increment the lastFontAssigned and return it.
      * @return The incremented font count.
      */
@@ -466,7 +466,7 @@
         return ++this.lastFontAssigned;
     }
 
-    /** 
+    /**
      * Increment the patternCount and return it.
      * @return The incremented pattern count.
      */

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEmbeddedFileStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEmbeddedFileStream.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEmbeddedFileStream.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.axsl.psR.Encoding;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.axsl.fontR.Font;
@@ -317,7 +317,7 @@
     }
 
     /**
-     * 
+     *
      * @param font The Font whose PDF subtype is needed.
      * @return One of {@link PDFFont#TYPE0}, {@link PDFFont#TYPE1}, or
      * {@link PDFFont#TRUETYPE}.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.axsl.fontR.Font;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.axsl.fontR.FontUse;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.axsl.fontR.FontUse;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.foray.ps.PSReal;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoTo.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoTo.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoTo.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoToRemote.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoToRemote.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoToRemote.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFICCStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFICCStream.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFICCStream.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.awt.color.ICC_ColorSpace;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFInfo.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFInfo.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFInfo.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.util.Date;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.awt.geom.Rectangle2D;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNameTree.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNameTree.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNameTree.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2006 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.util.ArrayList;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNamedDestination.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNamedDestination.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFNamedDestination.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.apache.commons.logging.Log;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutline.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutline.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutline.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 /**

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineItem.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineItem.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineItem.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineParent.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineParent.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutlineParent.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.awt.Color;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.axsl.pdfW.PDFExplicitDestination;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPages.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPages.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPages.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.util.ArrayList;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPathPaint.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import java.awt.color.ColorSpace;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java	2006-06-17 21:33:11 UTC (rev 7692)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java	2006-06-17 21:39:56 UTC (rev 7693)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pdf.object;
 
 import org.foray.ps.PSReal;
@@ -211,15 +211,15 @@
         PDFPattern myPattern;
         double interpolation = 1.000;
         List theFunctions = new ArrayList();
-        
+
         int currentPosition;
         int lastPosition = theColors.size() - 1;
-        
-        
+
+
         // if 5 elements, the penultimate element is 3.
         // do not go beyond that, because you always need
         // to have a next color when creating the function.
-        
+
         for (currentPosition = 0; currentPosition < lastPosition;
         currentPosition++) {    // for every consecutive color pair
             PDFColor currentColor =
@@ -231,22 +231,22 @@
                     != currentColor.getColorSpace().getType()) {
                 currentColor.setColorSpace(theColorSpace);
             }
-            
+
             if (theColorSpace.getType()
                     != nextColor.getColorSpace().getType()) {
                 nextColor.setColorSpace(theColorSpace);
             }
-            
+
             theCzero = colorToDoubleList(currentColor.getColor());
             theCone = colorToDoubleList(nextColor.getColor());
-            
+
             myfunc = new PDFFunction(document, 2, null, null,
         ...
 
[truncated message content]

[FOray-commit] SF.net SVN: foray: [7692] trunk/foray/foray-pioneer/src/java/org/foray/pioneer

[<vic...@us...>]

Revision: 7692
Author:   victormote
Date:     2006-06-17 14:33:11 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7692&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerFactory.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -93,20 +93,20 @@
         if (getProgress() == FONodePL.START) {
             setProgress(0);
         }
-        
+
         // flow is *always* laid out into a BodyAreaContainer
         RegionRABody bac = (RegionRABody)area;
-        
+
         boolean prevChildMustKeepWithNext = false;
         int numChildren = getFO().getChildren().size();
         for (int i = getProgress(); i < numChildren; i++) {
             FObj fo = (FObj) getFO().getChildren().get(i);
-            
+
             if (bac.getWritableMainRA().isBalancingRequired(fo)) {
                 // reset the the just-done span area in preparation
                 // for a backtrack for balancing
                 bac.getWritableMainRA().resetSpanArea();
-                
+
                 rollback(getProgressSnapshot());
                 // one less because of the "continue"
                 i = getProgress() - 1;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -120,7 +120,7 @@
         if (getProgress() == FONodePL.BREAK_AFTER) {
             return Status.OK;
         }
-          
+
         if (getProgress() == FONodePL.START) {
             if (area instanceof NormalBlockArea) {
                 layout.completeCurrentLineInBlock((NormalBlockArea) area);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockContainerPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -50,7 +50,7 @@
         if (getProgress() == FONodePL.START) {
             setProgress(0);
         }
-        
+
         BlockContainerRA blockContainer = area.makeBlockContainerArea(node,
                 retrieveMarker);
 

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/CharacterPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -226,7 +226,7 @@
         lineArea = blockArea.createNextLineArea(false);
         BlockPL blockPL = this.layout.getBlockPL(blockArea);
         blockPL.currentLineArea = lineArea;
-        
+
         if (lineArea == null) {
             return Status.AREA_FULL_SOME;
         }

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjMixedPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FObjPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -56,7 +56,7 @@
             setProgress(0);
         }
         FootnoteRA referenceArea = (FootnoteRA) area;
-        
+
         int numChildren = node.childrenFO().size();
         for (int i = getProgress(); i < numChildren; i++) {
             FONode fo = node.getFONodeChildAt(i);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/LeaderPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -51,14 +51,14 @@
         ListBlockPL listBlockPL = (ListBlockPL) getLayoutProxy(node);
         if (listBlockPL.getProgress() == FONodePL.START) {
             listBlockPL.setProgress(0);
-            
+
             if (area instanceof NormalBlockArea) {
                 layout.completeCurrentLineInBlock((NormalBlockArea) area);
             }
         }
-        
+
         ListBlockArea blockArea = area.makeListBlockArea(node, retrieveMarker);
-        
+
         int numChildren = node.childrenFO().size();
         for (int i = listBlockPL.getProgress(); i < numChildren; i++) {
             ListItem listItem = (ListItem)node.childrenFO().get(i);
@@ -73,9 +73,9 @@
                 return status;
             }
         }
-        
+
         area.incrementProgressionDimension(blockArea.crBPD());
-        
+
         return Status.OK;
     }
 

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemBodyPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -50,18 +50,18 @@
         if (getProgress() == FONodePL.START) {
             setProgress(0);
         }
-        
+
         /*
          * For calculating the lineage - The fo:list-item-body formatting object
          * does not generate any areas. The fo:list-item-body formatting object
          * returns the sequence of areas created by concatenating the sequences
          * of areas returned by each of the children of the fo:list-item-body.
          */
-        
+
         int numChildren = node.childrenFO().size();
         for (int i = getProgress(); i < numChildren; i++) {
             FObj fo = (FObj)node.childrenFO().get(i);
-            
+
             int status = getLayoutProxy(fo).layout(area, retrieveMarker);
             if (Status.isIncomplete((status))) {
                 setProgress(i);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -48,14 +48,14 @@
             throws AreaWException {
         ListItemLabel node = getFO();
         int numChildren = node.childrenFO().size();
-        
+
         if (numChildren != 1) {
             throw new AreaWException("Non-standard restriction: "
                     + "list-item-label must have exactly one block.");
         }
 
         Block block = (Block)node.childrenFO().get(0);
-        
+
         /*
          * For calculating the lineage - The fo:list-item-label formatting
          * object does not generate any areas.
@@ -63,7 +63,7 @@
          * areas created by concatenating the sequences of areas returned by
          * each of the children of the fo:list-item-label.
          */
-        
+
         int status;
         BlockPL blockPL = (BlockPL) getLayoutProxy(block);
         status = blockPL.layout(area, retrieveMarker);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/NoLayoutPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberCitationPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PageNumberPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerFactory.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerFactory.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerFactory.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2006 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pioneer;
 
 import org.axsl.layout.Layout;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pioneer;
 
 import org.foray.layout.LayoutStrategy;
@@ -118,7 +118,7 @@
  * laid out is recorded and control is returned back up the FOTree until the
  * PageSequence is reached.</li>
  * <li>A new page is created.</li>
- * <li>Using the status markers as guides, layout control is returned to the 
+ * <li>Using the status markers as guides, layout control is returned to the
  * place where it previously left off.</li>
  */
 public class PioneerLS extends LayoutStrategy implements ProxyFactory {

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -65,5 +65,5 @@
         }
         return Status.OK;
     }
-    
+
 }

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pioneer;
 
 import org.axsl.foR.fo.TableCell;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -41,10 +41,10 @@
             throws AreaWException {
         StaticContent node = (StaticContent) this.getFONode();
         int numChildren = node.childrenFO().size();
-        
+
         for (int i = 0; i < numChildren; i++) {
             FObj fo = (FObj)node.childrenFO().get(i);
-            
+
             int status = getLayoutProxy(fo).layout(area, retrieveMarker);
             if (Status.isIncomplete((status))) {
                 /* in fact all should be laid out and clip, error etc depending

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation
@@ -21,7 +21,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.foray.pioneer;
 
 import org.axsl.common.Constants;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -117,7 +117,7 @@
         if (getProgress() == FONodePL.BREAK_AFTER) {
             return Status.OK;
         }
-        
+
         if (getProgress() == FONodePL.START) {
             setProgress(0);
             bDone = false;
@@ -126,17 +126,17 @@
         TableRowContainer tableRow = (TableRowContainer) area;
         TableCellArea cellArea = tableRow.makeTableCellArea(node,
                 retrieveMarker);
-        
+
         areaContainer = cellArea;
-        
+
         int numChildren = node.childrenFO().size();
         for (int i = getProgress(); bDone == false && i < numChildren; i++) {
             FObj fo = (FObj)node.childrenFO().get(i);
-            
+
             // Overflows may cause a row to be re-layedout,
             // need to pass already processed content.
             setProgress(i);
-            
+
             int status = getLayoutProxy(fo).layout(cellArea, retrieveMarker);
             if (Status.isIncomplete(status)) {
                 if ((i == 0) && (status == Status.AREA_FULL_NONE)) {
@@ -152,7 +152,7 @@
         if (minCellHeight > cellArea.crBPD()) {
             cellArea.setProgressionDimension(minCellHeight);
         }
-        
+
         return Status.OK;
     }
 

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java	2006-06-17 21:32:52 UTC (rev 7691)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java	2006-06-17 21:33:11 UTC (rev 7692)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7691] trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java

[<vic...@us...>]

Revision: 7691
Author:   victormote
Date:     2006-06-17 14:32:52 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7691&view=rev

Log Message:
-----------
Whitespace changes only.

Modified Paths:
--------------
    trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
===================================================================
--- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java	2006-06-17 21:32:45 UTC (rev 7690)
+++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java	2006-06-17 21:32:52 UTC (rev 7691)
@@ -1,19 +1,19 @@
 /*
  * Copyright 2004 The FOray Project.
  *      http://www.foray.org
- * 
+ *
  * Licensed 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.
- * 
+ *
  * This work is in part derived from the following work(s), used with the
  * permission of the licensor:
  *      Apache FOP, licensed by the Apache Software Foundation


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.