RTF structural renderer moved from root to render.rtf, joining all the other renderers

RTF Library moved from root to render.rtf.rtflib, but kept separate from renderer itself.
See:  http://marc.theaimsgroup.com/?l=fop-dev&m=106753338719406&w=2


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

build.xml

@@ -767,7 +767,7 @@ list of possible build targets.
         <package name="org.apache.fop.viewer"/>
       </group>
       <group title="Structural Rendering">
-        <package name="org.apache.fop.rtf.renderer"/>
+        <package name="org.apache.fop.render.rtf"/>
         <package name="org.apache.fop.render.mif"/>
       </group>
       <group title="Utility">
@@ -782,8 +782,8 @@ list of possible build targets.
         <package name="org.apache.fop.util"/>
       </group>
       <group title="RTFLib (formerly JFor) Subpackage Candidate">
-        <package name="org.apache.fop.rtf.rtflib"/>
-        <package name="org.apache.fop.rtf.rtflib.*"/>
+        <package name="org.apache.fop.render.rtf.rtflib"/>
+        <package name="org.apache.fop.render.rtf.rtflib.*"/>
       </group>
     </javadoc>
   </target>

src/java/org/apache/fop/apps/Driver.java

@@ -59,10 +59,10 @@ import org.apache.fop.fo.FOTreeBuilder;
 
 import org.apache.fop.fo.FOInputHandler;
 import org.apache.fop.fo.FOTreeHandler;
-import org.apache.fop.render.mif.MIFHandler;
 import org.apache.fop.render.Renderer;
 import org.apache.fop.render.awt.AWTRenderer;
-import org.apache.fop.rtf.renderer.RTFHandler;
+import org.apache.fop.render.mif.MIFHandler;
+import org.apache.fop.render.rtf.RTFHandler;
 import org.apache.fop.tools.DocumentInputSource;
 import org.apache.fop.tools.DocumentReader;
 import org.apache.fop.layoutmgr.LayoutManagerLS;

src/java/org/apache/fop/rtf/renderer/BuilderContext.java → src/java/org/apache/fop/render/rtf/BuilderContext.java

@@ -48,11 +48,11 @@
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.rtf.renderer;
+package org.apache.fop.render.rtf;
 
 import java.util.Stack;
-import org.apache.fop.rtf.rtflib.rtfdoc.IRtfOptions;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfContainer;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfOptions;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfContainer;
 
 
 /**  A BuilderContext holds context information when building an RTF document

src/java/org/apache/fop/rtf/renderer/FoUnitsConverter.java → src/java/org/apache/fop/render/rtf/FoUnitsConverter.java

@@ -48,7 +48,7 @@
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.rtf.renderer;
+package org.apache.fop.render.rtf;
 
 import java.util.Map;
 import java.util.HashMap;

src/java/org/apache/fop/rtf/renderer/PageAttributesConverter.java → src/java/org/apache/fop/render/rtf/PageAttributesConverter.java

@@ -48,15 +48,15 @@
  * Software Foundation, please see <http://www.apache.org/>.
  */
 
-package org.apache.fop.rtf.renderer;
+package org.apache.fop.render.rtf;
 
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.logger.ConsoleLogger;
 
 //FOP
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfPage;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfPage;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.Property;
 

src/java/org/apache/fop/rtf/renderer/RTFHandler.java → src/java/org/apache/fop/render/rtf/RTFHandler.java

