Merge from Trunk revisions 677589 to 679734.

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

89 files changed, 575 insertions, 576 deletions

diff --git a/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java b/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java
index 5d6a7f64e..216802c8f 100644
--- a/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java
+++ b/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java
@@ -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.
@@ -42,12 +42,12 @@ public final class BorderAttributesConverter {
      */
     private BorderAttributesConverter() {
     }
-    
+
     /**
-     * Create a border control word in attributes, with border properties 
+     * Create a border control word in attributes, with border properties
      * as specified in color, style and width.
      * @param border The CommonBorderPaddingBackground object.
-     * @param side The START, END, BEFORE, AFTER enum from CommonBorderPaddingBackground. 
+     * @param side The START, END, BEFORE, AFTER enum from CommonBorderPaddingBackground.
      * @param attributes The attributes list to set the border control word.
      * @param controlWord The border control word.
      */
@@ -61,18 +61,18 @@ public final class BorderAttributesConverter {
             //division by 50 to convert millipoints to twips
             attrs.set(IBorderAttributes.BORDER_WIDTH, border.getBorderWidth(side, false) / 50);
             attributes.set(controlWord, attrs);
-            //Don't set BORDER_SPACE, because it makes the table look quite broken: 
+            //Don't set BORDER_SPACE, because it makes the table look quite broken:
             //vertical and horizontal borders don't meet at corners.
             //attrs.setTwips(IBorderAttributes.BORDER_SPACE, border.getPadding(side, false, null));
             //attributes.set(controlWord, attrs);
         } else {
             // Here padding specified, but corresponding border is not available
-            
+
             // Padding in millipoints
             double paddingPt = border.getPadding(side, false, null) / 1000.0;
             // Padding in twips
             int padding = (int) Math.round(paddingPt * FoUnitsConverter.POINT_TO_TWIPS);
-            
+
             // Add padding to corresponding space (space-before or space-after)
             // if side == START or END, do nothing
             if (side == CommonBorderPaddingBackground.BEFORE) {
diff --git a/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java b/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java
index 20100fb7d..0cfa3e0fe 100755
--- a/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java
+++ b/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java
@@ -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 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfColorTable;
 
 
 /**
- * A RtfAttributes subclass that adds some helper set methods. 
+ * A RtfAttributes subclass that adds some helper set methods.
  */
 public class FOPRtfAttributes extends RtfAttributes {
 
@@ -83,16 +83,16 @@ public class FOPRtfAttributes extends RtfAttributes {
     }
 
     private static class DummyPercentBaseContext implements PercentBaseContext {
-        
+
         static DummyPercentBaseContext singleton = new DummyPercentBaseContext();
-        
+
         private DummyPercentBaseContext() {
             // noop
         }
-        
+
         public int getBaseLength(int lengthBase, FObj fo) {
             return 0;
         }
     }
-        
+
 }
diff --git a/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java b/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java
index fa95b8502..caf11323f 100644
--- a/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java
+++ b/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java b/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java
index 4131b814d..e778c902b 100644
--- a/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java
+++ b/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java
@@ -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.
@@ -38,13 +38,13 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText;
  * Provides methods to convert list attributes to RtfAttributes.
  */
 public final class ListAttributesConverter {
-    
+
     /**
      * Constructor is private, because it's just a utility class.
      */
     private ListAttributesConverter() {
     }
-    
+
     /**
      * Reads an FO object's properties and adds returns them as RtfAttributes.
      * @param fobj FO object
@@ -53,12 +53,12 @@ public final class ListAttributesConverter {
      */
     static RtfAttributes convertAttributes(ListBlock fobj)
     throws FOPException {
-        
+
         FOPRtfAttributes attrib = new FOPRtfAttributes();
-        
+
         attrib.setTwips(RtfListTable.LIST_INDENT, fobj.getCommonMarginBlock().startIndent);
         attrib.setTwips(RtfText.LEFT_INDENT_BODY, fobj.getCommonMarginBlock().endIndent);
-        
+
         /*
          * set list table defaults
          */
@@ -67,7 +67,7 @@ public final class ListAttributesConverter {
         attrib.set(RtfListTable.LIST, "simple");
         //set following char as tab
         attrib.set(RtfListTable.LIST_FOLLOWING_CHAR, 0);
-        
+
         return attrib;
     }
 }
\ No newline at end of file
diff --git a/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java b/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java
index 50355e145..c7f97ef4f 100644
--- a/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java
+++ b/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java
@@ -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.
@@ -46,19 +46,19 @@ final class PageAttributesConverter {
      */
     private PageAttributesConverter() {
     }
-    
+
     /** convert xsl:fo attributes to RTF text attributes */
     static RtfAttributes convertPageAttributes(SimplePageMaster pagemaster) {
         FOPRtfAttributes attrib = new FOPRtfAttributes();
-        
+
         try {
             RegionBA before = (RegionBA) pagemaster.getRegion(Constants.FO_REGION_BEFORE);
             RegionBody body   = (RegionBody) pagemaster.getRegion(Constants.FO_REGION_BODY);
             RegionBA after  = (RegionBA) pagemaster.getRegion(Constants.FO_REGION_AFTER);
-            
+
             attrib.setTwips(RtfPage.PAGE_WIDTH, pagemaster.getPageWidth());
             attrib.setTwips(RtfPage.PAGE_HEIGHT, pagemaster.getPageHeight());
-            
+
             Object widthRaw = attrib.getValue(RtfPage.PAGE_WIDTH);
             Object heightRaw = attrib.getValue(RtfPage.PAGE_HEIGHT);
             if ((widthRaw instanceof Integer) && (heightRaw instanceof Integer)
@@ -84,7 +84,7 @@ final class PageAttributesConverter {
                 bodyLeft = (Length) NumericOp.addition(pageLeft, bodyMargin.marginLeft);
                 bodyRight = (Length) NumericOp.addition(pageRight, bodyMargin.marginRight);
             }
-            
+
             attrib.setTwips(RtfPage.MARGIN_TOP, bodyTop);
             attrib.setTwips(RtfPage.MARGIN_BOTTOM, bodyBottom);
             attrib.setTwips(RtfPage.MARGIN_LEFT, bodyLeft);
@@ -104,7 +104,7 @@ final class PageAttributesConverter {
             }
             attrib.setTwips(RtfPage.FOOTERY, beforeTop);
         } catch (Exception e) {
-            log.error("Exception in convertPageAttributes: " 
+            log.error("Exception in convertPageAttributes: "
                 + e.getMessage() + "- page attributes ignored");
             attrib = new FOPRtfAttributes();
         }
diff --git a/src/java/org/apache/fop/render/rtf/RTFEventProducer.java b/src/java/org/apache/fop/render/rtf/RTFEventProducer.java
index a2646af46..69058501f 100644
--- a/src/java/org/apache/fop/render/rtf/RTFEventProducer.java
+++ b/src/java/org/apache/fop/render/rtf/RTFEventProducer.java
@@ -34,7 +34,7 @@ public interface RTFEventProducer extends EventProducer {
 
     /** Provider class for the event producer. */
     class Provider {
-        
+
         /**
          * Returns an event producer.
          * @param broadcaster the event broadcaster to use
@@ -53,9 +53,9 @@ public interface RTFEventProducer extends EventProducer {
         public EventModel createEventModel() {
             return loadModel(getClass(), "event-model.xml");
         }
-        
+
     }
-    
+
     /**
      * The RTF handler only supports simple-page-masters.
      * @param source the event source
@@ -64,7 +64,7 @@ public interface RTFEventProducer extends EventProducer {
      * @event.severity WARN
      */
     void onlySPMSupported(Object source, String masterReference, Locator loc);
-    
+
     /**
      * No simple-page-master could be determined-
      * @param source the event source
@@ -72,7 +72,7 @@ public interface RTFEventProducer extends EventProducer {
      * @event.severity WARN
      */
     void noSPMFound(Object source, Locator loc);
-    
+
     /**
      * The RTF handler requires explicit table-columns for now.
      * @param source the event source
@@ -80,7 +80,7 @@ public interface RTFEventProducer extends EventProducer {
      * @event.severity WARN
      */
     void explicitTableColumnsRequired(Object source, Locator loc);
-    
+
     /**
      * The RTF handler ignored some deferred event (i.e. an unsupported element).
      * @param source the event source
@@ -90,5 +90,5 @@ public interface RTFEventProducer extends EventProducer {
      * @event.severity WARN
      */
     void ignoredDeferredEvent(Object source, FONode node, boolean start, Locator loc);
-    
+
 }
diff --git a/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml b/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml
index 8f1f21a81..e81a7515f 100644
--- a/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml
+++ b/src/java/org/apache/fop/render/rtf/RTFEventProducer.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalogue xml:lang="en">
+<?xml version="1.0" encoding="UTF-8"?><catalogue xml:lang="en">
   <message key="locator">[ (See position {loc})| (See {#gatherContextInfo})| (No context info available)]</message>
   <message key="org.apache.fop.render.rtf.RTFEventProducer.onlySPMSupported">Only simple-page-masters are supported on page-sequences. Using default simple-page-master from page-sequence-master "{masterReference}".{{locator}}</message>
   <message key="org.apache.fop.render.rtf.RTFEventProducer.noSPMFound">No simple-page-master could be determined.</message>
diff --git a/src/java/org/apache/fop/render/rtf/RTFFOEventHandlerMaker.java b/src/java/org/apache/fop/render/rtf/RTFFOEventHandlerMaker.java
index a15d206ee..afcfbf702 100644
--- a/src/java/org/apache/fop/render/rtf/RTFFOEventHandlerMaker.java
+++ b/src/java/org/apache/fop/render/rtf/RTFFOEventHandlerMaker.java
@@ -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,8 +35,8 @@ public class RTFFOEventHandlerMaker extends AbstractFOEventHandlerMaker {
         MimeConstants.MIME_RTF,
         MimeConstants.MIME_RTF_ALT1,
         MimeConstants.MIME_RTF_ALT2};
-    
-    
+
+
     /**
      * {@inheritDoc}
      * @param ua FOUserAgent
diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java
index 6171e68b4..1adba9e2b 100644
--- a/src/java/org/apache/fop/render/rtf/RTFHandler.java
+++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java
@@ -213,7 +213,7 @@ public class RTFHandler extends FOEventHandler {
                     RTFEventProducer eventProducer = RTFEventProducer.Provider.get(
                             getUserAgent().getEventBroadcaster());
                     eventProducer.onlySPMSupported(this, reference, pageSeq.getLocator());
-                    PageSequenceMaster master 
+                    PageSequenceMaster master
                         = pageSeq.getRoot().getLayoutMasterSet().getPageSequenceMaster(reference);
                     this.pagemaster = master.getNextSimplePageMaster(
                             false, false, false, false, false);
@@ -306,7 +306,7 @@ public class RTFHandler extends FOEventHandler {
                     contAfter.newAfter(attr);
                 }
                 handled = true;
-            } else if (regionBefore != null 
+            } else if (regionBefore != null
                     && fl.getFlowName().equals(regionBefore.getRegionName())) {
                 bHeaderSpecified = true;
                 bPrevHeaderSpecified = true;
@@ -325,7 +325,7 @@ public class RTFHandler extends FOEventHandler {
                 RtfBefore before = c.newBefore(beforeAttributes);
                 builderContext.pushContainer(before);
                 handled = true;
-            } else if (regionAfter != null 
+            } else if (regionAfter != null
                     && fl.getFlowName().equals(regionAfter.getRegionName())) {
                 bFooterSpecified = true;
                 bPrevFooterSpecified = true;
@@ -371,10 +371,10 @@ public class RTFHandler extends FOEventHandler {
             Region regionAfter = pagemaster.getRegion(Constants.FO_REGION_AFTER);
             if (fl.getFlowName().equals(regionBody.getRegionName())) {
                 //just do nothing
-            } else if (regionBefore != null 
+            } else if (regionBefore != null
                     && fl.getFlowName().equals(regionBefore.getRegionName())) {
                 builderContext.popContainer();
-            } else if (regionAfter != null 
+            } else if (regionAfter != null
                     && fl.getFlowName().equals(regionAfter.getRegionName())) {
                 builderContext.popContainer();
             }
@@ -514,15 +514,15 @@ public class RTFHandler extends FOEventHandler {
             final IRtfTableContainer tc
                 = (IRtfTableContainer)builderContext.getContainer(
                         IRtfTableContainer.class, true, null);
-            
+
             RtfAttributes atts
                 = TableAttributesConverter.convertTableAttributes(tbl);
-            
+
             RtfTable table = tc.newTable(atts, tableContext);
-            
+
             CommonBorderPaddingBackground border = tbl.getCommonBorderPaddingBackground();
             RtfAttributes borderAttributes = new RtfAttributes();
-                    
+
             BorderAttributesConverter.makeBorder(border, CommonBorderPaddingBackground.BEFORE,
                     borderAttributes, ITableAttributes.CELL_BORDER_TOP);
             BorderAttributesConverter.makeBorder(border, CommonBorderPaddingBackground.AFTER,
@@ -531,9 +531,9 @@ public class RTFHandler extends FOEventHandler {
                     borderAttributes, ITableAttributes.CELL_BORDER_LEFT);
             BorderAttributesConverter.makeBorder(border, CommonBorderPaddingBackground.END,
                     borderAttributes,  ITableAttributes.CELL_BORDER_RIGHT);
-            
+
             table.setBorderAttributes(borderAttributes);
-            
+
             builderContext.pushContainer(table);
         } catch (IOException ioe) {
             handleIOTrouble(ioe);
@@ -576,16 +576,16 @@ public class RTFHandler extends FOEventHandler {
              * rest of the document will be rendered. Usage of the
              * TableLayoutManager is not welcome due to design reasons and
              * it also does not provide the correct values.
-             * TODO: Make proportional-column-width working for rtf output 
+             * TODO: Make proportional-column-width working for rtf output
              */
              SimplePercentBaseContext context
                 = new SimplePercentBaseContext(null,
                                                LengthBase.TABLE_UNITS,
                                                100000);
-            
+
             Integer iWidth
                 = new Integer(tc.getColumnWidth().getValue(context) / 1000);
-            
+
             String strWidth = iWidth.toString() + FixedLength.POINT;
             Float width = new Float(
                     FoUnitsConverter.getInstance().convertToTwips(strWidth));
@@ -708,7 +708,7 @@ public class RTFHandler extends FOEventHandler {
         } catch (Exception e) {
             log.error("startPart: " + e.getMessage());
             throw new RuntimeException(e.getMessage());
-        }        
+        }
     }
 
     private void endPart(TablePart tb) {
@@ -724,10 +724,10 @@ public class RTFHandler extends FOEventHandler {
         } catch (Exception e) {
             log.error("endPart: " + e.getMessage());
             throw new RuntimeException(e.getMessage());
-        }        
+        }
     }
 
-    
+
      /**
      * {@inheritDoc}
      */
@@ -735,7 +735,7 @@ public class RTFHandler extends FOEventHandler {
         startPart(body);
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -782,7 +782,7 @@ public class RTFHandler extends FOEventHandler {
         if (bDefer) {
             return;
         }
-        
+
         try {
             TableContext tctx = builderContext.getTableContext();
             final RtfTableRow row = (RtfTableRow)builderContext.getContainer(RtfTableRow.class,
@@ -795,11 +795,11 @@ public class RTFHandler extends FOEventHandler {
                 RtfTableCell vCell = row.newTableCellMergedVertically(
                         (int)tctx.getColumnWidth(),
                         tctx.getColumnRowSpanningAttrs());
-                
+
                 if (!tctx.getFirstSpanningCol()) {
                     vCell.setHMerge(RtfTableCell.MERGE_WITH_PREVIOUS);
                 }
-                
+
                 tctx.selectNextColumn();
             }
         } catch (IOException ioe) {
@@ -837,11 +837,11 @@ public class RTFHandler extends FOEventHandler {
                 RtfTableCell vCell = row.newTableCellMergedVertically(
                         (int)tctx.getColumnWidth(),
                         tctx.getColumnRowSpanningAttrs());
-                
+
                 if (!tctx.getFirstSpanningCol()) {
                     vCell.setHMerge(RtfTableCell.MERGE_WITH_PREVIOUS);
                 }
-                
+
                 tctx.selectNextColumn();
             }
 
@@ -851,14 +851,14 @@ public class RTFHandler extends FOEventHandler {
             // create an RtfTableCell in the current RtfTableRow
             RtfAttributes atts = TableAttributesConverter.convertCellAttributes(tc);
             RtfTableCell cell = row.newTableCell((int)width, atts);
-            
+
             //process number-rows-spanned attribute
             if (numberRowsSpanned > 1) {
                 // Start vertical merge
                 cell.setVMerge(RtfTableCell.MERGE_START);
 
                 // set the number of rows spanned
-                tctx.setCurrentColumnRowSpanning(new Integer(numberRowsSpanned), 
+                tctx.setCurrentColumnRowSpanning(new Integer(numberRowsSpanned),
                         cell.getRtfAttributes());
             } else {
                 tctx.setCurrentColumnRowSpanning(
@@ -870,23 +870,23 @@ public class RTFHandler extends FOEventHandler {
                 // Get the number of columns spanned
                 RtfTable table = row.getTable();
                 tctx.setCurrentFirstSpanningCol(true);
-                
+
                 // We widthdraw one cell because the first cell is already created
                 // (it's the current cell) !
                  for (int i = 0; i < numberColumnsSpanned - 1; ++i) {
                     tctx.selectNextColumn();
-                    
+
                     tctx.setCurrentFirstSpanningCol(false);
                     RtfTableCell hCell = row.newTableCellMergedHorizontally(
                             0, null);
-                    
+
                     if (numberRowsSpanned > 1) {
                         // Start vertical merge
                         hCell.setVMerge(RtfTableCell.MERGE_START);
 
                         // set the number of rows spanned
                         tctx.setCurrentColumnRowSpanning(
-                                new Integer(numberRowsSpanned), 
+                                new Integer(numberRowsSpanned),
                                 cell.getRtfAttributes());
                     } else {
                         tctx.setCurrentColumnRowSpanning(
@@ -894,7 +894,7 @@ public class RTFHandler extends FOEventHandler {
                     }
                 }
             }
-            
+
             builderContext.pushContainer(cell);
         } catch (IOException ioe) {
             handleIOTrouble(ioe);
@@ -962,12 +962,12 @@ public class RTFHandler extends FOEventHandler {
         if (bDefer) {
             return;
         }
-        
+
         // create an RtfListItem in the current RtfList
         try {
             RtfList list = (RtfList)builderContext.getContainer(
                     RtfList.class, true, this);
-            
+
             /**
              * If the current list already contains a list item, then close the
              * list and open a new one, so every single list item gets its own
@@ -981,11 +981,11 @@ public class RTFHandler extends FOEventHandler {
                 this.endList((ListBlock) li.getParent());
                 this.startList((ListBlock) li.getParent());
                 this.startListBody();
-                
+
                 list = (RtfList)builderContext.getContainer(
                         RtfList.class, true, this);
-            }            
-            
+            }
+
             builderContext.pushContainer(list.newListItem());
         } catch (IOException ioe) {
             handleIOTrouble(ioe);
@@ -1136,7 +1136,7 @@ public class RTFHandler extends FOEventHandler {
             FOUserAgent userAgent = eg.getUserAgent();
             ImageManager manager = userAgent.getFactory().getImageManager();
             info = manager.getImageInfo(uri, userAgent.getImageSessionContext());
-            
+
             putGraphic(eg, info);
         } catch (ImageException ie) {
             ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
@@ -1160,18 +1160,18 @@ public class RTFHandler extends FOEventHandler {
         if (bDefer) {
             return;
         }
-        
+
         try {
             XMLObj child = (XMLObj) ifo.getChildXMLObj();
             Document doc = child.getDOMDocument();
             String ns = child.getNamespaceURI();
-            
+
             ImageInfo info = new ImageInfo(null, null);
             // Set the resolution to that of the FOUserAgent
             FOUserAgent ua = ifo.getUserAgent();
             ImageSize size = new ImageSize();
             size.setResolution(ua.getSourceResolution());
-            
+
             // Set the image size to the size of the svg.
             Point2D csize = new Point2D.Float(-1, -1);
             Point2D intrinsicDimensions = child.getDimension(csize);
@@ -1188,12 +1188,12 @@ public class RTFHandler extends FOEventHandler {
             info.setSize(size);
 
             ImageXMLDOM image = new ImageXMLDOM(info, doc, ns);
-            
+
             FOUserAgent userAgent = ifo.getUserAgent();
             ImageManager manager = userAgent.getFactory().getImageManager();
             Image converted = manager.convertImage(image, FLAVORS);
             putGraphic(ifo, converted);
-            
+
         } catch (ImageException ie) {
             ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
@@ -1208,14 +1208,14 @@ public class RTFHandler extends FOEventHandler {
     private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
         ImageFlavor.RAW_EMF, ImageFlavor.RAW_PNG, ImageFlavor.RAW_JPEG
     };
-    
+
     /**
      * Puts a graphic/image into the generated RTF file.
      * @param abstractGraphic the graphic (external-graphic or instream-foreign-object)
      * @param info the image info object
      * @throws IOException In case of an I/O error
      */
-    private void putGraphic(AbstractGraphics abstractGraphic, ImageInfo info) 
+    private void putGraphic(AbstractGraphics abstractGraphic, ImageInfo info)
             throws IOException {
         try {
             FOUserAgent userAgent = abstractGraphic.getUserAgent();
@@ -1231,17 +1231,17 @@ public class RTFHandler extends FOEventHandler {
             eventProducer.imageError(this, null, ie, null);
         }
     }
-    
+
     /**
      * Puts a graphic/image into the generated RTF file.
      * @param abstractGraphic the graphic (external-graphic or instream-foreign-object)
      * @param image the image
      * @throws IOException In case of an I/O error
      */
-    private void putGraphic(AbstractGraphics abstractGraphic, Image image) 
+    private void putGraphic(AbstractGraphics abstractGraphic, Image image)
             throws IOException {
         byte[] rawData = null;
-        
+
         ImageInfo info = image.getInfo();
 
         if (image instanceof ImageRawStream) {
@@ -1266,7 +1266,7 @@ public class RTFHandler extends FOEventHandler {
                 IRtfTextrunContainer.class, true, this);
 
         final RtfExternalGraphic rtfGraphic = c.getTextrun().newImage();
-   
+
         //set URL
         if (info.getOriginalURI() != null) {
             rtfGraphic.setURL(info.getOriginalURI());
@@ -1341,7 +1341,7 @@ public class RTFHandler extends FOEventHandler {
             }
         }
     }
-    
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
index a28d91d36..764c2c93e 100644
--- a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
+++ b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
@@ -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.
@@ -64,7 +64,7 @@ public final class TableAttributesConverter {
     //////////////////////////////////////////////////
     /**
      * Converts table-only attributes to rtf attributes.
-     * 
+     *
      * @param attrs Given attributes
      * @param defaultAttributes Default rtf attributes
      *
@@ -75,14 +75,14 @@ public final class TableAttributesConverter {
     static RtfAttributes convertTableAttributes(Table fobj)
             throws FOPException {
         FOPRtfAttributes attrib = new FOPRtfAttributes();
-        attrib.setTwips(ITableAttributes.ATTR_ROW_LEFT_INDENT, 
+        attrib.setTwips(ITableAttributes.ATTR_ROW_LEFT_INDENT,
                 fobj.getCommonMarginBlock().marginLeft);
         return attrib;
     }
 
     /**
      * Converts table-only attributes to rtf attributes.
-     * 
+     *
      * @param attrs Given attributes
      * @param defaultAttributes Default rtf attributes
      *
@@ -109,7 +109,7 @@ public final class TableAttributesConverter {
 
         //Property p;
         //RtfColorTable colorTable = RtfColorTable.getInstance();
-        
+
         FOPRtfAttributes attrib = new FOPRtfAttributes();
 
         //boolean isBorderPresent = false;
@@ -121,7 +121,7 @@ public final class TableAttributesConverter {
             //If there is no background-color specified for the cell,
             //then try to read it from table-row or table-header.
             CommonBorderPaddingBackground brd = null;
-            
+
             if (fobj.getParent() instanceof TableRow) {
                 TableRow parentRow = (TableRow)fobj.getParent();
                 brd = parentRow.getCommonBorderPaddingBackground();
@@ -131,20 +131,20 @@ public final class TableAttributesConverter {
                 brd = parentHeader.getCommonBorderPaddingBackground();
                 color = brd.backgroundColor;
             }
-            
+
             if (color == null
-                    && fobj.getParent() != null 
-                    && fobj.getParent().getParent() != null 
+                    && fobj.getParent() != null
+                    && fobj.getParent().getParent() != null
                     && fobj.getParent().getParent().getParent() instanceof Table) {
 
                 Table table = (Table)fobj.getParent().getParent().getParent();
                 brd = table.getCommonBorderPaddingBackground();
                 color = brd.backgroundColor;
             }
-            
-            
+
+
         }
-        if ((color != null) 
+        if ((color != null)
                 && (color.getAlpha() != 0
                         || color.getRed() != 0
                         || color.getGreen() != 0
@@ -198,13 +198,13 @@ public final class TableAttributesConverter {
             attrib.setTwips(ITableAttributes.ATTR_CELL_PADDING_BOTTOM, padding);
             attrib.set(ITableAttributes.ATTR_CELL_U_PADDING_BOTTOM, 3 /*=twips*/);
         }
-        
+
         int n = fobj.getNumberColumnsSpanned();
         // Column spanning :
         if (n > 1) {
             attrib.set(ITableAttributes.COLUMN_SPAN, n);
         }
-        
+
         switch (fobj.getDisplayAlign()) {
         case Constants.EN_BEFORE:
             attrib.set(ITableAttributes.ATTR_CELL_VERT_ALIGN_TOP);
@@ -328,7 +328,7 @@ public final class TableAttributesConverter {
             isBorderPresent = true;
         }
 
-        //Currently there is only one border width supported in each cell.  
+        //Currently there is only one border width supported in each cell.
         p = fobj.getProperty(Constants.PR_BORDER_LEFT_WIDTH);
         if(p == null) {
             p = fobj.getProperty(Constants.PR_BORDER_RIGHT_WIDTH);
diff --git a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
index d40c6a826..792193b15 100644
--- a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
+++ b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
@@ -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,13 +52,13 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText;
  *  @author rmarra
  */
 final class TextAttributesConverter {
-    
+
     /**
      * Constructor is private, because it's just a utility class.
      */
     private TextAttributesConverter() {
     }
-    
+
     /**
      * Converts all known text FO properties to RtfAttributes
      * @param props list of FO properites, which are to be converted
@@ -106,7 +106,7 @@ final class TextAttributesConverter {
         attrBaseLineShift(fobj.getBaseLineShift(), attrib);
         return attrib;
     }
-    
+
     /**
      * Converts all character related FO properties to RtfAttributes.
      * @param fobj FObj whose properties are to be converted
@@ -150,7 +150,7 @@ final class TextAttributesConverter {
         } else {
             rtfAttr.set("b", 0);
         }
-        
+
         if (font.getFontStyle() == Constants.EN_ITALIC) {
             rtfAttr.set(RtfText.ATTR_ITALIC, 1);
         } else {
@@ -176,20 +176,20 @@ final class TextAttributesConverter {
 
 
 
-    private static void attrTextDecoration(CommonTextDecoration textDecoration, 
+    private static void attrTextDecoration(CommonTextDecoration textDecoration,
                 RtfAttributes rtfAttr) {
         if (textDecoration == null) {
             rtfAttr.set(RtfText.ATTR_UNDERLINE, 0);
             rtfAttr.set(RtfText.ATTR_STRIKETHROUGH, 0);
             return;
         }
-                
+
         if (textDecoration.hasUnderline()) {
             rtfAttr.set(RtfText.ATTR_UNDERLINE, 1);
         } else {
             rtfAttr.set(RtfText.ATTR_UNDERLINE, 0);
         }
-        
+
         if (textDecoration.hasLineThrough()) {
             rtfAttr.set(RtfText.ATTR_STRIKETHROUGH, 1);
         } else {
@@ -198,9 +198,9 @@ final class TextAttributesConverter {
     }
 
     private static void attrBlockMargin(CommonMarginBlock cmb, FOPRtfAttributes rtfAttr) {
-        rtfAttr.setTwips(RtfText.SPACE_BEFORE, 
+        rtfAttr.setTwips(RtfText.SPACE_BEFORE,
                 cmb.spaceBefore.getOptimum(null).getLength());
-        rtfAttr.setTwips(RtfText.SPACE_AFTER, 
+        rtfAttr.setTwips(RtfText.SPACE_AFTER,
                 cmb.spaceAfter.getOptimum(null).getLength());
         rtfAttr.setTwips(RtfText.LEFT_INDENT_BODY, cmb.startIndent);
         rtfAttr.setTwips(RtfText.RIGHT_INDENT_BODY, cmb.endIndent);
@@ -283,20 +283,20 @@ final class TextAttributesConverter {
             CommonBorderPaddingBackground commonBorderPaddingBackground = null;
             if (node instanceof Block) {
                 Block block = (Block) node;
-                commonBorderPaddingBackground = block.getCommonBorderPaddingBackground(); 
-            } else if (node instanceof BlockContainer) { 
+                commonBorderPaddingBackground = block.getCommonBorderPaddingBackground();
+            } else if (node instanceof BlockContainer) {
                 BlockContainer container = (BlockContainer) node;
                 commonBorderPaddingBackground = container.getCommonBorderPaddingBackground();
-            } 
+            }
 
-            if (commonBorderPaddingBackground != null 
+            if (commonBorderPaddingBackground != null
                     && commonBorderPaddingBackground.hasBorder()) {
                 return true;
             }
 
             node = node.getParent();
         }
-        return false; 
+        return false;
     }
 
     /** Adds inline border information from <code>bpb</code> to <code>rtrAttr</code>. */
@@ -313,7 +313,7 @@ final class TextAttributesConverter {
      * @param bl the Block object the properties are read from
      * @param rtfAttr the RtfAttributes object the attributes are written to
      */
-    private static void attrBackgroundColor(CommonBorderPaddingBackground bpb, 
+    private static void attrBackgroundColor(CommonBorderPaddingBackground bpb,
                 RtfAttributes rtfAttr) {
         Color fopValue = bpb.backgroundColor;
         int rtfColor = 0;
@@ -334,11 +334,11 @@ final class TextAttributesConverter {
 
         rtfAttr.set(RtfText.ATTR_BACKGROUND_COLOR, rtfColor);
    }
-    
+
    private static void attrBaseLineShift(Length baselineShift, RtfAttributes rtfAttr) {
-       
+
        int s = baselineShift.getEnum();
-       
+
        if (s == Constants.EN_SUPER) {
            rtfAttr.set(RtfText.ATTR_SUPERSCRIPT);
        } else if (s == Constants.EN_SUB) {
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java
index d1fd0192e..71bc9ed88 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java
index f3502b4aa..7b8a22df2 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IBorderAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IBorderAttributes.java
index 0e9820994..5b3153b15 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IBorderAttributes.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IBorderAttributes.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java
index 6afba3ba1..2fff24afa 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java
index 7966010b6..87beb24d8 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java
index afbbba04b..957ce62f6 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java
index 568c33996..14486d8d1 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java
index 9bc096e7a..194d25653 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java
index d341f80fe..743b10e85 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java
index 7e2936ea8..890e00760 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java
index e620ff996..2083f9b6e 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java
index 6c49e7c08..d30bbb173 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java
index a7cca6dcf..299ff2169 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java
index 16f4a4af3..dba341700 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java
index 1aa5820fb..77832cac2 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java
index f2c9b0aa6..f940d9dec 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java
index 74a50b8b5..c2b78e8a8 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java
index a61edf803..afa62807f 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java
index 1545df320..0522cdf10 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java
index 58ca07196..528c05e70 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java
@@ -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.
@@ -31,7 +31,7 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTextrun;
  */
 
 public interface IRtfTextrunContainer {
-    
+
     /**
      * Returns the current RtfTextrun object.
      * Opens a new one if necessary.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java
index e96fbbe30..87f7fe520 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java
@@ -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.
@@ -45,13 +45,13 @@ public interface ITableAttributes {
 
     /** half the space between the cells of a table row in twips */
     String ATTR_RTF_15_TRGAPH = "trgaph";
-    
+
     /**
      *  Position of the leftmost edge of the table with respect to the
      * left edge of its column
      */
     String ATTR_ROW_LEFT_INDENT = "trleft";
-    
+
     /** table row header */
     String ATTR_HEADER = "trhdr";
 
@@ -140,7 +140,7 @@ public interface ITableAttributes {
 //Table row attributes
     /** row attribute, keep-together */
     String ROW_KEEP_TOGETHER = "trkeep";
-    
+
     /** Height of a table row in twips */
     String ROW_HEIGHT = "trrh";
 
@@ -206,5 +206,5 @@ public interface ITableAttributes {
      */
     String[] CELL_VERT_ALIGN = {
         ATTR_CELL_VERT_ALIGN_TOP, ATTR_CELL_VERT_ALIGN_CENTER, ATTR_CELL_VERT_ALIGN_BOTTOM};
-    
+
 }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java
index d94563c69..dc0e559cc 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java
@@ -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.
@@ -50,9 +50,9 @@ public interface ITableColumnsInfo {
 
     /** @return number of columns */
     int getNumberOfColumns();
-    
+
     /**
-     * 
+     *
      * @return true, if it's the first of multiple spanning columns
      */
     boolean getFirstSpanningCol();
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java
index 5a8b6a5b9..a02825b3c 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java
index 79171cb47..aec0237e5 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java
index 75abb5fbb..078439306 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
index f71075d96..5fbde8d3e 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
@@ -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.
@@ -123,7 +123,7 @@ implements IRtfParagraphContainer, IRtfExternalGraphicContainer, IRtfTableContai
         table = new RtfTable(this, writer, tc);
         return table;
     }
-    
+
     public RtfTextrun getTextrun()
     throws IOException {
         return RtfTextrun.getTextrun(this, writer, null);
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java
index 92d6a5655..2eb95b587 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java
@@ -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.
@@ -215,17 +215,17 @@ implements java.lang.Cloneable {
             xslAttributes = new org.xml.sax.helpers.AttributesImpl(pAttribs);
         }
     }
-    
+
     /**
      * Add integer value <code>addValue</code> to attribute with name <code>name</code>.
-     * If there is no such setted attribute, then value of this attribure is equal to 
+     * If there is no such setted attribute, then value of this attribure is equal to
      * <code>addValue</code>.
      * @param addValue the increment of value
      * @param name the name of attribute
      */
     public void addIntegerValue(int addValue, String name) {
         Integer value = (Integer) getValue(name);
-        int v = (value != null) ? value.intValue() : 0; 
+        int v = (value != null) ? value.intValue() : 0;
         set(name, v + addValue);
     }
 }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java
index c48d50ec9..0828be238 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java
index 23883f672..f691c211c 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java
index 986e79c0c..3eee4cd71 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
index 641202c99..8df7bd7b2 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
@@ -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.
@@ -158,7 +158,7 @@ public final class RtfColorTable {
             //The color currently does not exist, so add it to the table.
             //First add it, then read the size as index (to return it).
             //So the first added color gets index 1. That is OK, because
-            //index 0 is reserved for auto-colored. 
+            //index 0 is reserved for auto-colored.
             addColor (identifier);
 
             retVal = colorTable.size ();
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java
index a3db213c4..5a6b1d6ed 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java
index 3e37ec9d7..6204e2ac2 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java
index 3e64a0f7d..3f1e2f7e1 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java
@@ -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.
@@ -97,7 +97,7 @@ public abstract class RtfElement {
     public void newLine() throws IOException {
         writer.write("\n");
     }
-    
+
     /**
      * Write an RTF control word to our Writer
      * @param word RTF control word to write
@@ -224,7 +224,7 @@ public abstract class RtfElement {
             writeControlWord(cw);
             writeAttributes((RtfAttributes) value, null);
             return;
-        }        
+        }
         writeControlWord(cw);
     }
 
@@ -246,7 +246,7 @@ public abstract class RtfElement {
             writeControlWord(cw);
             writeAttributes((RtfAttributes) value, null);
             return;
-        }        
+        }
         writeControlWordNS(cw);
     }
 
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
index 932198676..182894ea5 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
@@ -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.
@@ -65,7 +65,7 @@ public class RtfExternalGraphic extends RtfElement {
             super(reason);
         }
     }
-    
+
     //////////////////////////////////////////////////
     // Supported Formats
     //////////////////////////////////////////////////
@@ -83,7 +83,7 @@ public class RtfExternalGraphic extends RtfElement {
         public static boolean isFormat(byte[] data) {
             return false;
         }
-        
+
         /**
          * Convert image data if necessary - for example when format is not supported by rtf.
          *
@@ -93,7 +93,7 @@ public class RtfExternalGraphic extends RtfElement {
         public FormatBase convert(FormatBase format, byte[] data) {
             return format;
         }
-        
+
         /**
          * Determine image file format.
          *
@@ -118,7 +118,7 @@ public class RtfExternalGraphic extends RtfElement {
                 return null;
             }
         }
-        
+
         /**
          * Get image type.
          *
@@ -127,7 +127,7 @@ public class RtfExternalGraphic extends RtfElement {
         public int getType() {
             return ImageConstants.I_NOT_SUPPORTED;
         }
-        
+
         /**
          * Get rtf tag.
          *
@@ -137,7 +137,7 @@ public class RtfExternalGraphic extends RtfElement {
             return "";
         }
     }
-    
+
     private static class FormatGIF extends FormatBase {
         public static boolean isFormat(byte[] data) {
             // Indentifier "GIF8" on position 0
@@ -145,12 +145,12 @@ public class RtfExternalGraphic extends RtfElement {
 
             return ImageUtil.compareHexValues(pattern, data, 0, true);
         }
-        
+
         public int getType() {
             return ImageConstants.I_GIF;
         }
     }
-    
+
     private static class FormatEMF extends FormatBase {
         public static boolean isFormat(byte[] data) {
             // No offical Indentifier known
@@ -158,28 +158,28 @@ public class RtfExternalGraphic extends RtfElement {
 
             return ImageUtil.compareHexValues(pattern, data, 0, true);
         }
-        
+
         public int getType() {
             return ImageConstants.I_EMF;
         }
-        
+
         public String getRtfTag() {
             return "emfblip";
         }
     }
-    
+
     private  static class FormatBMP extends FormatBase {
         public static boolean isFormat(byte[] data) {
             byte [] pattern = new byte [] {(byte) 0x42, (byte) 0x4D};
 
             return ImageUtil.compareHexValues(pattern, data, 0, true);
         }
-        
+
         public int getType() {
             return ImageConstants.I_BMP;
         }
     }
-    
+
     private static class FormatJPG extends FormatBase {
         public static boolean isFormat(byte[] data) {
             // Indentifier "0xFFD8" on position 0
@@ -187,16 +187,16 @@ public class RtfExternalGraphic extends RtfElement {
 
             return ImageUtil.compareHexValues(pattern, data, 0, true);
         }
-      
+
         public int getType() {
             return ImageConstants.I_JPG;
         }
-        
+
         public String getRtfTag() {
             return "jpegblip";
         }
     }
-    
+
     private static class FormatPNG extends FormatBase {
         public static boolean isFormat(byte[] data) {
             // Indentifier "PNG" on position 1
@@ -204,16 +204,16 @@ public class RtfExternalGraphic extends RtfElement {
 
             return ImageUtil.compareHexValues(pattern, data, 1, true);
         }
-        
+
         public int getType() {
             return ImageConstants.I_PNG;
         }
-        
+
         public String getRtfTag() {
             return "pngblip";
         }
     }
-    
+
     //////////////////////////////////////////////////
     // @@ Members
     //////////////////////////////////////////////////
@@ -370,7 +370,7 @@ public class RtfExternalGraphic extends RtfElement {
                 throw new ExternalGraphicException("The attribute 'src' of "
                         + "<fo:external-graphic> has a invalid value: '"
                         + url + "' (" + e + ")");
-            }            
+            }
         }
 
         if (imagedata == null) {
@@ -383,8 +383,8 @@ public class RtfExternalGraphic extends RtfElement {
         if (imageformat != null) {
             imageformat = imageformat.convert(imageformat, imagedata);
         }
-        
-        if (imageformat == null 
+
+        if (imageformat == null
                 || imageformat.getType() == ImageConstants.I_NOT_SUPPORTED
                 || "".equals(imageformat.getRtfTag())) {
             throw new ExternalGraphicException("The tag <fo:external-graphic> "
@@ -465,17 +465,17 @@ public class RtfExternalGraphic extends RtfElement {
             }
         } else if (imageformat.getType() == ImageConstants.I_EMF) {
             int i = 0;
-            
+
             i = ImageUtil.getIntFromByteArray(imagedata, 151, 4, false);
             if (i != 0 ) {
-                width = i; 
+                width = i;
             }
-            
+
             i = ImageUtil.getIntFromByteArray(imagedata, 155, 4, false);
             if (i != 0 ) {
                 height = i;
             }
-            
+
         }
     }
 
@@ -557,7 +557,7 @@ public class RtfExternalGraphic extends RtfElement {
             this.scaleUniform = true;
         }
     }
-    
+
     /**
      * Sets the binary imagedata of the image.
      *
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
index 73f5cfa37..631f2d901 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java
index fa0728533..d5eaa304d 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java
@@ -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.
@@ -109,7 +109,7 @@ extends RtfContainer {
 
         return listTable;
     }
-    
+
     /**
      * Get the list table.
      * @return the RtfListTable
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
index 26c95e200..06dbaccd5 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
@@ -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.
@@ -169,7 +169,7 @@ public final class RtfFontManager {
     private String getFontKey(String family) {
         return family.toLowerCase();
     }
-    
+
     /**
      * Adds a font to the table.
      *
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java
index 33a8169f8..c64f27377 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java
index d91a63c0e..f3b2ebf72 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java
@@ -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.
@@ -49,7 +49,7 @@ public class RtfFootnote extends RtfContainer
         if (bBody) {
             RtfTextrun textrun = RtfTextrun.getTextrun(body, writer, null);
             textrun.setSuppressLastPar(true);
-            
+
             return textrun;
         } else {
             return textrunInline;
@@ -62,16 +62,16 @@ public class RtfFootnote extends RtfContainer
     */
     protected void writeRtfContent() throws IOException {
         textrunInline.writeRtfContent();
-        
+
         writeGroupMark(true);
         writeControlWord("footnote");
-        writeControlWord("ftnalt");      
-        
+        writeControlWord("ftnalt");
+
         body.writeRtfContent();
-        
+
         writeGroupMark(false);
     }
-    
+
     public RtfList newList(RtfAttributes attrs) throws IOException {
         if (list != null) {
             list.close();
@@ -81,11 +81,11 @@ public class RtfFootnote extends RtfContainer
 
         return list;
     }
-    
+
     public void startBody() {
         bBody = true;
     }
-    
+
     public void endBody() {
         bBody = false;
     }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java
index 8e07ae86a..1dd00c66d 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java
@@ -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.
@@ -31,7 +31,7 @@ public class RtfGenerator extends RtfElement {
     public RtfGenerator(RtfHeader h, Writer w) throws IOException {
         super(h, w);
     }
-    
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java
index 7e75e97f5..2554cad38 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java
@@ -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.
@@ -60,7 +60,7 @@ class RtfHeader extends RtfContainer {
         RtfTemplate.getInstance().writeTemplate(this);
         RtfStyleSheetTable.getInstance().writeStyleSheet(this);
         writeFootnoteProperties();
-        
+
     }
 
     /** write user properties if any */
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
index 4924e6829..cd80c6993 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
@@ -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.
@@ -70,7 +70,7 @@ implements IRtfTextContainer,
         super ((RtfContainer) parent, writer, attr);
         new RtfText (this, writer, str, attr);
     }
-    
+
     public RtfHyperLink (RtfTextrun parent, Writer writer, RtfAttributes attr)
         throws IOException {
         super ((RtfContainer) parent, writer, attr);
@@ -216,7 +216,7 @@ implements IRtfTextContainer,
     public boolean isEmpty () {
         return false;
     }
-    
+
     public RtfTextrun getTextrun()
     throws IOException {
         RtfTextrun textrun = RtfTextrun.getTextrun(this, writer, null);
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java
index d018e52a0..d7b77f633 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java
index cce3d8697..4073302ce 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java
index a559c4c61..f44199bee 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java
@@ -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.
@@ -60,7 +60,7 @@ public class RtfList extends RtfContainer {
 
         // find out if we are nested in a table
         hasTableParent = this.getParentOfClass(RtfTable.class) != null;
-        
+
         this.setRtfListStyle(new RtfListStyleBullet());
     }
 
@@ -84,7 +84,7 @@ public class RtfList extends RtfContainer {
     public Integer getListId() {
         return listId;
     }
-    
+
     /**
      * Returns the Id of the list template.
      * @return Id of the list template
@@ -92,7 +92,7 @@ public class RtfList extends RtfContainer {
     public Integer getListTemplateId() {
         return listTemplateId;
     }
-    
+
     /**
      * Change list style
      * @param ls ListStyle to set
@@ -108,7 +108,7 @@ public class RtfList extends RtfContainer {
     public RtfListStyle getRtfListStyle() {
         return defaultListStyle;
     }
-    
+
     /**
      * Returns true, if the list has a parent table.
      * @return true, if the list has a parent table
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
index 3638dc11f..14b4b486f 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
@@ -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.
@@ -45,7 +45,7 @@ public class RtfListItem extends RtfContainer
     private RtfListStyle listStyle;
     private int number = 0;
 
-    /** 
+    /**
      * special RtfParagraph that writes list item setup code before its content
      */
     private class RtfListItemParagraph extends RtfParagraph {
@@ -61,21 +61,21 @@ public class RtfListItem extends RtfContainer
         }
     }
 
-    /** 
+    /**
      * special RtfTextrun that is used as list item label
      */
     public class RtfListItemLabel extends RtfTextrun implements IRtfTextrunContainer {
-        
+
         private RtfListItem rtfListItem;
-        
+
         /**
          * Constructs the RtfListItemLabel
          * @param item The RtfListItem the label belongs to
          * @throws IOException Thrown when an IO-problem occurs
          */
         public RtfListItemLabel(RtfListItem item) throws IOException {
-            super(null, item.writer, null); 
-            
+            super(null, item.writer, null);
+
             rtfListItem = item;
         }
 
@@ -88,14 +88,14 @@ public class RtfListItem extends RtfContainer
         public RtfTextrun getTextrun() throws IOException {
             return this;
         }
-        
+
         /**
          * Sets the content of the list item label.
          * @param s Content of the list item label.
          * @throws IOException Thrown when an IO-problem occurs
          */
         public void addString(String s) throws IOException {
-            
+
             final String label = s.trim();
             if (label.length() > 0 && Character.isDigit(label.charAt(0))) {
                 rtfListItem.setRtfListStyle(new RtfListStyleNumber());
@@ -151,7 +151,7 @@ public class RtfListItem extends RtfContainer
         textrun.setRtfListItem(this);
         return textrun;
     }
-    
+
     /**
      * Start a new list after closing current paragraph, list and table
      * @param attrs attributes of new RftList object
@@ -162,22 +162,22 @@ public class RtfListItem extends RtfContainer
         RtfList list = new RtfList(this, writer, attrs);
         return list;
     }
-    
+
     /**
      * Overridden to setup the list: start a group with appropriate attributes
      * @throws IOException for I/O problems
      */
     protected void writeRtfPrefix() throws IOException {
-       
+
         // pard causes word97 (and sometimes 2000 too) to crash if the list is nested in a table
         if (!parentList.getHasTableParent()) {
             writeControlWord("pard");
         }
 
-        writeOneAttribute(RtfText.LEFT_INDENT_FIRST, 
+        writeOneAttribute(RtfText.LEFT_INDENT_FIRST,
                 "360"); //attrib.getValue(RtfListTable.LIST_INDENT));
-            
-        writeOneAttribute(RtfText.LEFT_INDENT_BODY, 
+
+        writeOneAttribute(RtfText.LEFT_INDENT_BODY,
                 attrib.getValue(RtfText.LEFT_INDENT_BODY));
 
         // group for list setup info
@@ -191,7 +191,7 @@ public class RtfListItem extends RtfContainer
         writeGroupMark(false);
         writeOneAttribute(RtfListTable.LIST_NUMBER, new Integer(number));
     }
-    
+
     /**
      * End the list group
      * @throws IOException for I/O problems
@@ -202,20 +202,20 @@ public class RtfListItem extends RtfContainer
         /* reset paragraph defaults to make sure list ends
          * but pard causes word97 (and sometimes 2000 too) to crash if the list
          * is nested in a table
-         */ 
+         */
         if (!parentList.getHasTableParent()) {
             writeControlWord("pard");
         }
-        
+
     }
-       
+
     /**
      * Change list style
      * @param ls ListStyle to set
      */
     public void setRtfListStyle(RtfListStyle ls) {
         listStyle = ls;
-        
+
         listStyle.setRtfListItem(this);
         number = getRtfFile().getListTable().addRtfListStyle(ls);
     }
@@ -223,7 +223,7 @@ public class RtfListItem extends RtfContainer
     /**
      * Get list style
      * @return ListSytle of the List
-     */    
+     */
     public RtfListStyle getRtfListStyle() {
         if (listStyle == null) {
             return parentList.getRtfListStyle();
@@ -231,7 +231,7 @@ public class RtfListItem extends RtfContainer
             return listStyle;
         }
     }
-    
+
     /**
      * Get the parent list.
      * @return the parent list
@@ -239,7 +239,7 @@ public class RtfListItem extends RtfContainer
     public RtfList getParentList() {
         return parentList;
     }
-    
+
     /**
      * Returns the list number
      * @return list number
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java
index 7ae121c3f..e0f85ee88 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java
@@ -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.
@@ -37,7 +37,7 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfElement;
  */
 public class RtfListStyle {
     private RtfListItem rtfListItem;
-    
+
     /**
      * Sets the RtfListItem this style belongs to.
      * @param item RtfListItem this style belongs to
@@ -45,7 +45,7 @@ public class RtfListStyle {
     public void setRtfListItem(RtfListItem item) {
         rtfListItem = item;
     }
-    
+
     /**
      * Gets the RtfListItem this style belongs to.
      * @return RtfListItem this style belongs to
@@ -83,7 +83,7 @@ public class RtfListStyle {
      * Gets called when the list table has to be written.
      * @param element RtfElement in whose context is to be written
      * @throws IOException Thrown when an IO-problem occurs.
-     */        
+     */
     public void writeLevelGroup(RtfElement element)
     throws IOException {
     }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java
index 15ffc9163..958f359a1 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java
@@ -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 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfElement;
  * Class to handle bullet list style.
  */
 public class RtfListStyleBullet extends RtfListStyle {
-    
+
     /**
      * Gets called before a RtfListItem has to be written.
      * @param item RtfListItem whose prefix has to be written
@@ -73,7 +73,7 @@ public class RtfListStyleBullet extends RtfListStyle {
 
     /**
      * Gets called when the list table has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -83,12 +83,12 @@ public class RtfListStyleBullet extends RtfListStyle {
         element.writeGroupMark(true);
         element.writeOneAttributeNS(RtfListTable.LIST_TEXT_FORM, "\\'01\\'b7");
         element.writeGroupMark(false);
-            
+
         element.writeGroupMark(true);
         element.writeOneAttributeNS(RtfListTable.LIST_NUM_POSITION, null);
         element.writeGroupMark(false);
-            
+
         element.attrib.set(RtfListTable.LIST_FONT_TYPE, 2);
     }
-       
+
 }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java
index 926614f8a..6d35fee95 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java
@@ -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 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfElement;
  * Class to handle number list style.
  */
 public class RtfListStyleNumber extends RtfListStyle {
-    
+
     /**
      * Gets called before a RtfListItem has to be written.
      * @param item RtfListItem whose prefix has to be written
@@ -54,10 +54,10 @@ public class RtfListStyleNumber extends RtfListStyle {
                 item.attrib.getValue(RtfListTable.LIST_INDENT));
         item.writeControlWord("pntxta.");
     }
-    
+
     /**
      * Gets called before a paragraph, which is contained by a RtfListItem has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -71,10 +71,10 @@ public class RtfListStyleNumber extends RtfListStyle {
         element.writeControlWord("tab");
         element.writeGroupMark(false);
     }
-    
+
     /**
      * Gets called when the list table has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -84,17 +84,17 @@ public class RtfListStyleNumber extends RtfListStyle {
         element.writeOneAttributeNS(
                 RtfListTable.LIST_START_AT, new Integer(1));
         element.attrib.set(RtfListTable.LIST_NUMBER_TYPE, 0);
-        
+
         element.writeGroupMark(true);
         element.writeOneAttributeNS(
                 RtfListTable.LIST_TEXT_FORM, "\\'03\\\'00. ;");
         element.writeGroupMark(false);
-            
+
         element.writeGroupMark(true);
         element.writeOneAttributeNS(
                 RtfListTable.LIST_NUM_POSITION, "\\'01;");
         element.writeGroupMark(false);
-            
+
         element.writeOneAttribute(RtfListTable.LIST_FONT_TYPE, new Integer(0));
     }
 }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java
index 48c987d2d..8eb993e0d 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java
@@ -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.
@@ -37,15 +37,15 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfElement;
  */
 public class RtfListStyleText extends RtfListStyle {
     private String text;
-    
+
     /**
      * Constructs a RtfListStyleText object.
      * @param s Text to be displayed
      */
     public RtfListStyleText(String s) {
-        text = s;    
+        text = s;
     }
-    
+
     /**
      * Gets called before a RtfListItem has to be written.
      * @param item RtfListItem whose prefix has to be written
@@ -68,10 +68,10 @@ public class RtfListStyleText extends RtfListStyle {
         RtfStringConverter.getInstance().writeRtfString(item.writer, text);
         item.writeGroupMark(false);
     }
-    
+
     /**
      * Gets called before a paragraph, which is contained by a RtfListItem has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -82,10 +82,10 @@ public class RtfListStyleText extends RtfListStyle {
         element.writeControlWord("pntext");
         element.writeGroupMark(false);
     }
-    
+
     /**
      * Gets called when the list table has to be written.
-     * 
+     *
      * @param element RtfElement in whose context is to be written
      * {@inheritDoc}
      * @throws IOException Thrown when an IO-problem occurs
@@ -94,7 +94,7 @@ public class RtfListStyleText extends RtfListStyle {
     throws IOException {
         element.attrib.set(RtfListTable.LIST_NUMBER_TYPE, 23);
         element.writeGroupMark(true);
-        
+
         String sCount;
         if (text.length() < 10) {
             sCount = "0" + String.valueOf(text.length());
@@ -105,14 +105,14 @@ public class RtfListStyleText extends RtfListStyle {
             }
         }
         element.writeOneAttributeNS(
-                RtfListTable.LIST_TEXT_FORM, "\\'" + sCount 
+                RtfListTable.LIST_TEXT_FORM, "\\'" + sCount
                     + RtfStringConverter.getInstance().escape(text));
         element.writeGroupMark(false);
-            
+
         element.writeGroupMark(true);
         element.writeOneAttributeNS(RtfListTable.LIST_NUM_POSITION, null);
         element.writeGroupMark(false);
-            
+
         element.attrib.set(RtfListTable.LIST_FONT_TYPE, 2);
     }
 }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
index 2f4988a20..aeb9618f4 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
@@ -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.
@@ -119,7 +119,7 @@ public class RtfListTable extends RtfContainer {
         }
 
         lists.add(list);
-        
+
         return lists.size();
     }
 
@@ -140,7 +140,7 @@ public class RtfListTable extends RtfContainer {
                 newLine();
             }
             writeGroupMark(false);
-               
+
             newLine();
             //write '\listoveridetable'
             writeGroupMark(true);
@@ -149,11 +149,11 @@ public class RtfListTable extends RtfContainer {
             newLine();
             for (Iterator it = styles.iterator(); it.hasNext();) {
                 final RtfListStyle style = (RtfListStyle)it.next();
-                        
+
                 writeGroupMark(true);
                 writeStarControlWordNS(LIST_OVR);
                 writeGroupMark(true);
-        
+
                 writeOneAttributeNS(LIST_ID, style.getRtfList().getListId().toString());
                 writeOneAttributeNS(LIST_OVR_COUNT, new Integer(0));
                 writeOneAttributeNS(LIST_NUMBER, new Integer(z++));
@@ -162,7 +162,7 @@ public class RtfListTable extends RtfContainer {
                 writeGroupMark(false);
                 newLine();
             }
-            
+
             writeGroupMark(false);
             newLine();
         }
@@ -176,7 +176,7 @@ public class RtfListTable extends RtfContainer {
     public boolean isEmpty() {
         return false;
     }
-    
+
     private void writeListTableEntry(RtfList list)
     throws IOException {
         //write list-specific attributes
@@ -184,29 +184,29 @@ public class RtfListTable extends RtfContainer {
         writeControlWordNS(LIST);
         writeOneAttributeNS(LIST_TEMPLATE_ID, list.getListTemplateId().toString());
         writeOneAttributeNS(LIST, attrib.getValue(LIST));
-        
+
         // write level-specific attributes
         writeGroupMark(true);
         writeControlWordNS(LIST_LEVEL);
-        
+
         writeOneAttributeNS(LIST_JUSTIFICATION, attrib.getValue(LIST_JUSTIFICATION));
         writeOneAttributeNS(LIST_FOLLOWING_CHAR, attrib.getValue(LIST_FOLLOWING_CHAR));
         writeOneAttributeNS(LIST_SPACE, new Integer(0));
         writeOneAttributeNS(LIST_INDENT, attrib.getValue(LIST_INDENT));
-        
+
         RtfListItem item = (RtfListItem)list.getChildren().get(0);
         if (item != null) {
             item.getRtfListStyle().writeLevelGroup(this);
         }
-        
+
         writeGroupMark(false);
-        
+
         writeGroupMark(true);
         writeControlWordNS(LIST_NAME);
         writeGroupMark(false);
-        
+
         writeOneAttributeNS(LIST_ID, list.getListId().toString());
-                
+
         writeGroupMark(false);
     }
 
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java
index 6f8b6afc3..4e6e08291 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java
index 788eef147..54cdb802a 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java
index bd2e9e62d..fb2df3fac 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java
@@ -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.
@@ -55,7 +55,7 @@ extends RtfContainer {
     public static final String MARGIN_LEFT = "margl";
     /** constant for right margin */
     public static final String MARGIN_RIGHT = "margr";
-    
+
     /** constant for header position */
     public static final String HEADERY = "headery";
     /** constant for footer position */
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java
index 488a49a30..851dc6c87 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java
index 7335e8a81..b570842c2 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java
index 7a9641ee8..235b3f8e1 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java
index c7f455c70..92ba2bb7f 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java
@@ -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.
@@ -78,8 +78,8 @@ public class RtfPageNumberCitation extends RtfContainer {
             // Build page reference field
             String pageRef = RTF_FIELD_PAGEREF_MODEL;
             final int insertionIndex = pageRef.indexOf("}");
-            pageRef = pageRef.substring(0, insertionIndex) 
-                + "\"" + id 
+            pageRef = pageRef.substring(0, insertionIndex)
+                + "\"" + id
                 + "\"" + " "
                 + pageRef.substring(insertionIndex, pageRef.length());
             id = null;
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java
index 8cf71d68e..ffc37a667 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java
index 1fa6166d9..e27ab6460 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
index 88c7e599b..4b7f8f677 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
@@ -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.
@@ -231,7 +231,7 @@ implements
         closeCurrentExternalGraphic();
         closeCurrentBefore();
     }
-    
+
     /**
      * Returns the current RtfTextrun.
      * @return Current RtfTextrun
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java
index 2983f9ca7..da55e54b0 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java
@@ -23,8 +23,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 
 /**
- * This class is responsible for saving space-before/space-after attributes 
- * history and adding spacing to established candidates (i.e. attributes) or 
+ * This class is responsible for saving space-before/space-after attributes
+ * history and adding spacing to established candidates (i.e. attributes) or
  * accumulation spacing in case of candidate absence.
  */
 public class RtfSpaceManager {
@@ -41,7 +41,7 @@ public class RtfSpaceManager {
      * property.
      */
     private int accumulatedSpace = 0;
-    
+
     /**
      * Construct a newly allocated <code>RtfSpaceManager</code> object.
      */
@@ -49,8 +49,8 @@ public class RtfSpaceManager {
     }
 
     /**
-     * Iterates block-level stack (i.e. all open blocks) and stops updating 
-     * candidate for adding space-before/space-after attribute in case of 
+     * Iterates block-level stack (i.e. all open blocks) and stops updating
+     * candidate for adding space-before/space-after attribute in case of
      * candidate presence.
      */
     public void stopUpdatingSpaceBefore() {
@@ -61,10 +61,10 @@ public class RtfSpaceManager {
             }
         }
     }
-    
+
     /**
      * Set attributes as candidate for space attributes inheritance.
-     * 
+     *
      * @param attrs  attributes to set
      */
     public void setCandidate(RtfAttributes attrs) {
@@ -74,24 +74,24 @@ public class RtfSpaceManager {
             splitter.setSpaceAfterCandidate(attrs);
         }
     }
-    
+
     /**
-     * Builds RtfSpaceSplitter on <code>attrs</code> and adds it to the 
+     * Builds RtfSpaceSplitter on <code>attrs</code> and adds it to the
      * block-level stack.
-     * 
+     *
      * @param attrs  RtfAttribute to add
      * @return instance of RtfSpaceSplitter
      */
     public RtfSpaceSplitter pushRtfSpaceSplitter(RtfAttributes attrs) {
         RtfSpaceSplitter splitter;
         splitter = new RtfSpaceSplitter(attrs, accumulatedSpace);
-        // set accumulatedSpace to 0, because now accumulatedSpace used 
+        // set accumulatedSpace to 0, because now accumulatedSpace used
         // in splitter
         accumulatedSpace = 0;
         blockAttributes.addLast(splitter);
         return splitter;
     }
-    
+
     /**
      * Removes RtfSpaceSplitter from top of block-level stack.
      */
@@ -105,7 +105,7 @@ public class RtfSpaceManager {
 
     /**
      * Pushes inline attributes to inline-level stack.
-     * 
+     *
      * @param attrs attributes to add
      */
     public void pushInlineAttributes(RtfAttributes attrs) {
@@ -123,7 +123,7 @@ public class RtfSpaceManager {
 
     /**
      * Peeks at inline-level attribute stack.
-     * 
+     *
      * @return RtfAttributes from top of inline-level stack
      */
     public RtfAttributes getLastInlineAttribute() {
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java
index 19db4dc6a..689a2753f 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java
@@ -45,7 +45,7 @@ public class RtfSpaceSplitter {
 
     /**
      * Create RtfSpaceSplitter with given RtfAttributes.
-     * 
+     *
      * @param attrs  RtfAttributes for splitting
      * @param previousSpace  integer, representing accumulated spacing
      */
@@ -62,7 +62,7 @@ public class RtfSpaceSplitter {
     /**
      * Remove attributes with name <code>key</code> from
      * <code>commonAttributes</code> and return it as int.
-     * 
+     *
      * @param key  attributes name to extract
      * @return integer, representing value of extracted attributes
      */
@@ -86,10 +86,10 @@ public class RtfSpaceSplitter {
         return spaceBefore;
     }
 
-    /** 
+    /**
      * Sets a candidate for space-before property.
-     * 
-     * @param candidate  instance of <code>RtfAttributes</code>, considered as 
+     *
+     * @param candidate  instance of <code>RtfAttributes</code>, considered as
      *        a candidate for space-before adding
      */
     public void setSpaceBeforeCandidate(RtfAttributes candidate) {
@@ -98,10 +98,10 @@ public class RtfSpaceSplitter {
         }
     }
 
-    /** 
+    /**
      * Sets a candidate for space-after property.
-     * 
-     * @param candidate  instance of <code>RtfAttributes</code>, considered as 
+     *
+     * @param candidate  instance of <code>RtfAttributes</code>, considered as
      *        a candidate for space-after adding
      */
     public void setSpaceAfterCandidate(RtfAttributes candidate) {
@@ -117,19 +117,19 @@ public class RtfSpaceSplitter {
     public boolean isAfterCadidateSet() {
         return spaceAfterCandidate != null;
     }
-    
+
     /**
      * Stops updating candidates for space-before attribute.
      */
     public void stopUpdatingSpaceBefore() {
         updatingSpaceBefore = false;
-    } 
+    }
 
     /**
      * Adds corresponding attributes to their candidates.
-     * 
-     * @return integer, representing value of space-before/space-after 
-     *   attributes, that can't be added anywhere (i.e. these attributes 
+     *
+     * @return integer, representing value of space-before/space-after
+     *   attributes, that can't be added anywhere (i.e. these attributes
      *   hasn't their candidates)
      */
     public int flush() {
@@ -144,7 +144,7 @@ public class RtfSpaceSplitter {
         if (!isAfterCadidateSet()) {
             accumulatingSpace += spaceAfter;
         } else {
-            spaceAfterCandidate.addIntegerValue(spaceAfter, 
+            spaceAfterCandidate.addIntegerValue(spaceAfter,
                             RtfText.SPACE_AFTER);
         }
 
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java
index a9b531ca3..c7cc6d36f 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java
@@ -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,21 +36,21 @@ import java.io.Writer;
 
 public class RtfString extends RtfElement {
     private String text = "";
-        
+
     RtfString(RtfContainer parent, Writer w, String s)
     throws IOException {
         super(parent, w);
-            
+
         text = s;
     }
-        
+
     /**
     * @return true if this element would generate no "useful" RTF content
     */
     public boolean isEmpty() {
         return text.trim().equals("");
     }
-        
+
     /**
     * write RTF code of all our children
     * @throws IOException for I/O problems
@@ -58,11 +58,11 @@ public class RtfString extends RtfElement {
     protected void writeRtfContent() throws IOException {
         RtfStringConverter.getInstance().writeRtfString(writer, text);
     }
-        
+
     public String getText() {
         return text;
     }
-        
+
     public void setText(String s) {
         text = s;
     }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java
index 04275fd72..40460bb4d 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java
@@ -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.
@@ -132,5 +132,5 @@ public class RtfStringConverter {
         }
         return sb.toString();
     }
-    
+
 }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java
index fdbe94cfc..b838fb8a4 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
index b8bb4b032..eda5644a2 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
@@ -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.
@@ -110,16 +110,16 @@ public class RtfTable extends RtfContainer {
             writeControlWordNS("pard");
         }
 
-        writeGroupMark(true);   
+        writeGroupMark(true);
     }
-    
+
     /**
      * Overridden to write RTF suffix code, what comes after our children
      * @throws IOException for I/O problems
      */
     protected void writeRtfSuffix() throws IOException {
         writeGroupMark(false);
-        
+
         if (isNestedTable()) {
             getRow().writeRowAndCellsDefintions();
         }
@@ -154,7 +154,7 @@ public class RtfTable extends RtfContainer {
     }
 
     /**
-     * 
+     *
      * @return RtfAttributes of Header
      */
     public RtfAttributes getHeaderAttribs() {
@@ -173,7 +173,7 @@ public class RtfTable extends RtfContainer {
 
         return super.getRtfAttributes();
     }
-    
+
     /** @return true if the the table is a nested table */
     public boolean isNestedTable() {
         if (isNestedTable == null) {
@@ -194,9 +194,9 @@ public class RtfTable extends RtfContainer {
 
         return false;
     }
-    
+
     /**
-     * 
+     *
      * @return Parent row table (for nested tables only)
      */
     public RtfTableRow getRow() {
@@ -209,7 +209,7 @@ public class RtfTable extends RtfContainer {
             e = e.parent;
         }
 
-        return null;  
+        return null;
     }
 
     /**
@@ -219,7 +219,7 @@ public class RtfTable extends RtfContainer {
     public void setBorderAttributes(RtfAttributes attributes) {
         borderAttributes = attributes;
     }
-    
+
     /**
      * Returns the RtfAttributes for the borders of the table.
      * @return Border attributes of the table.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
index 1ba590f22..740ea36e5 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
@@ -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.
@@ -100,7 +100,7 @@ public class RtfTableCell
         if (attrs == null) {
             attrs = new RtfAttributes();
         }
-        
+
         attrs.set("intbl");
 
         paragraph = new RtfParagraph(this, writer, attrs);
@@ -192,13 +192,13 @@ public class RtfTableCell
          * table (Word2000 seems to do the same).
          * Cause of this, dont't write horizontally merged cells.
          * They just exist as placeholders in TableContext class,
-         * and are never written to RTF file.    
+         * and are never written to RTF file.
          */
         // horizontal cell merge codes
         if (hMerge == MERGE_WITH_PREVIOUS) {
             return offset;
         }
-        
+
         newLine();
         this.widthOffset = offset;
 
@@ -225,13 +225,13 @@ public class RtfTableCell
         if (attrib.getValue("number-columns-spanned") != null) {
             // Get the number of columns spanned
             int nbMergedCells = ((Integer)attrib.getValue("number-columns-spanned")).intValue();
-            
+
             RtfTable tab = getRow().getTable();
-            
+
             // Get the context of the current table in order to get the width of each column
             ITableColumnsInfo tableColumnsInfo
                 = tab.getITableColumnsInfo();
-            
+
             tableColumnsInfo.selectFirstColumn();
 
             // Reach the column index in table context corresponding to the current column cell
@@ -273,7 +273,7 @@ public class RtfTableCell
         return xPos;
 
     }
-    
+
     /**
      * Overriden to avoid writing any it's a merged cell.
      * @throws IOException for I/O problems
@@ -283,7 +283,7 @@ public class RtfTableCell
        if (hMerge == MERGE_WITH_PREVIOUS) {
            return;
        }
-       
+
        super.writeRtfContent();
     }
 
@@ -297,7 +297,7 @@ public class RtfTableCell
         if (hMerge == MERGE_WITH_PREVIOUS) {
             return;
         }
-        
+
         super.writeRtfPrefix();
     }
 
@@ -310,7 +310,7 @@ public class RtfTableCell
         if (hMerge == MERGE_WITH_PREVIOUS) {
             return;
         }
-        
+
         if (getRow().getTable().isNestedTable()) {
             //nested table
             writeControlWordNS("nestcell");
@@ -330,19 +330,19 @@ public class RtfTableCell
                 writeControlWord("qr");
             } else {
                 RtfElement lastChild = null;
-                
+
                 if (getChildren().size() > 0) {
                     lastChild = (RtfElement) getChildren().get(getChildren().size() - 1);
                 }
-                    
-                
+
+
                 if (lastChild != null
                         && lastChild instanceof RtfTextrun) {
-                    //Don't write \ql in order to allow for example a right aligned paragraph 
+                    //Don't write \ql in order to allow for example a right aligned paragraph
                     //in a not right aligned table-cell to write its \qr.
                 } else {
                     writeControlWord("ql");
-                }                
+                }
             }
 
             if (!containsText()) {
@@ -497,7 +497,7 @@ public class RtfTableCell
         }
         return result;
     }
-    
+
     /**
      * Returns the current RtfTextrun object.
      * Opens a new one if necessary.
@@ -506,20 +506,20 @@ public class RtfTableCell
      */
     public RtfTextrun getTextrun() throws IOException {
         RtfAttributes attrs = new RtfAttributes();
-        
+
         if (!getRow().getTable().isNestedTable()) {
             attrs.set("intbl");
         }
-        
+
         RtfTextrun textrun = RtfTextrun.getTextrun(this, writer, attrs);
 
         //Suppress the very last \par, because the closing \cell applies the
-        //paragraph attributes. 
-        textrun.setSuppressLastPar(true);  
-        
+        //paragraph attributes.
+        textrun.setSuppressLastPar(true);
+
         return textrun;
     }
-    
+
     /**
      * Get the parent row.
      * @return The parent row.
@@ -534,6 +534,6 @@ public class RtfTableCell
             e = e.parent;
         }
 
-        return null;  
+        return null;
     }
 }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
index 2182f94ec..fe936e3f5 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
@@ -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.
@@ -145,15 +145,15 @@ public class RtfTableRow extends RtfContainer implements ITableAttributes {
         // now children can write themselves, we have the correct RTF prefix code
         super.writeRtfContent();
     }
-    
+
     /**
-     * 
+     *
      * @throws IOException In case of a IO-problem
      */
     public void writeRowAndCellsDefintions() throws IOException {
         // render the row and cells definitions
         writeControlWord("trowd");
-        
+
         if (!getTable().isNestedTable()) {
             writeControlWord("itap0");
         }
@@ -181,24 +181,24 @@ public class RtfTableRow extends RtfContainer implements ITableAttributes {
 
         // write X positions of our cells
         int xPos = 0;
-        
+
         final Object leftIndent = attrib.getValue(ITableAttributes.ATTR_ROW_LEFT_INDENT);
         if (leftIndent != null) {
             xPos = ((Integer)leftIndent).intValue();
         }
-        
+
         RtfAttributes tableBorderAttributes = getTable().getBorderAttributes();
-        
+
         int index = 0;
         for (Iterator it = getChildren().iterator(); it.hasNext();) {
             final RtfElement e = (RtfElement)it.next();
             if (e instanceof RtfTableCell) {
-                
+
                 RtfTableCell rtfcell = (RtfTableCell)e;
-                
+
                 // Adjust the cell's display attributes so the table's/row's borders
                 // are drawn properly.
-                
+
                 if (tableBorderAttributes != null) {
                     // get border attributes from table
                     if (index == 0) {
@@ -233,7 +233,7 @@ public class RtfTableRow extends RtfContainer implements ITableAttributes {
                         }
                     }
                 }
-                
+
                 // get border attributes from row
                 if (index == 0) {
                     if (!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_LEFT)) {
@@ -268,7 +268,7 @@ public class RtfTableRow extends RtfContainer implements ITableAttributes {
             }
           index++; // Added by Boris POUDEROUS on 2002/07/02
         }
-        
+
         newLine();
     }
 
@@ -366,9 +366,9 @@ public class RtfTableRow extends RtfContainer implements ITableAttributes {
     public boolean isHighestCell(int cellId) {
         return (highestCell == cellId) ? true : false;
     }
-    
+
     /**
-     * 
+     *
      * @return Parent table of the row.
      */
     public RtfTable getTable() {
@@ -381,6 +381,6 @@ public class RtfTableRow extends RtfContainer implements ITableAttributes {
             e = e.parent;
         }
 
-        return null;  
+        return null;
     }
 }
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java
index fa4cf3978..a02d6db8f 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java
index 3dc2e59e0..b176e1ee2 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java
@@ -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.
@@ -79,7 +79,7 @@ public class RtfText extends RtfElement {
     /** RtfText attributes: paragraph shading attributes */
     /** Constant for the shading of the paragraph */
     public static final String SHADING = "shading";
-    /** Constant for the document's color tableshading of the paragraph */    
+    /** Constant for the document's color tableshading of the paragraph */
     public static final String SHADING_FRONT_COLOR = "cfpat";
     /** Constant for the 100% shading of the paragraph */
     public static final int FULL_SHADING = 10000;
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
index 05a97ffd4..e0703d7ba 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
@@ -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,33 +29,33 @@ import java.util.ListIterator;
 // FOP
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfExternalGraphic;
 
-/** 
- * Class which contains a linear text run. It has methods to add attributes, 
+/**
+ * Class which contains a linear text run. It has methods to add attributes,
  * text, paragraph breaks....
  * @author Peter Herweg, pherweg@web.de
  */
 public class RtfTextrun extends RtfContainer {
     private boolean bSuppressLastPar = false;
     private RtfListItem rtfListItem;
-    
+
     /** Manager for handling space-* property. */
     private RtfSpaceManager rtfSpaceManager = new RtfSpaceManager();
-    
+
     /**  Class which represents the opening of a RTF group mark.*/
     private class RtfOpenGroupMark extends RtfElement {
-                
+
         RtfOpenGroupMark(RtfContainer parent, Writer w, RtfAttributes attr)
                 throws IOException {
             super(parent, w, attr);
         }
-        
+
         /**
          * @return true if this element would generate no "useful" RTF content
          */
         public boolean isEmpty() {
             return false;
         }
-        
+
         /**
          * write RTF code of all our children
          * @throws IOException for I/O problems
@@ -65,22 +65,22 @@ public class RtfTextrun extends RtfContainer {
             writeAttributes(getRtfAttributes(), null);
         }
     }
-    
+
     /**  Class which represents the closing of a RTF group mark.*/
     private class RtfCloseGroupMark extends RtfElement {
-        
+
         RtfCloseGroupMark(RtfContainer parent, Writer w)
                 throws IOException {
             super(parent, w);
         }
-        
+
         /**
          * @return true if this element would generate no "useful" RTF content
          */
         public boolean isEmpty() {
             return false;
         }
-        
+
         /**
          * write RTF code of all our children
          * @throws IOException for I/O problems
@@ -92,19 +92,19 @@ public class RtfTextrun extends RtfContainer {
 
     /**  Class which represents a paragraph break.*/
     private class RtfParagraphBreak extends RtfElement {
-        
+
         RtfParagraphBreak(RtfContainer parent, Writer w)
                 throws IOException {
             super(parent, w);
         }
-    
+
         /**
          * @return true if this element would generate no "useful" RTF content
          */
         public boolean isEmpty() {
             return false;
         }
-    
+
         /**
          * write RTF code of all our children
          * @throws IOException for I/O problems
@@ -113,16 +113,16 @@ public class RtfTextrun extends RtfContainer {
             writeControlWord("par");
         }
     }
-              
+
     /** Create an RTF container as a child of given container */
     RtfTextrun(RtfContainer parent, Writer w, RtfAttributes attrs) throws IOException {
         super(parent, w, attrs);
     }
-    
-    
+
+
     /**
      * Adds instance of <code>OpenGroupMark</code> as a child with attributes.
-     * 
+     *
      * @param attrs  attributes to add
      * @throws IOException for I/O problems
      */
@@ -132,17 +132,17 @@ public class RtfTextrun extends RtfContainer {
 
     /**
      * Adds instance of <code>CloseGroupMark</code> as a child.
-     * 
+     *
      * @throws IOException for I/O problems
      */
     private void addCloseGroupMark() throws IOException {
         RtfCloseGroupMark r = new RtfCloseGroupMark(this, writer);
     }
-    
+
     /**
-     * Pushes block attributes, notifies all opened blocks about pushing block 
+     * Pushes block attributes, notifies all opened blocks about pushing block
      * attributes, adds <code>OpenGroupMark</code> as a child.
-     * 
+     *
      * @param attrs  the block attributes to push
      * @throws IOException for I/O problems
      */
@@ -151,11 +151,11 @@ public class RtfTextrun extends RtfContainer {
         RtfSpaceSplitter splitter = rtfSpaceManager.pushRtfSpaceSplitter(attrs);
         addOpenGroupMark(splitter.getCommonAttributes());
     }
-    
+
     /**
-     * Pops block attributes, notifies all opened blocks about pushing block 
+     * Pops block attributes, notifies all opened blocks about pushing block
      * attributes, adds <code>CloseGroupMark</code> as a child.
-     * 
+     *
      * @throws IOException for I/O problems
      */
     public void popBlockAttributes() throws IOException {
@@ -166,7 +166,7 @@ public class RtfTextrun extends RtfContainer {
 
     /**
      * Pushes inline attributes.
-     * 
+     *
      * @param attrs  the inline attributes to push
      * @throws IOException for I/O problems
      */
@@ -177,17 +177,17 @@ public class RtfTextrun extends RtfContainer {
 
     /**
      * Pop inline attributes.
-     * 
+     *
      * @throws IOException for I/O problems
      */
     public void popInlineAttributes() throws IOException {
         rtfSpaceManager.popInlineAttributes();
         addCloseGroupMark();
     }
-    
+
     /**
      * Add string to children list.
-     * 
+     *
      * @param s  string to add
      * @throws IOException for I/O problems
      */
@@ -202,20 +202,20 @@ public class RtfTextrun extends RtfContainer {
         RtfString r = new RtfString(this, writer, s);
         rtfSpaceManager.popRtfSpaceSplitter();
     }
-    
+
     /**
      * Inserts a footnote.
-     * 
+     *
      * @return inserted footnote
      * @throws IOException for I/O problems
      */
     public RtfFootnote addFootnote() throws IOException {
         return new RtfFootnote(this, writer);
     }
-    
+
     /**
      * Inserts paragraph break before all close group marks.
-     * 
+     *
      * @throws IOException  for I/O problems
      */
     public void addParagraphBreak() throws IOException {
@@ -241,7 +241,7 @@ public class RtfTextrun extends RtfContainer {
             }
         }
     }
-    
+
     /**
      * Inserts a page number.
      * @param attr Attributes for the page number to insert.
@@ -250,7 +250,7 @@ public class RtfTextrun extends RtfContainer {
     public void addPageNumber(RtfAttributes attr) throws IOException {
         RtfPageNumber r = new RtfPageNumber(this, writer, attr);
     }
-    
+
     /**
      * Inserts a hyperlink.
      * @param attr Attributes for the hyperlink to insert.
@@ -260,7 +260,7 @@ public class RtfTextrun extends RtfContainer {
     public RtfHyperLink addHyperlink(RtfAttributes attr) throws IOException {
         return new RtfHyperLink(this, writer, attr);
     }
-    
+
     /**
      * Inserts a bookmark.
      * @param id Id for the inserted bookmark
@@ -294,7 +294,7 @@ public class RtfTextrun extends RtfContainer {
             throws IOException {
 
         List list = container.getChildren();
-                
+
         if (list.size() == 0) {
             //add a new RtfTextrun
             RtfTextrun textrun = new RtfTextrun(container, writer, attrs);
@@ -302,7 +302,7 @@ public class RtfTextrun extends RtfContainer {
 
             return textrun;
         }
-        
+
         Object obj = list.get(list.size() - 1);
 
         if (obj instanceof RtfTextrun) {
@@ -313,18 +313,18 @@ public class RtfTextrun extends RtfContainer {
         //add a new RtfTextrun as the last child
         RtfTextrun textrun = new RtfTextrun(container, writer, attrs);
         list.add(textrun);
-        
+
         return textrun;
     }
-   
+
     /**
      * specify, if the last paragraph control word (\par) should be suppressed.
      * @param bSuppress true, if the last \par should be suppressed
-     */    
+     */
     public void setSuppressLastPar(boolean bSuppress) {
         bSuppressLastPar = bSuppress;
     }
-   
+
     /**
      * write RTF code of all our children
      * @throws IOException for I/O problems
@@ -336,7 +336,7 @@ public class RtfTextrun extends RtfContainer {
          * 2. To write the children
          * Maybe this can be done more efficient.
          */
-        
+
         boolean bHasTableCellParent =
             this.getParentOfClass(RtfTableCell.class) != null;
         RtfAttributes attrBlockLevel = new RtfAttributes();
@@ -349,7 +349,7 @@ public class RtfTextrun extends RtfContainer {
                 break;
             }
         }
-        
+
         //get last RtfParagraphBreak, which is not followed by any visible child
         RtfParagraphBreak lastParagraphBreak = null;
         if (bLast) {
@@ -366,10 +366,10 @@ public class RtfTextrun extends RtfContainer {
                 }
             }
         }
-        
+
         //may contain for example \intbl
         writeAttributes(attrib, null);
-        
+
         if (rtfListItem != null) {
             rtfListItem.getRtfListStyle().writeParagraphPrefix(this);
         }
@@ -384,8 +384,8 @@ public class RtfTextrun extends RtfContainer {
             if (bHasTableCellParent) {
                 attrBlockLevel.set(e.getRtfAttributes());
             }
-            
-            
+
+
             /**
              * -Write RtfParagraphBreak only, if the previous visible child
              * was't also a RtfParagraphBreak.
@@ -396,21 +396,21 @@ public class RtfTextrun extends RtfContainer {
              */
             boolean bHide = false;
             bHide = bRtfParagraphBreak;
-            bHide = bHide 
-                && (bPrevPar 
-                    || bFirst 
-                    || (bSuppressLastPar && bLast && lastParagraphBreak != null 
+            bHide = bHide
+                && (bPrevPar
+                    || bFirst
+                    || (bSuppressLastPar && bLast && lastParagraphBreak != null
                         && e == lastParagraphBreak));
-                
+
             if (!bHide) {
                 newLine();
-                e.writeRtf(); 
-                
+                e.writeRtf();
+
                 if (rtfListItem != null && e instanceof RtfParagraphBreak) {
                     rtfListItem.getRtfListStyle().writeParagraphPrefix(this);
                 }
             }
-            
+
             if (e instanceof RtfParagraphBreak) {
                 bPrevPar = true;
             } else if (e instanceof RtfCloseGroupMark) {
@@ -422,26 +422,26 @@ public class RtfTextrun extends RtfContainer {
                 bFirst = bFirst && e.isEmpty();
             }
         } //for (Iterator it = ...)
-        
+
         //
         if (bHasTableCellParent) {
             writeAttributes(attrBlockLevel, null);
         }
-        
+
     }
-    
+
     /**
      * Set the parent list-item of the textrun.
-     * 
+     *
      * @param listItem parent list-item of the textrun
      */
     public void setRtfListItem(RtfListItem listItem) {
         rtfListItem = listItem;
     }
-    
+
     /**
-     * Gets the parent list-item of the textrun. 
-     * 
+     * Gets the parent list-item of the textrun.
+     *
      * @return parent list-item of the textrun
      */
     public RtfListItem getRtfListItem() {
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
index c690a287b..339434b69 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
@@ -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.
@@ -63,7 +63,7 @@ class WhitespaceCollapser {
             txt.setText(newString);
         }
     }
-    
+
     /** process one RtfString from our container */
     private void processString(RtfString txt) {
         final String newString = processString(txt.getText());
@@ -71,7 +71,7 @@ class WhitespaceCollapser {
             txt.setText(newString);
         }
     }
-    
+
     /** process one String */
     private String processString(String txt) {
         final String orig = txt;
@@ -80,7 +80,7 @@ class WhitespaceCollapser {
         // to collapse multiple spaces into one
         if (orig == null) {
             return null;
-        } else if (orig.length() > 0) { 
+        } else if (orig.length() > 0) {
             final boolean allSpaces = orig.trim().length() == 0;
             final boolean endSpace = allSpaces
                                      || Character.isWhitespace(orig.charAt(orig.length() - 1));
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
index 7e9b59c20..430231792 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java
index 274ad53f5..859472709 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java
@@ -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.
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
index 93bb991e8..c5e3cb191 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
@@ -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 @@ public class ImageUtil {
             } else {
                 //for example "600.0pt" has to be exited,
                 //when the dot is reached.
-                break; 
+                break;
             }
         }
 
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
index 826be58e7..96d65ad12 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
@@ -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.
@@ -60,7 +60,7 @@ public class TableContext implements ITableColumnsInfo {
      * as a number-rows-spanned attribute has been found.
      */
     private final List colRowSpanningAttrs = new java.util.ArrayList();
-    
+
     /**
      * This ArrayList contains one element for each column in the table.
      * value == true means, it's the first of multiple spanned columns
@@ -71,7 +71,7 @@ public class TableContext implements ITableColumnsInfo {
     private boolean bNextRowBelongsToHeader = false;
 
     /**
-     * 
+     *
      * @param value Specifies, if next row belongs to header
      */
     public void setNextRowBelongsToHeader(boolean value) {
@@ -79,7 +79,7 @@ public class TableContext implements ITableColumnsInfo {
     }
 
     /**
-     * 
+     *
      * @return true, if next row belongs to header
      */
     public boolean getNextRowBelongsToHeader() {
@@ -87,7 +87,7 @@ public class TableContext implements ITableColumnsInfo {
     }
 
     /**
-     * 
+     *
      * @param ctx BuilderContext
      */
     public TableContext(BuilderContext ctx) {
@@ -95,7 +95,7 @@ public class TableContext implements ITableColumnsInfo {
     }
 
     /**
-     * Adds a column and sets its width. 
+     * Adds a column and sets its width.
      * @param width Width of next column
      */
     public void setNextColumnWidth(Float width) {
@@ -103,7 +103,7 @@ public class TableContext implements ITableColumnsInfo {
     }
 
     /**
-     * 
+     *
      * @return RtfAttributes of current row-spanning cell
      */
     public RtfAttributes getColumnRowSpanningAttrs() {
@@ -111,15 +111,15 @@ public class TableContext implements ITableColumnsInfo {
     }
 
     /**
-     * 
+     *
      * @return Number of currently spanned rows
      */
     public Integer getColumnRowSpanningNumber() {
         return (Integer)colRowSpanningNumber.get(colIndex);
     }
-    
+
     /**
-     * 
+     *
      * @return true, if it's the first of multiple spanning columns
      */
     public boolean getFirstSpanningCol() {
@@ -128,7 +128,7 @@ public class TableContext implements ITableColumnsInfo {
     }
 
     /**
-     * 
+     *
      * @param iRowSpanning number of rows to span
      * @param attrs RtfAttributes of row-spanning cell
      */
@@ -145,7 +145,7 @@ public class TableContext implements ITableColumnsInfo {
     }
 
     /**
-     * 
+     *
      * @param iRowSpanning number of rows to span in next column
      * @param attrs RtfAttributes of row-spanning cell
      */
@@ -154,10 +154,10 @@ public class TableContext implements ITableColumnsInfo {
         colRowSpanningNumber.add(iRowSpanning);
         colRowSpanningAttrs.add(colIndex, attrs);
     }
-    
+
     /**
-     * 
-     * @param bFirstSpanningCol specifies, if it's the first of 
+     *
+     * @param bFirstSpanningCol specifies, if it's the first of
      *                          multiple spanned columns
      */
     public void setCurrentFirstSpanningCol(
@@ -174,8 +174,8 @@ public class TableContext implements ITableColumnsInfo {
     }
 
     /**
-     * 
-     * @param bFirstSpanningCol specifies, if it's the first of 
+     *
+     * @param bFirstSpanningCol specifies, if it's the first of
      *                          multiple spanned columns
      */
     public void setNextFirstSpanningCol(
@@ -234,7 +234,7 @@ public class TableContext implements ITableColumnsInfo {
         if (colIndex < 0) {
             throw new IllegalStateException("colIndex must not be negative!");
         } else if (colIndex >= getNumberOfColumns()) {
-            log.warn("Column width for column " + (colIndex + 1) + " is not defined, using " 
+            log.warn("Column width for column " + (colIndex + 1) + " is not defined, using "
                     + INVALID_COLUMN_WIDTH);
             while (colIndex >= getNumberOfColumns()) {
                 setNextColumnWidth(new Float(INVALID_COLUMN_WIDTH));
@@ -250,9 +250,9 @@ public class TableContext implements ITableColumnsInfo {
     public void setColumnIndex(int index) {
         colIndex = index;
     }
-    
+
     /**
-     * @return Index of current column 
+     * @return Index of current column
      */
     public int getColumnIndex() {
         return colIndex;