xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r679326 [4/33] - in /xmlgraphics/fop/trunk: examples/embedding/java/embedding/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ examples/embedding/java/embedd...
Date Thu, 24 Jul 2008 09:37:16 GMT
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -133,7 +133,7 @@
         switch (wm) {
             case Constants.EN_LR_TB:
                 return new CTM(CTM_LRTB);
-            case Constants.EN_RL_TB: 
+            case Constants.EN_RL_TB:
                 wmctm = new CTM(CTM_RLTB);
                 wmctm.e = ipd;
                 return wmctm;
@@ -269,7 +269,7 @@
     public AffineTransform toAffineTransform() {
         return new AffineTransform(toArray());
     }
-    
+
     /**
      * Construct a coordinate transformation matrix (CTM).
      * @param absRefOrient absolute reference orientation

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 import java.io.BufferedInputStream;
@@ -52,7 +52,7 @@
 
     /** Base directory to save temporary file in, typically points to the user's temp dir. */
     protected File baseDir;
-    
+
     /**
      * Main Constructor
      * @param userAgent FOUserAgent object for process
@@ -61,14 +61,14 @@
      * @param stream OutputStream
      * @throws FOPException if the renderer cannot be properly initialized
      */
-    public CachedRenderPagesModel (FOUserAgent userAgent, String outputFormat, 
+    public CachedRenderPagesModel (FOUserAgent userAgent, String outputFormat,
             FontInfo fontInfo, OutputStream stream) throws FOPException {
         super(userAgent, outputFormat, fontInfo, stream);
         this.baseDir = new File(System.getProperty("java.io.tmpdir"));
     }
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     protected boolean checkPreparedPages(PageViewport newpage, boolean renderUnresolved) {
         for (Iterator iter = prepared.iterator(); iter.hasNext();) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/DestinationData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/DestinationData.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/DestinationData.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/DestinationData.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,7 +56,7 @@
         this.idRef = idRef;
         this.idRefs = new String[] {idRef};
     }
-    
+
     /**
      * Get the idref for this destination
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 // may combine with before float into a conditional area

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@
  * on a PageViewport level.
  */
 public class IDTracker {
-    
+
     private static Log log = LogFactory.getLog(IDTracker.class);
 
     // HashMap of ID's whose area is located on one or more consecutive
@@ -50,12 +50,12 @@
     private Set unfinishedIDs = new HashSet();
 
     private Set alreadyResolvedIDs = new HashSet();
-    
+
     /**
      * Tie a PageViewport with an ID found on a child area of the PV. Note that
      * an area with a given ID may be on more than one PV, hence an ID may have
      * more than one PV associated with it.
-     * 
+     *
      * @param id the property ID of the area
      * @param pv a page viewport that contains the area with this ID
      */
@@ -78,7 +78,7 @@
                 tryIDResolution(id, pv, pvList);
             }
         } else {
-            /* TODO: The check is a quick-fix to avoid a waste 
+            /* TODO: The check is a quick-fix to avoid a waste
              * when adding inline-ids to the page */
             if (!pvList.contains(pv)) {
                 pvList.add(pv);
@@ -90,7 +90,7 @@
      * This method tie an ID to the areaTreeHandler until this one is ready to
      * be processed. This is used in page-number-citation-last processing so we
      * know when an id can be resolved.
-     * 
+     *
      * @param id the id of the object being processed
      */
     public void signalPendingID(String id) {
@@ -104,7 +104,7 @@
      * Signals that all areas for the formatting object with the given ID have
      * been generated. This is used to determine when page-number-citation-last
      * ref-ids can be resolved.
-     * 
+     *
      * @param id the id of the formatting object which was just finished
      */
     public void signalIDProcessed(String id) {
@@ -128,20 +128,20 @@
             unresolvedIDRefs.remove(id);
         }
     }
-    
+
     /**
      * Check if an ID has already been resolved
-     * 
+     *
      * @param id the id to check
      * @return true if the ID has been resolved
      */
     public boolean alreadyResolvedID(String id) {
         return (alreadyResolvedIDs.contains(id));
     }
-    
+
     /**
      * Tries to resolve all unresolved ID references on the given page.
-     * 
+     *
      * @param id ID to resolve
      * @param pv page viewport whose ID refs to resolve
      * @param pvList of PageViewports
@@ -164,7 +164,7 @@
 
     /**
      * Tries to resolve all unresolved ID references on the given page.
-     * 
+     *
      * @param pv page viewport whose ID refs to resolve
      */
     public void tryIDResolution(PageViewport pv) {
@@ -178,20 +178,20 @@
             }
         }
     }
-    
+
     /**
      * Get the list of page viewports that have an area with a given id.
-     * 
+     *
      * @param id the id to lookup
      * @return the list of PageViewports
      */
     public List getPageViewportsContainingID(String id) {
         return (List) idLocations.get(id);
     }
-    
+
     /**
      * Add an Resolvable object with an unresolved idref
-     * 
+     *
      * @param idref the idref whose target id has not yet been located
      * @param res the Resolvable object needing the idref to be resolved
      */
@@ -203,5 +203,5 @@
         }
         // add Resolvable object to this HashSet
         todo.add(res);
-    }        
+    }
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 import org.apache.fop.area.inline.InlineArea;
@@ -44,7 +44,7 @@
         private int availableShrink;
         private double variationFactor;
         private boolean bAddedToAreaTree;
-        
+
         private LineAdjustingInfo(int alignment, int diff,
                                   int stretch, int shrink) {
             lineAlignment = alignment;
@@ -55,7 +55,7 @@
             bAddedToAreaTree = false;
         }
     }
-    
+
     private LineAdjustingInfo adjustingInfo = null;
 
     // this class can contain the dominant char styling info
@@ -67,7 +67,7 @@
      * default constructor:
      * nothing to do
      */