@@ -1,5 +1,5 @@
 /*
- * $Id: RTFHandler.java,v 1.4 2003/03/07 09:47:56 jeremias Exp $
+ * $Id$
  * ============================================================================
  *                    The Apache Software License, Version 1.1
  * ============================================================================
@@ -48,7 +48,7 @@
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.rtf.renderer;
+package org.apache.fop.render.rtf;
 
 // Java
 import java.io.IOException;
@@ -80,27 +80,27 @@ import org.apache.fop.fo.properties.Constants;
 import org.apache.fop.fo.Property;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.apps.Document;
-import org.apache.fop.rtf.rtflib.rtfdoc.IRtfAfterContainer;
-import org.apache.fop.rtf.rtflib.rtfdoc.IRtfBeforeContainer;
-import org.apache.fop.rtf.rtflib.rtfdoc.IRtfPageNumberContainer;
-import org.apache.fop.rtf.rtflib.rtfdoc.IRtfParagraphContainer;
-import org.apache.fop.rtf.rtflib.rtfdoc.IRtfTextrunContainer;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfAfter;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfBefore;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfElement;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfFile;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfFontManager;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfText;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTextrun;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell;
-import org.apache.fop.rtf.rtflib.rtfdoc.IRtfTableContainer;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfAfterContainer;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfBeforeContainer;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfPageNumberContainer;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfParagraphContainer;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfTextrunContainer;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAfter;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfBefore;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfColorTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfElement;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFile;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFontManager;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTextrun;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfTableContainer;
 import org.xml.sax.SAXException;
 
 /**

src/java/org/apache/fop/rtf/renderer/TableAttributesConverter.java → src/java/org/apache/fop/render/rtf/TableAttributesConverter.java

@@ -48,10 +48,10 @@
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.rtf.renderer;
+package org.apache.fop.render.rtf;
 
 //RTF
-import org.apache.fop.rtf.rtflib.rtfdoc.BorderAttributesConverter;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.BorderAttributesConverter;
 
 //FOP
 import org.apache.avalon.framework.logger.Logger;
@@ -68,9 +68,9 @@ import org.apache.fop.fo.ColorTypeProperty;
 import org.apache.fop.fo.NumberProperty;
 import org.apache.fop.datatypes.ColorType;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
-import org.apache.fop.rtf.rtflib.rtfdoc.ITableAttributes;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.ITableAttributes;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfColorTable;
 
 /**
  * Contributor(s):

src/java/org/apache/fop/rtf/renderer/TableContext.java → src/java/org/apache/fop/render/rtf/TableContext.java

@@ -48,14 +48,14 @@
  * James Tauber <jtauber@jtauber.com>. For more information on the Apache
  * Software Foundation, please see <http://www.apache.org/>.
  */
-package org.apache.fop.rtf.renderer;
+package org.apache.fop.render.rtf;
 
 import java.util.ArrayList;
 
 import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.avalon.framework.logger.Logger;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
-import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo;
 
 
 /** Used when handling fo:table to hold information to build the table.

src/java/org/apache/fop/rtf/renderer/TextAttributesConverter.java → src/java/org/apache/fop/render/rtf/TextAttributesConverter.java

@@ -48,7 +48,7 @@
  * Software Foundation, please see <http://www.apache.org/>.
  */
 
-package org.apache.fop.rtf.renderer;
+package org.apache.fop.render.rtf;
 
 //XML
 import org.xml.sax.Attributes;
@@ -70,10 +70,10 @@ import org.apache.fop.fo.NumberProperty;
 import org.apache.fop.datatypes.ColorType;
 
 //RTF
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfFontManager;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfText;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfColorTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFontManager;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText;
 
 
 /**  Converts FO properties to RtfAttributes

src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java → src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.exceptions;
+package org.apache.fop.render.rtf.rtflib.exceptions;
 
 /**  Base class for rtflib exceptions.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java → src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.exceptions;
+package org.apache.fop.render.rtf.rtflib.exceptions;
 
 /**  Thrown when a method call would lead to an invalid RTF document structure.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/exceptions/package.html → src/java/org/apache/fop/render/rtf/rtflib/exceptions/package.html

@@ -1,5 +1,5 @@
 <HTML>
-<TITLE>org.apache.fop.rtf.rtflib.exceptions</TITLE>
+<TITLE>org.apache.fop.render.rtf.rtflib.exceptions</TITLE>
 <BODY>
 <P>Classes handling specialized exceptions that arise during RTF creation.</P>
 </BODY>

src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java → src/java/org/apache/fop/render/rtf/rtflib/interfaces/ITableColumnsInfo.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.interfaces;
+package org.apache.fop.render.rtf.rtflib.interfaces;
 
 /**  Used to get information about tables, for example when handling nested tables
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/interfaces/package.html → src/java/org/apache/fop/render/rtf/rtflib/interfaces/package.html

@@ -1,5 +1,5 @@
 <HTML>
-<TITLE>org.apache.fop.rtf.rtflib.interfaces</TITLE>
+<TITLE>org.apache.fop.render.rtf.rtflib.interfaces</TITLE>
 <BODY>
 <P>Interfaces used to build RTF documents.</P>
 </BODY>

src/java/org/apache/fop/rtf/rtflib/rtfdoc/BorderAttributesConverter.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/BorderAttributesConverter.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /** Constants for RTF border attribute names, and a static method for converting
  *  fo attribute strings. */

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfAfterContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfListContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfOptions.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /**
  * Options for configuring the rtf elements.

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java

@@ -56,10 +56,10 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
-import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
+import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo;
 
 /**
  *  Interface for RtfElements that can contain RtfTables

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java

@@ -54,7 +54,7 @@
  */
 
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -62,8 +62,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Iterator;
 import java.io.IOException;
-import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTextrun;
+import org.apache.fop.render.rtf.rtflib.exceptions.RtfStructureException;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTextrun;
 
 /**  Interface which enables an implementing class to contain linear text runs.
  *  @author Peter Herweg, pherweg@web.de

src/java/org/apache/fop/rtf/rtflib/rtfdoc/ITableAttributes.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /**
  * Constants for RTF table attribute names

src/java/org/apache/fop/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /**
  *

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfter.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java

@@ -56,11 +56,11 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;
-import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
+import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo;
 
 /** Common code for RtfAfter and RtfBefore
 *  @author Andreas Lambert <andreas.lambert@cronidesoft.com>

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAttributes.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.util.HashMap;
 import java.util.Iterator;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBefore.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmark.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.util.Vector;
 import java.util.Hashtable;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfContainer.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java

@@ -56,14 +56,14 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Iterator;
 import java.io.IOException;
-import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException;
+import org.apache.fop.render.rtf.rtflib.exceptions.RtfStructureException;
 
 /**  An RtfElement that can contain other elements.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfDocumentArea.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java

@@ -56,12 +56,12 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;
 import java.util.Iterator;
-//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
+//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo;
 
 /**  Base class for all elements of an RTF file.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java

@@ -56,12 +56,12 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
-import org.apache.fop.rtf.rtflib.tools.ImageConstants;
-import org.apache.fop.rtf.rtflib.tools.ImageUtil;
-//import org.apache.fop.rtf.rtflib.tools.jpeg.Encoder;
-//import org.apache.fop.rtf.rtflib.tools.jpeg.JPEGException;
+import org.apache.fop.render.rtf.rtflib.tools.ImageConstants;
+import org.apache.fop.render.rtf.rtflib.tools.ImageUtil;
+//import org.apache.fop.render.rtf.rtflib.tools.jpeg.Encoder;
+//import org.apache.fop.render.rtf.rtflib.tools.jpeg.JPEGException;
 
 import java.io.BufferedInputStream;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;
@@ -64,7 +64,7 @@ import java.util.List;
 import java.util.LinkedList;
 import java.util.Iterator;
 import java.util.Collections;
-import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
+import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo;
 
 
 /**

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java

@@ -56,9 +56,9 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
-import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException;
+import org.apache.fop.render.rtf.rtflib.exceptions.RtfStructureException;
 import java.io.Writer;
 import java.io.IOException;
 import java.io.BufferedWriter;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontManager.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 import java.util.Hashtable;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontTable.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java

@@ -56,14 +56,14 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.io.Writer;
 import java.io.IOException;
-//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
+//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo;
 
 /**  RTF file header, contains style, font and other document-level information.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHyperLink.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfJforCmd.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 
 import java.io.Writer;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfLineBreak.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfList.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListItem.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java

@@ -56,13 +56,13 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.util.Date;
 import java.util.Random;
 import java.io.Writer;
 import java.io.IOException;
-//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
+//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo;
 
 /**
  * RtfListTable: used to make the list table in the header section of the RtfFile.

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfNull.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfOptions.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /**
  * Simplistic options definitions for RTF generation

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 import java.io.Writer;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageArea.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageBreak.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumber.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraph.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 
 import java.io.Writer;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java

@@ -56,11 +56,11 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;
-import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
+import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo;
 
 /**  Models a section in an RTF document
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfString.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java

@@ -55,7 +55,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 import java.io.Writer;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStringConverter.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.util.Map;
 import java.util.HashMap;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.util.Vector;
 import java.util.Hashtable;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java

@@ -56,11 +56,11 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;
-import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
+import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo;
 
 /**  Container for RtfRow elements
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java

@@ -56,12 +56,12 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.Writer;
 import java.io.IOException;
 import java.util.Iterator;
-import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
+import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo;
 
 /**  A cell in an RTF table, container for paragraphs, lists, etc.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableRow.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 import java.io.Writer;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 import java.io.Writer;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTextrun.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java

@@ -54,7 +54,7 @@
  */
 
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -62,7 +62,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Iterator;
 import java.io.IOException;