-    public LineArea() {        
+    public LineArea() {
     }
 
     /**
@@ -142,7 +142,7 @@
         setIPD(ipd);
         setBPD(bpd);
     }
-    
+
     /**
      * receive notification about the ipd variation of a descendant area
      * and perform the needed adjustment, according to the alignment;
@@ -151,12 +151,12 @@
      *   <li>left-aligned text needs no adjustement;</li>
      *   <li>right-aligned text and centered text are handled locally,
      *       adjusting the indent of this LineArea;</li>
-     *   <li>justified text requires a more complex adjustment, as the 
+     *   <li>justified text requires a more complex adjustment, as the
      *       variation factor computed on the basis of the total
      *       stretch and shrink of the line must be applied in every
-     *       descendant leaf areas (text areas and leader areas).</li> 
+     *       descendant leaf areas (text areas and leader areas).</li>
      * </ul>
-     * @param ipdVariation the difference between old and new ipd 
+     * @param ipdVariation the difference between old and new ipd
      */
     public void handleIPDVariation(int ipdVariation) {
         switch (adjustingInfo.lineAlignment) {
@@ -186,7 +186,7 @@
                 throw new RuntimeException();
         }
     }
-    
+
     /**
      * apply the variation factor to all descendant areas
      * and destroy the AdjustingInfo object if there are

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,7 +67,7 @@
     /**
      * Resolve by adding an internal link to the first PageViewport in the list.
      *
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void resolveIDRef(String id, List pages) {
         resolveIDRef(id, (PageViewport)pages.get(0));

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java Thu Jul 24 02:35:34 2008
@@ -43,7 +43,7 @@
         this.parent = parent;
         addTrait(Trait.IS_REFERENCE_AREA, Boolean.TRUE);
     }
-      
+
     /**
      * Add a span area to this area.
      *
@@ -58,11 +58,11 @@
         RegionViewport rv = parent.getRegionViewport();
         int ipdWidth = (int) parent.getIPD()
             - rv.getBorderAndPaddingWidthStart() - rv.getBorderAndPaddingWidthEnd();
-        
-        Span newSpan = new Span(((spanAll) ? 1 : getColumnCount()), 
+
+        Span newSpan = new Span(((spanAll) ? 1 : getColumnCount()),
                 getColumnGap(), ipdWidth);
         spanAreas.add(newSpan);
-        return getCurrentSpan(); 
+        return getCurrentSpan();
     }
 
     /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 /**
@@ -33,7 +33,7 @@
         addTrait(Trait.IS_REFERENCE_AREA, Boolean.TRUE);
         setIPD(ipd);
     }
-    
+
     /** {@inheritDoc} */
     public void addBlock(Block block) {
         super.addBlock(block);

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentExtensionAttachment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentExtensionAttachment.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentExtensionAttachment.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentExtensionAttachment.java Thu Jul 24 02:35:34 2008
@@ -29,7 +29,7 @@
 public class OffDocumentExtensionAttachment implements OffDocumentItem {
 
     private ExtensionAttachment attachment;
-    
+
     /**
      * Main constructor
      * @param attachment the extension attachment to wrap.
@@ -37,7 +37,7 @@
     public OffDocumentExtensionAttachment(ExtensionAttachment attachment) {
         this.attachment = attachment;
     }
-    
+
     /** @return the extension attachment. */
     public ExtensionAttachment getAttachment() {
         return this.attachment;
@@ -52,5 +52,5 @@
     public String getName() {
         return attachment.getCategory();
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentItem.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentItem.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/OffDocumentItem.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 /**
@@ -45,7 +45,7 @@
      */
     int END_OF_DOC = 2;
 
-    
+
     /**
      * Get an indicator of when this item should be processed
      * @return int constant (IMMEDIATELY, AFTER_PAGE, END_OF_DOC)
@@ -57,5 +57,5 @@
      * @return String name of ODI
      */
     String getName();
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Thu Jul 24 02:35:34 2008
@@ -59,9 +59,9 @@
 
     /** Set to true to make this page behave as if it were not empty. */
     private boolean fakeNonEmpty = false;
-    
+
     /**
-     *  Empty constructor, for cloning 
+     *  Empty constructor, for cloning
      */
     public Page() {
     }
@@ -78,7 +78,7 @@
 
         // Get absolute margin properties (top, left, bottom, right)
         CommonMarginBlock mProps = spm.getCommonMarginBlock();
-        
+
         /*
          * Create the page reference area rectangle (0,0 is at top left
          * of the "page media" and y increases
@@ -92,20 +92,20 @@
          * That's why we 'cheat' here and setup a context for the height but
          * use the LengthBase.BLOCK_WIDTH.
          */
-        SimplePercentBaseContext pageWidthContext 
+        SimplePercentBaseContext pageWidthContext
             = new SimplePercentBaseContext(null, LengthBase.CONTAINING_BLOCK_WIDTH
                                             , pageViewPortDims.ipd);
         SimplePercentBaseContext pageHeightContext
             = new SimplePercentBaseContext(null, LengthBase.CONTAINING_BLOCK_WIDTH
                                             , pageViewPortDims.bpd);
 
-        Rectangle pageRefRect 
+        Rectangle pageRefRect
             =  new Rectangle(mProps.marginLeft.getValue(pageWidthContext)
                             , mProps.marginTop.getValue(pageHeightContext)
-                            , pageViewPortDims.ipd 
-                                - mProps.marginLeft.getValue(pageWidthContext) 
+                            , pageViewPortDims.ipd
+                                - mProps.marginLeft.getValue(pageWidthContext)
                                 - mProps.marginRight.getValue(pageWidthContext)
-                            , pageViewPortDims.bpd 
+                            , pageViewPortDims.bpd
                                 - mProps.marginTop.getValue(pageHeightContext)
                                 - mProps.marginBottom.getValue(pageHeightContext));
 
@@ -142,7 +142,7 @@
     public void fakeNonEmpty() {
         this.fakeNonEmpty = true;
     }
-    
+
     /**
      * Creates a RegionViewport Area object for this pagination Region.
      * @param r the region the viewport is to be created for
@@ -161,11 +161,11 @@
         rv.setBPD((int)relRegionRect.getHeight());
         rv.setIPD((int)relRegionRect.getWidth());
         TraitSetter.addBackground(rv, r.getCommonBorderPaddingBackground(), null);
-        rv.setClip(r.getOverflow() == Constants.EN_HIDDEN 
+        rv.setClip(r.getOverflow() == Constants.EN_HIDDEN
                 || r.getOverflow() == Constants.EN_ERROR_IF_OVERFLOW);
         return rv;
     }
-   
+
     /**
      * Set the region reference position within the region viewport.
      * This sets the transform that is used to place the contents of
@@ -177,15 +177,15 @@
      * where x=distance from left, y=distance from bottom, width=right-left
      * height=top-bottom
      */
-    private void setRegionReferencePosition(RegionReference rr, Region r, 
+    private void setRegionReferencePosition(RegionReference rr, Region r,
                                   Rectangle2D absRegVPRect) {
         FODimension reldims = new FODimension(0, 0);
         rr.setCTM(CTM.getCTMandRelDims(r.getReferenceOrientation(),
                 r.getWritingMode(), absRegVPRect, reldims));
         rr.setIPD(reldims.ipd);
         rr.setBPD(reldims.bpd);
-    }    
-    
+    }
+
     /**
      * Set the region on this page.
      *
@@ -219,7 +219,7 @@
         case Constants.FO_REGION_START:
             return regionStart;
         case Constants.FO_REGION_BODY:
-            return regionBody;            
+            return regionBody;
         case Constants.FO_REGION_END:
             return regionEnd;
         case Constants.FO_REGION_AFTER:

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageSequence.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageSequence.java Thu Jul 24 02:35:34 2008
@@ -30,7 +30,7 @@
     private LineArea title;
     private String language;
     private String country;
-    
+
     /**
      * Main constructor
      * @param title the title for the page-sequence, may be null
@@ -38,14 +38,14 @@
     public PageSequence(LineArea title) {
         setTitle(title);
     }
-    
+
     /**
      * @return the title of the page sequence in form of a line area, or null if there's no title
      */
     public LineArea getTitle() {
         return this.title;
     }
-    
+
     /**
      * Sets the page sequence's title.
      * @param title the title
@@ -53,7 +53,7 @@
     public void setTitle(LineArea title) {
         this.title = title;
     }
-    
+
     /**
      * Adds a new page to the page sequence
      * @param page the page to be added
@@ -61,7 +61,7 @@
     public void addPage(PageViewport page) {
         this.pages.add(page);
     }
-    
+
     /**
      * @return the number of pages currently in this page sequence
      */
@@ -77,7 +77,7 @@
     public PageViewport getPage(int idx) {
         return (PageViewport)this.pages.get(idx);
     }
-    
+
     /**
      * Indicates whether a page is the first in this page sequence.
      * @param page the page to be inspected
@@ -106,7 +106,7 @@
             this.language = language;
         }
     }
-    
+
     /**
      * Returns the country of the page-sequence.
      * @return the country (the value of the country property, "none" is mapped to null)
@@ -126,5 +126,5 @@
             this.country = country;
         }
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,18 +52,18 @@
     private Page page;
     private Rectangle2D viewArea;
     private String simplePageMasterName;
-    
+
     /**
-     * Unique key to identify the page. pageNumberString and pageIndex are both no option 
+     * Unique key to identify the page. pageNumberString and pageIndex are both no option
      * for this.
      */
     private String pageKey;
-    
+
     private int pageNumber = -1;
     private String pageNumberString = null;
     private int pageIndex = -1; //-1 = undetermined
     private boolean blank;
-    
+
     private transient PageSequence pageSequence;
 
     // list of id references and the rectangle on the page
@@ -86,7 +86,7 @@
     private Map markerFirstAny = null;
     private Map markerLastEnd = null;
     private Map markerLastAny = null;
-    
+
     //Arbitrary attachments to the page from extensions that need to pass information
     //down to the renderers.
     private List extensionAttachments = null;
@@ -117,7 +117,7 @@
     }
 
     /**
-     * Copy constructor. 
+     * Copy constructor.
      * @param original the original PageViewport to copy from
      */
     public PageViewport(PageViewport original) {
@@ -141,7 +141,7 @@
      * @param simplePageMasterName name of the original simple-page-master that generated this page
      * @param blank true if this is a blank page
      */
-    public PageViewport(Rectangle2D viewArea, int pageNumber, String pageStr, 
+    public PageViewport(Rectangle2D viewArea, int pageNumber, String pageStr,
             String simplePageMasterName, boolean blank) {
         this.viewArea = viewArea;
         this.pageNumber = pageNumber;
@@ -149,7 +149,7 @@
         this.simplePageMasterName = simplePageMasterName;
         this.blank = blank;
     }
-    
+
     /**
      * Sets the page sequence this page belongs to
      * @param seq the page sequence
@@ -157,12 +157,12 @@
     public void setPageSequence(PageSequence seq) {
         this.pageSequence = seq;
     }
-    
+
     /** @return the page sequence this page belongs to */
     public PageSequence getPageSequence() {
         return this.pageSequence;
     }
-    
+
     /**
      * Get the view area rectangle of this viewport.
      * @return the rectangle for this viewport
@@ -178,7 +178,7 @@
     public Page getPage() {
         return page;
     }
-    
+
     /**
      * Sets the page object for this PageViewport.
      * @param page the page
@@ -211,15 +211,15 @@
     public void setPageIndex(int index) {
         this.pageIndex = index;
     }
-    
+
     /**
-     * @return the overall page index of the page in this rendering run (zero-based, 
+     * @return the overall page index of the page in this rendering run (zero-based,
      *         -1 if it is undetermined).
      */
     public int getPageIndex() {
         return this.pageIndex;
     }
-    
+
     /**
      * Sets the unique key for this PageViewport that will be used to reference this page.
      * @param key the unique key.
@@ -227,7 +227,7 @@
     public void setKey(String key) {
         this.pageKey = key;
     }
-    
+
     /**
      * Get the key for this page viewport.
      * This is used so that a serializable key can be used to
@@ -292,7 +292,7 @@
      * @return true if the page is resolved and can be rendered
      */
     public boolean isResolved() {
-        return unresolvedIDRefs == null 
+        return unresolvedIDRefs == null
             || unresolvedIDRefs.size() == 0;
     }
 
@@ -306,7 +306,7 @@
     }
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void resolveIDRef(String id, List pages) {
         if (page == null) {
@@ -345,7 +345,7 @@
      * are starting, replacing earlier markers.
      * For "last-ending-within-page" it adds all markers that
      * are ending, replacing earlier markers.
-     * 
+     *
      * Should this logic be placed in the Page layout manager.
      *
      * @param marks the map of markers to add
@@ -360,12 +360,12 @@
             return;
         }
         if (log.isDebugEnabled()) {
-            log.debug("--" + marks.keySet() + ": " 
-                    + (starting ? "starting" : "ending") 
-                    + (isfirst ? ", first" : "") 
+            log.debug("--" + marks.keySet() + ": "
+                    + (starting ? "starting" : "ending")
+                    + (isfirst ? ", first" : "")
                     + (islast ? ", last" : ""));
         }
-        
+
         // at the start of the area, register is-first and any areas
         if (starting) {
             if (isfirst) {
@@ -381,14 +381,14 @@
                     if (!markerFirstStart.containsKey(key)) {
                         markerFirstStart.put(key, marks.get(key));
                         if (log.isTraceEnabled()) {
-                            log.trace("page " + pageNumberString + ": " 
+                            log.trace("page " + pageNumberString + ": "
                                     + "Adding marker " + key + " to FirstStart");
                         }
                     }
                     if (!markerFirstAny.containsKey(key)) {
                         markerFirstAny.put(key, marks.get(key));
                         if (log.isTraceEnabled()) {
-                            log.trace("page " + pageNumberString + ": " 
+                            log.trace("page " + pageNumberString + ": "
                                     + "Adding marker " + key + " to FirstAny");
                         }
                     }
@@ -399,7 +399,7 @@
                 // last on page: replace all
                 markerLastStart.putAll(marks);
                 if (log.isTraceEnabled()) {
-                    log.trace("page " + pageNumberString + ": " 
+                    log.trace("page " + pageNumberString + ": "
                             + "Adding all markers to LastStart");
                 }
             } else {
@@ -412,7 +412,7 @@
                     if (!markerFirstAny.containsKey(key)) {
                         markerFirstAny.put(key, marks.get(key));
                         if (log.isTraceEnabled()) {
-                            log.trace("page " + pageNumberString + ": " 
+                            log.trace("page " + pageNumberString + ": "
                                     + "Adding marker " + key + " to FirstAny");
                         }
                     }
@@ -427,7 +427,7 @@
                 // last on page: replace all
                 markerLastEnd.putAll(marks);
                 if (log.isTraceEnabled()) {
-                    log.trace("page " + pageNumberString + ": " 
+                    log.trace("page " + pageNumberString + ": "
                             + "Adding all markers to LastEnd");
                 }
             }
@@ -437,7 +437,7 @@
             // last on page: replace all
             markerLastAny.putAll(marks);
             if (log.isTraceEnabled()) {
-                log.trace("page " + pageNumberString + ": " 
+                log.trace("page " + pageNumberString + ": "
                         + "Adding all markers to LastAny");
             }
         }
@@ -448,7 +448,7 @@
      * This will retrieve a marker with the class name
      * and position.
      *
-     * @param name The class name of the marker to retrieve 
+     * @param name The class name of the marker to retrieve
      * @param pos the position to retrieve
      * @return Object the marker found or null
      */
@@ -496,10 +496,10 @@
                 throw new RuntimeException();
         }
         if (log.isTraceEnabled()) {
-            log.trace("page " + pageNumberString + ": " + "Retrieving marker " + name 
-                    + " at position " + posName); 
+            log.trace("page " + pageNumberString + ": " + "Retrieving marker " + name
+                    + " at position " + posName);
         }
-        return mark;    
+        return mark;
     }
 
     /** Dumps the current marker data to the logger. */
@@ -512,7 +512,7 @@
             log.trace("LastStart: " + this.markerLastStart);
         }
     }
-    
+
     /**
      * Save the page contents to an object stream.
      * The map of unresolved references are set on the page so that
@@ -576,12 +576,12 @@
         sb.append(getPageNumberString());
         return sb.toString();
     }
-    
+
     /** @return the name of the simple-page-master that created this page */
     public String getSimplePageMasterName() {
         return this.simplePageMasterName;
     }
-    
+
     /**
      * Adds a new ExtensionAttachment instance to this page.
      * @param attachment the ExtensionAttachment
@@ -592,7 +592,7 @@
         }
         extensionAttachments.add(attachment);
     }
-    
+
     /** @return the list of extension attachments for this page */
     public List getExtensionAttachments() {
         if (this.extensionAttachments == null) {
@@ -601,12 +601,12 @@
             return this.extensionAttachments;
         }
     }
-    
+
     /** @return True if this is a blank page. */
     public boolean isBlank() {
         return this.blank;
     }
-    
+
     /**
      * Convenience method to get BodyRegion of this PageViewport
      * @return BodyRegion object
@@ -614,62 +614,62 @@
     public BodyRegion getBodyRegion() {
         return (BodyRegion) getPage().getRegionViewport(
                 Constants.FO_REGION_BODY).getRegionReference();
-    }    
+    }
 
     /**
      * Convenience method to create a new Span for this
      * this PageViewport.
-     * 
+     *
      * @param spanAll whether this is a single-column span
      * @return Span object created
      */
     public Span createSpan(boolean spanAll) {
         return getBodyRegion().getMainReference().createSpan(spanAll);
-    }    
+    }
 
     /**
      * Convenience method to get the span-reference-area currently
      * being processed
-     * 
+     *
      * @return span currently being processed.
      */
     public Span getCurrentSpan() {
         return getBodyRegion().getMainReference().getCurrentSpan();
     }
-    
+
     /**
-     * Convenience method to get the normal-flow-reference-area 
+     * Convenience method to get the normal-flow-reference-area
      * currently being processed
-     * 
+     *
      * @return span currently being processed.
      */
     public NormalFlow getCurrentFlow() {
         return getCurrentSpan().getCurrentFlow();
     }
-    
+
     /**
-     * Convenience method to increment the Span to the 
+     * Convenience method to increment the Span to the
      * next NormalFlow to be processed, and to return that flow.
-     * 
+     *
      * @return the next NormalFlow in the Span.
      */
     public NormalFlow moveToNextFlow() {
         return getCurrentSpan().moveToNextFlow();
     }
-    
+
     /**
-     * Convenience method to return a given region-reference-area, 
+     * Convenience method to return a given region-reference-area,
      * keyed by the Constants class identifier for the corresponding
-     * formatting object (ie. Constants.FO_REGION_BODY, FO_REGION_START, 
+     * formatting object (ie. Constants.FO_REGION_BODY, FO_REGION_START,
      * etc.)
-     * 
+     *
      * @param id the Constants class identifier for the region.
      * @return the corresponding region-reference-area for this page.
      */
     public RegionReference getRegionReference(int id) {
         return getPage().getRegionViewport(id).getRegionReference();
     }
-    
+
     /** @return whether this page viewport has any extension attachments */
     public boolean hasExtensionAttachments() {
         return this.extensionAttachments != null && !this.extensionAttachments.isEmpty();

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,17 +30,17 @@
  * so the page master can make copies from the original page and regions.
  */
 public class RegionReference extends Area implements Cloneable {
-    
+
     /** Reference to the region FO. */
     //protected Region regionFO;
     private int regionClass;
     private String regionName;
     private CTM ctm;
-    
+
 
     // the list of block areas from the static flow
     private ArrayList blocks = new ArrayList();
-    
+
     /** the parent RegionViewport for this object */
     protected RegionViewport regionViewport;
 
@@ -78,7 +78,7 @@
         // subtract bpd of borders and padding before / after
         return super.getBPD() - getBorderAndPaddingWidthBefore() - getBorderAndPaddingWidthAfter();
     }
-    
+
     /** {@inheritDoc} */
     public int getIPD() {
         // subtract ipd of borders and padding start / end
@@ -97,7 +97,7 @@
     public void setCTM(CTM ctm) {
         this.ctm = ctm;
     }
-    
+
     /**
      * @return Returns the parent RegionViewport.
      */
@@ -136,7 +136,7 @@
     public String getRegionName() {
         return this.regionName;
     }
-    
+
     /**
      * Add a block area to this region reference area.
      *
@@ -145,7 +145,7 @@
     public void addBlock(Block block) {
         addChildArea(block);
     }
-    
+
     /**
      * Clone this region.
      * This is used when cloning the page by the page master.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 import java.awt.geom.Rectangle2D;
@@ -25,7 +25,7 @@
 
 /**
  * Region Viewport area.
- * This object represents the region-viewport-area.  It has a 
+ * This object represents the region-viewport-area.  It has a
  * region-reference-area as its child.  These areas are described
  * in the fo:region-body description in the XSL Recommendation.
  */
@@ -76,7 +76,7 @@
     public boolean isClip() {
         return this.clip;
     }
-    
+
     /**
      * Get the view area of this viewport.
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 // Java
@@ -46,7 +46,7 @@
      * The renderer that will render the pages.
      */
     protected Renderer renderer;
-    
+
     /**
      * Pages that have been prepared but not rendered yet.
      */
@@ -62,7 +62,7 @@
      * @param stream OutputStream
      * @throws FOPException if the renderer cannot be properly initialized
      */
-    public RenderPagesModel (FOUserAgent userAgent, String outputFormat, 
+    public RenderPagesModel (FOUserAgent userAgent, String outputFormat,
         FontInfo fontInfo, OutputStream stream) throws FOPException {
 
         super();
@@ -113,7 +113,7 @@
             try {
                 renderer.renderPage(page);
             } catch (RuntimeException re) {
-                String err = "Error while rendering page " + page.getPageNumberString(); 
+                String err = "Error while rendering page " + page.getPageNumberString();
                 log.error(err, re);
                 throw re;
             } catch (IOException ioe) {
@@ -122,9 +122,9 @@
                 eventProducer.ioError(this, ioe);
             } catch (FOPException e) {
                 //TODO use error handler to handle this FOPException or propagate exception
-                String err = "Error while rendering page " + page.getPageNumberString(); 
+                String err = "Error while rendering page " + page.getPageNumberString();
                 log.error(err, e);
-                throw new IllegalStateException("Fatal error occurred. Cannot continue. " 
+                throw new IllegalStateException("Fatal error occurred. Cannot continue. "
                         + e.getClass().getName() + ": " + err);
             }
             page.clear();

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Resolvable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Resolvable.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Resolvable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Resolvable.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 import java.util.List;
@@ -52,7 +52,7 @@
      * identifies to the AreaTreeHandler which idrefs it needs
      * resolved.  After the idrefs are resolved, the ATH calls this
      * method to allow the Resolvable object to update itself with
-     * the PageViewport information.  
+     * the PageViewport information.
      *
      * @param id an ID matching one of the Resolvable object's
      *      unresolved idref's.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area;
 
 import java.util.List;
@@ -27,7 +27,7 @@
  * within the main-reference-area
  * This object holds one or more normal-flow-reference-area children
  * based on the column-count trait in effect for this span.
- * See fo:region-body definition in the XSL Rec for more information. 
+ * See fo:region-body definition in the XSL Rec for more information.
  */
 public class Span extends Area {
     // the list of flow reference areas in this span area
@@ -36,13 +36,13 @@
     private int colGap;
     private int colWidth; // width for each normal flow, calculated value
     private int curFlowIdx;  // n-f-r-a currently being processed, zero-based
-    
+
     /**
      * Create a span area with the number of columns for this span area.
      *
      * @param colCount the number of columns in the span
-     * @param colGap the column gap between each column 
-     * @param ipd the total ipd of the span 
+     * @param colGap the column gap between each column
+     * @param ipd the total ipd of the span
      */
     public Span(int colCount, int colGap, int ipd) {
         addTrait(Trait.IS_REFERENCE_AREA, Boolean.TRUE);
@@ -57,7 +57,7 @@
      * Create the normal flows for this Span
      */
     private void createNormalFlows() {
-        flowAreas = new java.util.ArrayList(colCount);        
+        flowAreas = new java.util.ArrayList(colCount);
         colWidth = (ipd - ((colCount - 1) * colGap)) / colCount;
 
         for (int i = 0; i < colCount; i++) {
@@ -104,28 +104,28 @@
         if (colRequested >= 0 && colRequested < colCount) {
             return (NormalFlow) flowAreas.get(colRequested);
         } else { // internal error
-            throw new IllegalArgumentException("Invalid column number " 
-                    + colRequested + " requested; only 0-" + (colCount - 1) 
+            throw new IllegalArgumentException("Invalid column number "
+                    + colRequested + " requested; only 0-" + (colCount - 1)
                     + " available.");
         }
     }
-    
+
     /**
      * Get the NormalFlow area currently being processed
      *
      * @return the current NormalFlow
      */
     public NormalFlow getCurrentFlow() {
-        return getNormalFlow(curFlowIdx); 
+        return getNormalFlow(curFlowIdx);
     }
-    
+
     /** @return the index of the current normal flow */
     public int getCurrentFlowIndex() {
         return curFlowIdx;
     }
-    
+
     /**
-     * Indicate to the Span that the next column is being 
+     * Indicate to the Span that the next column is being
      * processed.
      *
      * @return the new NormalFlow (in the next column)
@@ -138,17 +138,17 @@
             throw new IllegalStateException("(Internal error.) No more flows left in span.");
         }
     }
-    
+
     /**
-     * Indicates if the Span has unprocessed flows. 
+     * Indicates if the Span has unprocessed flows.
      *
-     * @return true if Span can increment to the next flow, 
+     * @return true if Span can increment to the next flow,
      * false otherwise.
      */
     public boolean hasMoreFlows() {
-        return (curFlowIdx < colCount - 1); 
+        return (curFlowIdx < colCount - 1);
     }
-    
+
     /**
      * Called to notify the span that all its flows have been fully generated so it can update
      * its own BPD extent.
@@ -160,7 +160,7 @@
         }
         bpd = maxFlowBPD;
     }
-    
+
     /**
      * Indicates whether any child areas have been added to this span area.
      *
@@ -179,7 +179,7 @@
         }
         return (areaCount == 0);
     }
-    
+
     /** {@inheritDoc} */
     public String toString() {
         StringBuffer sb = new StringBuffer(super.toString());

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java Thu Jul 24 02:35:34 2008
@@ -175,19 +175,19 @@
 
     /** The space-before trait. */
     public static final Integer SPACE_BEFORE  = new Integer(29);
-    
+
     /** The space-after trait. */
     public static final Integer SPACE_AFTER  = new Integer(30);
-    
+
     /** The is-reference-area trait. */
     public static final Integer IS_REFERENCE_AREA = new Integer(31);
-    
+
     /** The is-viewport-area trait. */
     public static final Integer IS_VIEWPORT_AREA = new Integer(32);
-    
+
     /** Blinking trait used when rendering inline parent. */
     public static final Integer BLINK = new Integer(33);
-    
+
     /** Trait for color of underline decorations when rendering inline parent. */
     public static final Integer UNDERLINE_COLOR = new Integer(34);
     /** Trait for color of overline decorations when rendering inline parent. */
@@ -197,9 +197,9 @@
 
     /** Maximum value used by trait keys */
     public static final int MAX_TRAIT_KEY = 36;
-    
+
     private static final TraitInfo[] TRAIT_INFO = new TraitInfo[MAX_TRAIT_KEY + 1];
-    
+
     private static class TraitInfo {
         private String name;
         private Class clazz; // Class of trait data
@@ -221,7 +221,7 @@
     private static void put(Integer key, TraitInfo info) {
         TRAIT_INFO[key.intValue()] = info;
     }
-    
+
     static {
         // Create a hashmap mapping trait code to name for external representation
         //put(ID_LINK, new TraitInfo("id-link", String.class));
@@ -518,7 +518,7 @@
 
         /** The background image url if any. */
         private String url = null;
-        
+
         /** The background image if any. */
         private ImageInfo imageInfo = null;
 
@@ -658,7 +658,7 @@
                 throw new IllegalStateException("Illegal repeat style: " + repeat);
             }
         }
-        
+
         /**
          * Return the string for debugging.
          * {@inheritDoc}

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java Thu Jul 24 02:35:34 2008
@@ -36,7 +36,7 @@
          * (this is equivalent to the property word-spacing.optimum)
          */
         protected int spaceDifference = 0;
-        
+
         /**
          * Constructor
          *
@@ -70,7 +70,7 @@
     public AbstractTextArea(int stretch, int shrink, int adj) {
         textAdjustingInfo = new TextAdjustingInfo(stretch, shrink, adj);
     }
-    
+
     /**
      * Get text word space adjust.
      *
@@ -108,9 +108,9 @@
     }
 
     /**
-     * Set the difference between optimal width of a space and 
+     * Set the difference between optimal width of a space and
      * default width of a space according to the font; this part
-     * of the space adjustment is fixed and must not be 
+     * of the space adjustment is fixed and must not be
      * multiplied by the variation factor.
      * @param spaceDiff the space difference
      */
@@ -129,22 +129,22 @@
                                         int lineStretch, int lineShrink) {
         if (textAdjustingInfo != null) {
             // compute the new adjustments:
-            // if the variation factor is negative, it means that before 
+            // if the variation factor is negative, it means that before
             // the ipd variation the line had to stretch and now it has
             // to shrink (or vice versa);
-            // in this case, if the stretch and shrink are not equally 
-            // divided among the inline areas, we must compute a 
+            // in this case, if the stretch and shrink are not equally
+            // divided among the inline areas, we must compute a
             // balancing factor
             double balancingFactor = 1.0;
             if (variationFactor < 0) {
                 if (textWordSpaceAdjust < 0) {
                     // from a negative adjustment to a positive one
-                    balancingFactor 
+                    balancingFactor
                         = ((double) textAdjustingInfo.availableStretch / textAdjustingInfo.availableShrink)
                             * ((double) lineShrink / lineStretch);
                 } else {
                     // from a positive adjustment to a negative one
-                    balancingFactor 
+                    balancingFactor
                         = ((double) textAdjustingInfo.availableShrink / textAdjustingInfo.availableStretch)
                             * ((double) lineStretch / lineShrink);
                 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area.inline;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area.inline;
 
 import org.apache.fop.area.Area;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area.inline;
 
 import java.util.List;
@@ -35,7 +35,7 @@
  */
 public class FilledArea extends InlineParent {
     private int unitWidth;
-    
+
     /**
      * Create a new filled area.
      */
@@ -98,7 +98,7 @@
         }
         return bpd;
     }
-    
+
     /**
      * Get the child areas for this filled area.
      * This copies the references of the inline areas so that
@@ -115,7 +115,7 @@
         }
         return newList;
     }
-    
+
     /**
      * recursively apply the variation factor to all descendant areas
      * @param variationFactor the variation factor that must be applied to adjustments

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/ForeignObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/ForeignObject.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/ForeignObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/ForeignObject.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area.inline;
 
 import org.apache.fop.area.Area;
@@ -30,9 +30,9 @@
  * This holds an xml document and the associated namespace.
  */
 public class ForeignObject extends Area {
-    
+
     private static final long serialVersionUID = -214947698798577885L;
-    
+
     private Document doc;
     private String namespace;
 
@@ -63,7 +63,7 @@
     public void setDocument(Document document) {
         this.doc = document;
     }
-    
+
     /**
      * Get the document for this foreign object.
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area.inline;
 
 import org.apache.fop.area.Area;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
  * in a line area.
  */
 public class InlineArea extends Area {
-    
+
     /**
      * this class stores information about potential adjustments
      * that can be used in order to re-compute adjustments when a
@@ -42,7 +42,7 @@
         protected int availableShrink;
         /** total adjustment (= ipd - width of fixed elements) */
         protected int adjustment;
-        
+
         /**
          * Constructor
          *
@@ -55,10 +55,10 @@
             availableShrink = shrink;
             adjustment = adj;
         }
-        
+
         /**
          * Apply the variation factor
-         * 
+         *
          * @param variationFactor the factor by which the adjustment is to be changed
          * @return the IPD increase
          */
@@ -68,19 +68,19 @@
             return adjustment - oldAdjustment;
         }
     }
-    
+
     /**
      * offset position from before edge of parent area
      */
     protected int offset = 0;
-    
+
     /**
      * parent area
      * it is needed in order to recompute adjust ratio and indents
      * when a page-number or a page-number-citation is resolved
      */
     private Area parentArea = null;
-    
+
     /**
      * ipd variation of child areas: if this area has not already
      * been added and cannot notify its parent area, store the variation
@@ -92,7 +92,7 @@
      * The adjustment information object
      */
     protected InlineAdjustingInfo adjustingInfo = null;
-    
+
     /**
      * @return the adjustment information object
      */
@@ -109,7 +109,7 @@
     public void setAdjustingInfo(int stretch, int shrink, int adjustment) {
         adjustingInfo = new InlineAdjustingInfo(stretch, shrink, adjustment);
     }
-    
+
     /**
      * Modify the adjustment value in the adjustment information object
      * @param adjustment the new adjustment value
@@ -119,7 +119,7 @@
             adjustingInfo.adjustment = adjustment;
         }
     }
-    
+
     /**
      * Increase the inline progression dimensions of this area.
      * This is used for inline parent areas that contain mulitple child areas.
@@ -165,7 +165,7 @@
     public Area getParentArea() {
         return parentArea;
     }
-    
+
     /**
      * Set the parent for the child area.
      *
@@ -177,7 +177,7 @@
             ((InlineArea) childArea).setParentArea(this);
         }
     }
-    
+
     /**
      *@return true if the inline area is underlined.
      */
@@ -189,17 +189,17 @@
     public boolean hasOverline() {
         return getTraitAsBoolean(Trait.OVERLINE);
     }
-    
+
     /** @return true if the inline area has a line through. */
     public boolean hasLineThrough() {
         return getTraitAsBoolean(Trait.LINETHROUGH);
     }
-    
+
     /** @return true if the inline area is blinking. */
     public boolean isBlinking() {
         return getTraitAsBoolean(Trait.BLINK);
     }
-    
+
     /**
      * recursively apply the variation factor to all descendant areas
      * @param variationFactor the variation factor that must be applied to adjustments
@@ -215,12 +215,12 @@
         }
         return false;
     }
-    
+
     public void handleIPDVariation(int ipdVariation) {
         increaseIPD(ipdVariation);
         notifyIPDVariation(ipdVariation);
     }
-    
+
         /**
      * notify the parent area about the ipd variation of this area
      * or of a descendant area

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
 
     /** Controls whether the IPD is automatically adjusted based on the area's children. */
     protected transient boolean autoSize;
-    
+
     /**
      * Create a new inline parent to add areas to.
      */
@@ -82,7 +82,7 @@
     public boolean applyVariationFactor(double variationFactor,
                                         int lineStretch, int lineShrink) {
         boolean bUnresolvedAreasPresent = false;
-        // recursively apply variation factor to descendant areas 
+        // recursively apply variation factor to descendant areas
         for (int i = 0, len = inlines.size(); i < len; i++) {
             bUnresolvedAreasPresent |= ((InlineArea)inlines.get(i))
                 .applyVariationFactor(variationFactor, lineStretch, lineShrink);

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -71,7 +71,7 @@
             setRuleStyle(Constants.EN_NONE);
         }
     }
-    
+
     /**
      * Set the rule thickness of the rule in miilipoints.
      *
@@ -104,7 +104,7 @@
             throw new IllegalStateException("Unsupported rule style: " + getRuleStyle());
         }
     }
-    
+
     /**
      * Get the rule thickness of the rule in miilipoints.
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java Thu Jul 24 02:35:34 2008
@@ -22,7 +22,7 @@
  * A space
  */
 public class SpaceArea extends InlineArea {
-    
+
     /**
      * The space for this space area
      */
@@ -44,7 +44,7 @@
         offset = o;
         isAdjustable = a;
     }
-    
+
     /**
      * @return Returns the space.
      */

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,20 +47,20 @@
     public void removeText() {
         inlines.clear();
     }
-    
+
     /**
      * Create and add a WordArea child to this TextArea.
-     * 
+     *
      * @param word   the word string
      * @param offset the offset for the next area
      */
     public void addWord(String word, int offset) {
         addWord(word, offset, null);
     }
-    
+
     /**
      * Create and add a WordArea child to this TextArea.
-     * 
+     *
      * @param word   the word string
      * @param offset the offset for the next area
      */
@@ -69,10 +69,10 @@
         addChildArea(wordArea);
         wordArea.setParentArea(this);
     }
-    
+
     /**
      * Create and add a SpaceArea child to this TextArea
-     * 
+     *
      * @param space      the space character
      * @param offset     the offset for the next area
      * @param adjustable is this space adjustable?
@@ -82,13 +82,13 @@
         addChildArea(spaceArea);
         spaceArea.setParentArea(this);
     }
-    
+
     /**
      * Get the whole text string.
-     * Renderers whose space adjustment handling is not affected 
+     * Renderers whose space adjustment handling is not affected
      * by multi-byte characters can use this method to render the
-     * whole TextArea at once; the other renderers (for example 
-     * PDFRenderer) have to implement renderWord(WordArea) and 
+     * whole TextArea at once; the other renderers (for example
+     * PDFRenderer) have to implement renderWord(WordArea) and
      * renderSpace(SpaceArea) in order to correctly place each
      * text fragment.
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.area.inline;
 
 import org.apache.fop.area.PageViewport;
@@ -41,10 +41,10 @@
     public static final boolean FIRST = true;
     /** Indicates that the reference refers to the last area generated by a formatting object. */
     public static final boolean LAST = false;
-    
+
     //Transient fields
     private transient Font font;
-    
+
     /**
      * Create a new unresolved page number.
      *
@@ -54,7 +54,7 @@
     public UnresolvedPageNumber(String id, Font f) {
         this(id, f, FIRST);
     }
-    
+
     /**
      * Create a new unresolved page number.
      *
@@ -98,7 +98,7 @@
             PageViewport page;
             if (pageType == FIRST) {
                 page = (PageViewport)pages.get(0);
-            } else { 
+            } else {
                 page = (PageViewport)pages.get(pages.size() - 1);
             }
             // replace the text

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -91,7 +91,7 @@
     public void setContent(Area content) {
         this.content = content;
     }
-    
+
     /**
      * Get the content area for this viewport.
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java Thu Jul 24 02:35:34 2008
@@ -25,10 +25,10 @@
 
     /** The text for this word area */
     protected String word;
-    
+
     /** The correction offset for the next area */
     protected int offset = 0;
-    
+
     /** An array of width for adjusting the individual letters (optional) */
     protected int[] letterAdjust;
 
@@ -63,10 +63,10 @@
     public void setOffset(int o) {
         offset = o;
     }
-    
+
     /** @return the array of letter adjust widths */
     public int[] getLetterAdjustArray() {
         return this.letterAdjust;
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/AreaTreeInputHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/AreaTreeInputHandler.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/AreaTreeInputHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/AreaTreeInputHandler.java Thu Jul 24 02:35:34 2008
@@ -43,7 +43,7 @@
      * Constructor for XML->XSLT->area tree XML input
      * @param xmlfile XML file
      * @param xsltfile XSLT file
-     * @param params Vector of command-line parameters (name, value, 
+     * @param params Vector of command-line parameters (name, value,
      *      name, value, ...) for XSL stylesheet, null if none
      */
     public AreaTreeInputHandler(File xmlfile, File xsltfile, Vector params) {
@@ -59,20 +59,20 @@
     }
 
     /** {@inheritDoc} */
-    public void renderTo(FOUserAgent userAgent, String outputFormat, OutputStream out) 
+    public void renderTo(FOUserAgent userAgent, String outputFormat, OutputStream out)
                 throws FOPException {
         FontInfo fontInfo = new FontInfo();
-        AreaTreeModel treeModel = new RenderPagesModel(userAgent, 
+        AreaTreeModel treeModel = new RenderPagesModel(userAgent,
                 outputFormat, fontInfo, out);
-        
+
         //Iterate over all intermediate files
         AreaTreeParser parser = new AreaTreeParser();
-        
+
         // Resulting SAX events (the generated FO) must be piped through to FOP
         Result res = new SAXResult(parser.getContentHandler(treeModel, userAgent));
 
         transformTo(res);
-        
+
         try {
             treeModel.endDocument();
         } catch (SAXException e) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/ImageInputHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/ImageInputHandler.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/ImageInputHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/ImageInputHandler.java Thu Jul 24 02:35:34 2008
@@ -35,7 +35,7 @@
      * Main constructor.
      * @param imagefile the image file
      * @param xsltfile XSLT file (may be null in which case the default stylesheet is used)
-     * @param params Vector of command-line parameters (name, value, 
+     * @param params Vector of command-line parameters (name, value,
      *      name, value, ...) for XSL stylesheet, null if none
      */
     public ImageInputHandler(File imagefile, File xsltfile, Vector params) {
@@ -47,7 +47,7 @@
         return new StreamSource(new StringReader(
                 "<image>" + this.sourcefile.toURI().toASCIIString() + "</image>"));
     }
-    
+
     /** {@inheritDoc} */
     protected Source createXSLTSource() {
         Source src = super.createXSLTSource();

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/CompoundDatatype.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/CompoundDatatype.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/CompoundDatatype.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/CompoundDatatype.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.Constants;
@@ -26,7 +26,7 @@
  * This interface is used as a base for compound datatypes.
  */
 public interface CompoundDatatype extends Constants {
-    
+
     /**
      * Sets a component of the compound datatype.
      * @param cmpId ID of the component

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
         this.ipd = ipd;
         this.bpd = bpd;
     }
-    
+
     public String toString() {
         StringBuffer sb = new StringBuffer(super.toString());
         sb.append(" {ipd=").append(Integer.toString(ipd));

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/KeepValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/KeepValue.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/KeepValue.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/KeepValue.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Length.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Length.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Length.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Length.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
      * @return the length in millipoints
      */
     int getValue();
-    
+
     /**
      * Returns the length in 1/1000ths of a point (millipoints)
      * @param context The context for the length calculation (for percentage based lengths)



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message