-import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException;
+import org.apache.fop.render.rtf.rtflib.exceptions.RtfStructureException;
 
 /**  Class which contains a linear text run. It has methods to add attributes, text, paragraph breaks....
  *  @author Peter Herweg, pherweg@web.de

src/java/org/apache/fop/rtf/rtflib/rtfdoc/WhitespaceCollapser.java → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.rtfdoc;
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 import java.util.Iterator;
 import java.util.StringTokenizer;

src/java/org/apache/fop/rtf/rtflib/rtfdoc/package.html → src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/package.html

@@ -1,5 +1,5 @@
 <HTML>
-<TITLE>org.apache.fop.rtf.rtflib.rtfdoc</TITLE>
+<TITLE>org.apache.fop.render.rtf.rtflib.rtfdoc</TITLE>
 <BODY>
 <P>Independent subsystem (not specific to FOP) classes that are used to build
 RTF documents.</P>

src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java

@@ -56,12 +56,12 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfHyperLink;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfHyperLink;
 
 import java.io.IOException;
 

src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java

@@ -56,11 +56,11 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.File;
 import java.io.IOException;
-//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
+//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo;
 
 /**  Create test RTF documents from classes found in this package.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java

@@ -56,9 +56,9 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
-import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
+import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo;
 
 /** ITableColumnsInfo that does nothing, used in testodcs package
  *  to create documents without worrying about nested tables handling.

src/java/org/apache/fop/rtf/rtflib/testdocs/ExternalGraphic.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java

@@ -56,12 +56,12 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfExternalGraphic;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfExternalGraphic;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
 
 import java.io.IOException;
 /**

src/java/org/apache/fop/rtf/rtflib/testdocs/ListInTable.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java

@@ -56,18 +56,18 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.IOException;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfList;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfListItem;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfList;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListItem;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
  */

src/java/org/apache/fop/rtf/rtflib/testdocs/MergedTableCells.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java

@@ -56,15 +56,15 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.IOException;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
 
 /**  Generates an RTF test document containing merged table cells
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/NestedTable.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java

@@ -56,16 +56,16 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.IOException;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
 
 /**  Generates an RTF document to test nested tables with the jfor rtflib package.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/ParagraphAlignment.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java

@@ -56,13 +56,13 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfText;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleDocument.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java

@@ -56,13 +56,13 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.IOException;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleLists.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java

@@ -56,15 +56,15 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.IOException;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfList;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfListItem;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfList;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListItem;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleTable.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java

@@ -56,15 +56,15 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.IOException;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java

@@ -56,18 +56,18 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.util.Date;
 import java.io.File;
 import java.io.IOException;
 import java.io.FileWriter;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfFile;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
-//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFile;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo;
 
 /**  Base class for generating RTF documents used to test the jfor rtflib package.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/TextAttributes.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java

@@ -56,15 +56,15 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.IOException;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfText;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/Whitespace.java → src/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java

@@ -56,13 +56,13 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.testdocs;
+package org.apache.fop.render.rtf.rtflib.testdocs;
 
 import java.io.IOException;
 
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
 
 /**  Generates an RTF document to test the WhitespaceCollapser
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch

src/java/org/apache/fop/rtf/rtflib/testdocs/package.html → src/java/org/apache/fop/render/rtf/rtflib/testdocs/package.html

@@ -1,5 +1,5 @@
 <HTML>
-<TITLE>org.apache.fop.rtf.rtflib.testdocs</TITLE>
+<TITLE>org.apache.fop.render.rtf.rtflib.testdocs</TITLE>
 <BODY>
 <P>Classes used to test/demonstrate RTFLib capabilities by generating sample
 RTF documents.</P>

src/java/org/apache/fop/rtf/rtflib/tools/ImageConstants.java → src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.tools;
+package org.apache.fop.render.rtf.rtflib.tools;
 
 import java.util.Hashtable;
 

src/java/org/apache/fop/rtf/rtflib/tools/ImageUtil.java → src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java

@@ -56,7 +56,7 @@
  * the FOP project.
  */
 
-package org.apache.fop.rtf.rtflib.tools;
+package org.apache.fop.render.rtf.rtflib.tools;
 
 /**  Misc.utilities for images handling
  *  This class belongs to the <fo:external-graphic> tag processing.

src/java/org/apache/fop/rtf/rtflib/tools/package.html → src/java/org/apache/fop/render/rtf/rtflib/tools/package.html

@@ -1,5 +1,5 @@
 <HTML>
-<TITLE>org.apache.fop.rtf.rtflib.tools</TITLE>
+<TITLE>org.apache.fop.render.rtf.rtflib.tools</TITLE>
 <BODY>
 <P>Utility classes used in RTF file generation.</P>
 </BODY>

src/java/org/apache/fop/rtf/rtflib/package.html

@@ -1,7 +0,0 @@
-<HTML>
-<TITLE>org.apache.fop.rtf.rtflib</TITLE>
-<BODY>
-<P>Classes used to build RTF documents in a generic way, i.e. they are usable by
-systems other than FOP.</P>
-</BODY>
-</HTML>