From: William Victor Mote Date: Sun, 29 Jun 2003 22:56:32 +0000 (+0000) Subject: Place jfor credits in a separate section, primarily to keep the standard header intact. X-Git-Tag: Root_Temp_KnuthStylePageBreaking~1382 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=811b58dfb133359e5c30744417605ba01c891b88;p=xmlgraphics-fop.git Place jfor credits in a separate section, primarily to keep the standard header intact. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196540 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java b/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java index fd85af925..5063ba74e 100755 --- a/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java +++ b/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.exceptions; diff --git a/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java b/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java index 7dba69b4b..ea4fd2e47 100755 --- a/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java +++ b/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.exceptions; diff --git a/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java b/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java index 96eeb0226..9f4ec08bd 100644 --- a/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java +++ b/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.interfaces; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/BorderAttributesConverter.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/BorderAttributesConverter.java index 77fac0f5f..27c07ab75 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/BorderAttributesConverter.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/BorderAttributesConverter.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IBorderAttributes.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IBorderAttributes.java index 938233579..dd8c43099 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IBorderAttributes.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IBorderAttributes.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; @@ -56,7 +61,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc; /** Constants for RTF table attribute names */ public interface IBorderAttributes { - + String BORDER_SINGLE_THICKNESS = "brdrs"; String BORDER_DOUBLE_THICKNESS = "brdrth"; String BORDER_SHADOWED ="brdrsh"; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfAfterContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfAfterContainer.java index a236256f6..8d98aab15 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfAfterContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfAfterContainer.java @@ -43,18 +43,23 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.IOException; - + /** interface for RTF objects that can contain footers */ public interface IRtfAfterContainer { diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java index 3597a46c7..32a7e4327 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java @@ -43,18 +43,23 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.IOException; - + public interface IRtfBeforeContainer { public RtfBefore newBefore(RtfAttributes attrs) throws IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java index bb8ea2118..eb0533b15 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java index 9d122cef1..e9085c5a0 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java index a3ce7f2c3..815284445 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java index 475932df2..073d83bf2 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfListContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfListContainer.java index 25de23978..1d72a5674 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfListContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfListContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfOptions.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfOptions.java index 95bb80213..3769483d4 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfOptions.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfOptions.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java index 2e2687ead..b210bfc28 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageContainer.java index 9d8a39f4b..62161495a 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java index de2f96f75..116d29922 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java index 486acf84d..9d3f17bca 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java index 03ed97704..399dd431c 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; @@ -63,7 +68,7 @@ public interface IRtfParagraphContainer { /** close current paragraph if any and start a new one with default attributes */ public RtfParagraph newParagraph() throws IOException; - + /** close current paragraph if any and start a new one with specified attributes */ public RtfParagraph newParagraph(RtfAttributes attr) throws IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java index abd460bf6..2d2762b2d 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; @@ -56,7 +61,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.IOException; public interface IRtfParagraphKeepTogetherContainer { - + /** close current paragraph if any and start a new one */ public RtfParagraphKeepTogether newParagraphKeepTogether() throws IOException; } \ No newline at end of file diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java index 40bcb44d1..b8d31065d 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextContainer.java index 83030e430..6bf2166e8 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; @@ -65,7 +70,7 @@ public interface IRtfTextContainer * @param str if not null, added to the RtfText created */ public RtfText newText(String str,RtfAttributes attr) throws IOException; - + /** close current text run if any and start a new one with default attributes * @param str if not null, added to the RtfText created */ @@ -73,7 +78,7 @@ public interface IRtfTextContainer /** add a line break */ public void newLineBreak() throws IOException; - + /** text containers usually provide default attributes for all texts that they contain. * This returns a copy of the container's attributes */ diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ITableAttributes.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ITableAttributes.java index 87d37f7e9..389bda86f 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ITableAttributes.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ITableAttributes.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java index a1879f142..b8f8f2bca 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; @@ -57,13 +62,13 @@ import java.io.IOException; public interface IrtfTemplateContainer { - + /** * Creates a new Template. * * @exception IOException on error */ public RtfTemplate newTemplate (String str, RtfAttributes attr) throws IOException; - - + + } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java index 748c2eb56..b5088fa0a 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java @@ -43,19 +43,25 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; /** - * + * * This context is used to manage the "keepn" RTF attribute - * Used by ParagraphBuilder and JforCmd + * Used by ParagraphBuilder and JforCmd * */ @@ -64,11 +70,11 @@ public class ParagraphKeeptogetherContext { private static int m_paraKeepTogetherOpen=0; private static boolean m_paraResetProperties=false; private static ParagraphKeeptogetherContext m_instance = null; - + ParagraphKeeptogetherContext() { } - - + + /** * Singelton. * @@ -78,7 +84,7 @@ public class ParagraphKeeptogetherContext { if (m_instance==null) m_instance = new ParagraphKeeptogetherContext(); return m_instance; } - + /** Return the level of current "keep whith next" paragraph */ public static int getKeepTogetherOpenValue() { return m_paraKeepTogetherOpen; @@ -86,28 +92,28 @@ public class ParagraphKeeptogetherContext { /** Open a new "keep whith next" paragraph */ public static void KeepTogetherOpen() { - m_paraKeepTogetherOpen++; + m_paraKeepTogetherOpen++; } /** Close a "keep whith next" paragraph */ public static void KeepTogetherClose() { if(m_paraKeepTogetherOpen > 0) { m_paraKeepTogetherOpen--; - - //If the \pard control word is not present, the current paragraph inherits all paragraph properties. + + //If the \pard control word is not present, the current paragraph inherits all paragraph properties. //Also the next paragraph must reset the properties otherwise the \keepn don't stop. m_paraResetProperties= (m_paraKeepTogetherOpen==0); } } - + /** Determine if the next paragraph must reset the properites */ public static boolean paragraphResetProperties() { - return m_paraResetProperties; + return m_paraResetProperties; } - + /** Reset the flag if the paragraph properties have been resested */ public static void setParagraphResetPropertiesUsed() { m_paraResetProperties=false; } - + } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfter.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfter.java index dd93dfeae..ace758a09 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfter.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfter.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -62,11 +68,11 @@ public class RtfAfter extends RtfAfterBeforeBase { public final static String[] FOOTER_ATTR = new String[]{ FOOTER }; - + RtfAfter(RtfSection parent, Writer w, RtfAttributes attrs) throws IOException { super(parent,w,attrs); } - + protected void writeMyAttributes() throws IOException { writeAttributes(m_attrib,FOOTER_ATTR); } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java index 7c8cfcc57..a92a7149c 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAttributes.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAttributes.java index 0858aa1f0..ae1d0efa8 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAttributes.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAttributes.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.util.*; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBefore.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBefore.java index 1d310e071..2c9112887 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBefore.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBefore.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -59,15 +65,15 @@ import java.io.IOException; public class RtfBefore extends RtfAfterBeforeBase { /**RtfBefore attributes*/ public final static String HEADER = "header"; - + public final static String[] HEADER_ATTR = new String[]{ HEADER }; - + RtfBefore(RtfSection parent, Writer w, RtfAttributes attrs) throws IOException { super(parent,w,attrs); } - + protected void writeMyAttributes() throws IOException { writeAttributes(m_attrib,HEADER_ATTR); } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmark.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmark.java index a84af528f..6ee287b5a 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmark.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmark.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java index e14a81bac..5e052122a 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java index cbfc61187..5ef99f4bb 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.util.Vector; @@ -154,7 +160,7 @@ public class RtfColorTable getColorNumber (192, 192, 192); } - + /** define a named color for getColorNumber(String) */ private void addNamedColor(String name,int colorNumber) { @@ -164,7 +170,7 @@ public class RtfColorTable ////////////////////////////////////////////////// // @@ Public methods ////////////////////////////////////////////////// - + /** get the RTF number of a named color * @return null if name not found */ diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfContainer.java index 13841dc32..a661da11f 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfContainer.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfContainer.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfDocumentArea.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfDocumentArea.java index 76d72ad3b..a08e542cc 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfDocumentArea.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfDocumentArea.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -63,13 +69,13 @@ public class RtfDocumentArea extends RtfContainer { private RtfSection m_currentSection; - + /** Create an RTF element as a child of given container */ RtfDocumentArea(RtfFile f,Writer w) throws IOException { super(f,w); } - + /** close current RtfSection if any and create a new one */ public RtfSection newSection() throws IOException { diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java index 25a4db059..421ec2a31 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.*; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java index 465bf540d..7bdc39894 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import org.apache.fop.rtf.rtflib.rtfdoc.RtfElement; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java index 4d081cec6..de7069dd8 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.*; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java index c5cbb9f9a..fd16c5659 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontManager.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontManager.java index d04735196..10aea92e7 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontManager.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontManager.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.IOException; @@ -148,7 +154,7 @@ public class RtfFontManager */ public int getFontNumber (String family) { - + family = family.toLowerCase (); Object o = fontIndex.get (family); int retVal; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontTable.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontTable.java index e8979af1f..98501c175 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontTable.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontTable.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -73,7 +79,7 @@ class RtfFontTable extends RtfElement { RtfFontManager.getInstance ().writeFonts ((RtfHeader)m_parent); } - + /** true if this element would generate no "useful" RTF content */ public boolean isEmpty() { diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java index 67880e86f..986778c4a 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.util.*; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHyperLink.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHyperLink.java index 4ddf7e8e6..b27a50969 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHyperLink.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHyperLink.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfJforCmd.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfJforCmd.java index 303a79790..cc466654b 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfJforCmd.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfJforCmd.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfLineBreak.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfLineBreak.java index 9c97f3129..2acf5ed29 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfLineBreak.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfLineBreak.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -66,13 +72,13 @@ public class RtfLineBreak extends RtfElement { super((RtfContainer)parent,w); } - + /** overridden to write our attributes before our content */ protected void writeRtfContent() throws IOException { writeControlWord("line"); - } - + } + /** true if this element would generate no "useful" RTF content */ public boolean isEmpty() { diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfList.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfList.java index 63ace729d..9018b0f37 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfList.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfList.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -64,7 +70,7 @@ public class RtfList extends RtfContainer { private RtfListItem m_item; private RtfListTable m_listTable; private final boolean m_hasTableParent; - + /** list numbering style. * Could add more variables, for now we simply differentiate between bullets and numbering */ @@ -72,7 +78,7 @@ public class RtfList extends RtfContainer { public static class NumberingStyle { public boolean isBulletedList = true; } - + /** Create an RTF list as a child of given container with given attributes */ RtfList(RtfContainer parent, Writer w, RtfAttributes attr) throws IOException { super((RtfContainer)parent,w,attr); @@ -80,34 +86,34 @@ public class RtfList extends RtfContainer { //create a new list table entry for the list m_listTable = (getRtfFile()).startListTable(attr); m_listTable.setParentList(this); - + // find out if we are nested in a table m_hasTableParent = this.getParentOfClass(RtfTable.class) != null; } - + /** change numbering style */ public void setNumberingStyle(NumberingStyle ns) { m_numberingStyle = ns; } - + /** overridden to setup the list: start a group with appropriate attributes */ protected void writeRtfPrefix() throws IOException { // pard causes word97 (and sometimes 2000 too) to crash if the list is nested in a table if(!m_hasTableParent) writeControlWord("pard"); - + writeOneAttribute(RtfText.LEFT_INDENT_FIRST,m_attrib.getValue(RtfListTable.LIST_INDENT)); writeOneAttribute(RtfText.LEFT_INDENT_BODY,m_attrib.getValue(RtfText.LEFT_INDENT_BODY)); - + // put the whole list in a group writeGroupMark(true); - + // group for list setup info writeGroupMark(true); - + writeStarControlWord("pn"); //Modified by Chris Scott //fixes second line indentation - + if(m_numberingStyle.isBulletedList) { // bulleted list writeControlWord("pnlvlblt"); @@ -136,22 +142,22 @@ public class RtfList extends RtfContainer { m_attrib.getValue(RtfListTable.LIST_INDENT)); writeControlWord("pntxta."); } - + writeGroupMark(false); writeOneAttribute(RtfListTable.LIST_NUMBER, (m_listTable.getListNumber()).toString()); } - + /** end the list group */ protected void writeRtfSuffix() throws IOException { // close group that encloses the whole list writeGroupMark(false); - + // 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(!m_hasTableParent) writeControlWord("pard"); } - + /** close current list item and start a new one */ public RtfListItem newListItem() throws IOException { if(m_item != null) m_item.close(); diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListItem.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListItem.java index 24e5ac398..d3f8a653d 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListItem.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListItem.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -65,17 +71,17 @@ extends RtfContainer implements IRtfParagraphContainer { private RtfList m_parentList; private RtfParagraph m_paragraph; - + /** special RtfParagraph that writes list item setup code before its content */ private class RtfListItemParagraph extends RtfParagraph { - + RtfListItemParagraph(RtfListItem rli,RtfAttributes attrs) throws IOException { super(rli,rli.m_writer,attrs); } - + protected void writeRtfPrefix() throws IOException { - super.writeRtfPrefix(); + super.writeRtfPrefix(); // for bulleted list, add list item setup group before paragraph contents if(m_parentList.isBulletedList()) { writeGroupMark(true); @@ -90,21 +96,21 @@ implements IRtfParagraphContainer { writeGroupMark(false); } } - + } - + /** Create an RTF list item as a child of given container with default attributes */ RtfListItem(RtfList parent, Writer w) throws IOException { super((RtfContainer)parent,w); m_parentList = parent; } - + /** Create an RTF list item as a child of given container with given attributes */ RtfListItem(RtfList parent, Writer w, RtfAttributes attr) throws IOException { super((RtfContainer)parent,w,attr); m_parentList = parent; } - + /** close current paragraph and start a new one */ /** close current paragraph if any and start a new one */ public RtfParagraph newParagraph(RtfAttributes attrs) throws IOException { @@ -112,10 +118,10 @@ implements IRtfParagraphContainer { m_paragraph = new RtfListItemParagraph(this,attrs); return m_paragraph; } - + /** close current paragraph if any and start a new one with default attributes */ public RtfParagraph newParagraph() throws IOException { return newParagraph(null); } - + } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java index 359b593ba..9369a0b0c 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.util.*; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfNull.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfNull.java index 4301c8712..4f99e0c8a 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfNull.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfNull.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -61,7 +67,7 @@ import java.io.IOException; public class RtfNull extends RtfContainer{ - + RtfNull(RtfPage parent, Writer w) throws IOException { super((RtfContainer)parent,w); } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfOptions.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfOptions.java index 67d51b670..0e3f3c188 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfOptions.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfOptions.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -64,7 +70,7 @@ public class RtfOptions { /** if true, RtfParagraphs that have no children do not generate any RTF code */ public boolean ignoreEmptyParagraphs() { return true; } - + /** RtfContainer does not generate any RTF is this returns false */ public boolean renderContainer(RtfContainer c) { return true; } } \ No newline at end of file diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java index e5abe6d12..c02af9849 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -68,19 +74,19 @@ extends RtfContainer{ /**RtfPage attributes*/ public final static String PAGE_WIDTH = "paperw"; public final static String PAGE_HEIGHT = "paperh"; - + public final static String MARGIN_TOP = "margt"; public final static String MARGIN_BOTTOM = "margb"; public final static String MARGIN_LEFT = "margl"; public final static String MARGIN_RIGHT = "margr"; - + public final static String[] PAGE_ATTR = new String[]{ PAGE_WIDTH, PAGE_HEIGHT, MARGIN_TOP, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT }; - + /** RtfPage creates new page attributes with the parent container, the writer - and the attributes*/ + and the attributes*/ RtfPage(RtfPageArea parent, Writer w, RtfAttributes attrs) throws IOException { super((RtfContainer)parent,w); m_attrib = attrs; @@ -90,31 +96,31 @@ extends RtfContainer{ PAGE_ATTR, if not null */ protected void writeRtfContent() throws IOException { writeAttributes(m_attrib, PAGE_ATTR); - + if (m_attrib != null) { Object widthRaw = m_attrib.getValue( PAGE_WIDTH ); Object heightRaw = m_attrib.getValue( PAGE_HEIGHT ); - + if ((widthRaw instanceof Integer) && (heightRaw instanceof Integer) && ((Integer) widthRaw).intValue() > ((Integer) heightRaw).intValue()) { writeControlWord( "landscape" ); } - } + } } - + /** RtfPage - attributes accessor */ public RtfAttributes getAttributes(){ return m_attrib; } - + /** RtfPage - is overwritten here because page attributes have no content - only attributes. RtfContainer is defined not to write when empty. + only attributes. RtfContainer is defined not to write when empty. Therefore must make this true to print.*/ protected boolean okToWriteRtf() { return true; } - + } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageArea.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageArea.java index 53070bf5e..45f372658 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageArea.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageArea.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -64,13 +70,13 @@ extends RtfContainer private RtfPage m_currentPage; private RtfNull nullChild; private RtfAttributes childAttributes; - + /** Create an RTF element as a child of given container */ RtfPageArea(RtfFile f,Writer w) throws IOException { super(f,w); } - + /** close current Rtfpage if any and create a new one */ public RtfPage newPage(RtfAttributes attr) throws IOException { @@ -81,7 +87,7 @@ extends RtfContainer return m_currentPage; } - + protected boolean okToWriteRtf() { return true; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageBreak.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageBreak.java index 38bc9b956..d02349c32 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageBreak.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageBreak.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; @@ -66,13 +72,13 @@ public class RtfPageBreak extends RtfElement { super((RtfContainer)parent,w); } - + /** overridden to write our attributes before our content */ protected void writeRtfContent() throws IOException { writeControlWord("page"); - } - + } + /** true if this element would generate no "useful" RTF content */ public boolean isEmpty() { diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumber.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumber.java index 5a4deedae..571482a67 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumber.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumber.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java index 2c345347b..618cb004e 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraph.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraph.java index 409714573..bb30c76aa 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraph.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraph.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java index 9f92b84e7..bb6458a1d 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; @@ -59,14 +65,14 @@ import java.util.*; import java.io.IOException; public class RtfParagraphKeepTogether extends RtfContainer{ - + public static final int STATUS_NULL=0; public static final int STATUS_OPEN_PARAGRAPH=1; public static final int STATUS_CLOSE_PARAGRAPH=2; private int m_status =STATUS_NULL; - - /** RtfParagraphKeepTogether*/ + + /** RtfParagraphKeepTogether*/ RtfParagraphKeepTogether(IRtfParagraphContainer parent, Writer w) throws IOException { super((RtfContainer)parent,w); } @@ -80,28 +86,28 @@ public class RtfParagraphKeepTogether extends RtfContainer{ writeControlWord("pard"); writeControlWord("par"); writeControlWord("keepn"); - writeGroupMark(true); + writeGroupMark(true); m_status = STATUS_NULL; } if (m_status == STATUS_CLOSE_PARAGRAPH) { writeGroupMark(false); - m_status = STATUS_NULL; + m_status = STATUS_NULL; } } - - + + public void setStatus(int status) { - m_status = status; - } + m_status = status; + } /** true if this element would generate no "useful" RTF content */ public boolean isEmpty() { return false; } - + } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java index 74308a43b..4cb29d280 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStringConverter.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStringConverter.java index ec82ab6bd..52ffe6e67 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStringConverter.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStringConverter.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; @@ -63,12 +68,12 @@ import java.io.Writer; public class RtfStringConverter { private static final RtfStringConverter m_instance = new RtfStringConverter(); - + private static final Map m_specialChars; private static final Character DBLQUOTE = new Character('\"'); private static final Character QUOTE = new Character('\''); private static final Character SPACE = new Character(' '); - + /** List of characters to escape with corresponding replacement strings */ static { m_specialChars = new HashMap(); @@ -80,20 +85,20 @@ public class RtfStringConverter { m_specialChars.put(new Character('{'),"{"); m_specialChars.put(new Character('}'),"}"); } - + /** singleton pattern */ private RtfStringConverter() { } - + /** use this to get an object of this class */ public static RtfStringConverter getInstance() { return m_instance; } - + /** write given String to given Writer, converting characters as required by RTF spec */ public void writeRtfString(Writer w,String str) throws IOException { if(str == null) return; - + // TODO: could be made more efficient (binary lookup, etc.) for(int i=0; i < str.length(); i++) { final Character c = new Character(str.charAt(i)); @@ -104,7 +109,7 @@ public class RtfStringConverter { } else { d=new Character(str.charAt(i)); } - + //This section modified by Chris Scott //add "smart" quote recognition if(c.equals((Object)DBLQUOTE) && d.equals((Object)SPACE)) { @@ -114,7 +119,7 @@ public class RtfStringConverter { } else { replacement = (String)m_specialChars.get(c); } - + if(replacement != null) { // RTF-escaped char w.write('\\'); @@ -131,5 +136,5 @@ public class RtfStringConverter { } } } - + } diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java index d0b0dc768..794d0ab0b 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.util.Vector; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java index b65c7ce18..9d9b37a35 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java index bf8c6b6d0..871ea5d9f 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.*; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableRow.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableRow.java index 8ea29a6d9..bd5f277c0 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableRow.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableRow.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java index 40c8d62c9..0defc15ba 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.util.*; @@ -61,20 +67,20 @@ import java.io.File; * Singelton of the RTF style template * This class belongs to the tag processing. */ - + public class RtfTemplate { - + /** Singelton instance */ private static RtfTemplate instance = null; - + private String templateFilePath = null; - + /** * Constructor. */ private RtfTemplate () { - + } @@ -93,10 +99,10 @@ public class RtfTemplate { } - /** - *Set the template file and adjust tha path separator + /** + *Set the template file and adjust tha path separator * - *@param templateFilePath The full path of the template + *@param templateFilePath The full path of the template **/ public void setTemplateFilePath(String templateFilePath) throws IOException { // no validity checks here - leave this to the RTF client @@ -115,12 +121,12 @@ public class RtfTemplate { public void writeTemplate (RtfHeader header) throws IOException { if (templateFilePath == null || templateFilePath.length() == 0) return; - + header.writeGroupMark (true); header.writeControlWord ("template"); header.writeRtfString(this.templateFilePath); header.writeGroupMark (false); - + header.writeGroupMark (true); header.writeControlWord ("linkstyles"); header.writeGroupMark (false); diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java index fba214ed7..4a69b463d 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.io.IOException; @@ -59,7 +65,7 @@ import java.io.Writer; * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch */ -public class RtfText extends RtfElement +public class RtfText extends RtfElement { // char code for non-breakable space private static final int CHAR_NBSP = 160; @@ -67,17 +73,17 @@ public class RtfText extends RtfElement private static final int CHAR_NEW_LINE = 141; /* these next two variables are used to encode bold formating in the * raw xml text. Usefull when specific words or phrases are to be bolded - * but their placement and length change. Thus the bold formatting becomes + * but their placement and length change. Thus the bold formatting becomes * part of the data. The same method can be used for implementing other types - * of raw text formatting. + * of raw text formatting. */ private static final int CHAR_BOLD_START = 130; private static final int CHAR_BOLD_END = 131; - + /** members */ private String m_text; private final RtfAttributes m_attr; - + /** RtfText attributes: attribute names are RTF control word names to avoid additional mapping */ public static final String ATTR_BOLD = "b"; @@ -94,7 +100,7 @@ public class RtfText extends RtfElement public static String ALIGN_RIGHT = "qr"; public static String ALIGN_JUSTIFIED = "qj"; public static String ALIGN_DISTRIBUTED = "qd"; - + /** RtfText attributes: border attributes */ //added by Chris Scott public static String BDR_BOTTOM_SINGLE = "brdrb\\brsp40\\brdrs"; @@ -102,7 +108,7 @@ public class RtfText extends RtfElement public static String BDR_BOTTOM_EMBOSS = "brdrb\\brsp40\\brdremboss"; public static String BDR_BOTTOM_DOTTED = "brdrb\\brsp40\\brdrdot"; public static String BDR_BOTTOM_DASH = "brdrb\\brsp40\\brdrdash"; - + /** RtfText attributes: fields */ //must be carefull of group markings and star control //ie page field: @@ -110,20 +116,20 @@ public class RtfText extends RtfElement public static String RTF_FIELD = "field"; public static String RTF_FIELD_PAGE = "fldinst { PAGE }"; public static String RTF_FIELD_RESULT = "fldrslt"; - + /**RtfText attributes: indentation attributes */ //added by Chris Scott public static String LEFT_INDENT_BODY = "li"; public static String LEFT_INDENT_FIRST = "fi-"; - + public static String TAB_CENTER = "tqc\\tx"; public static String TAB_RIGHT = "tqr\\tx"; - public static String TAB_LEADER_DOTS = "tldot"; - public static String TAB_LEADER_HYPHEN = "tlhyph"; + public static String TAB_LEADER_DOTS = "tldot"; + public static String TAB_LEADER_HYPHEN = "tlhyph"; public static String TAB_LEADER_UNDER = "tlul"; public static String TAB_LEADER_THICK = "tlth"; public static String TAB_LEADER_EQUALS = "tleq"; - + /** Space before/after a paragraph */ //these lines were added by Boris Pouderous public static final String SPACE_BEFORE = "sb"; @@ -134,25 +140,25 @@ public class RtfText extends RtfElement { ALIGN_CENTER, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_JUSTIFIED, ALIGN_DISTRIBUTED }; - + /** RtfText attributes:: this must contain all border attribute names*/ //this line added by Chris Scott, Westinghouse public static String[] BORDER = new String [] { BDR_BOTTOM_SINGLE,BDR_BOTTOM_DOUBLE,BDR_BOTTOM_EMBOSS,BDR_BOTTOM_DOTTED,BDR_BOTTOM_DASH }; - + public static String[] INDENT = new String [] { LEFT_INDENT_BODY, LEFT_INDENT_FIRST }; - + public static String[] TABS = new String [] { TAB_CENTER ,TAB_RIGHT,TAB_LEADER_DOTS,TAB_LEADER_HYPHEN,TAB_LEADER_UNDER, TAB_LEADER_THICK,TAB_LEADER_EQUALS }; - + /** RtfText attributes: this must contain all attribute names */ public static final String [] ATTR_NAMES = { @@ -162,7 +168,7 @@ public class RtfText extends RtfElement ATTR_FONT_SIZE, ATTR_FONT_FAMILY, ATTR_FONT_COLOR, - ATTR_BACKGROUND_COLOR + ATTR_BACKGROUND_COLOR }; /** Create an RtfText in given IRtfTextContainer. @@ -179,13 +185,13 @@ public class RtfText extends RtfElement public void writeRtfContent() throws IOException { writeChars: { - + //these lines were added by Boris Pouderous if (m_attr != null) { writeAttributes(m_attr,new String[] {RtfText.SPACE_BEFORE}); writeAttributes(m_attr,new String[] {RtfText.SPACE_AFTER}); - } - + } + if(isTab()){ writeControlWord("tab"); }else if(isNewLine()){ @@ -204,7 +210,7 @@ public class RtfText extends RtfElement RtfStringConverter.getInstance().writeRtfString(m_writer,m_text); writeGroupMark(false); } - + } } @@ -213,7 +219,7 @@ public class RtfText extends RtfElement { return !isEmpty() && !isNbsp(); } - + /** IRtfTextContainer requirement: return a copy of our attributes */ public RtfAttributes getTextContainerAttributes() { if(m_attrib == null) return null; @@ -244,7 +250,7 @@ public class RtfText extends RtfElement return m_text == null || m_text.trim().length() == 0; } - /** + /** * True if text contains a single non-breaking space (#160). * TODO make this more general and/or merge with isEmpty? <-- what happen with empty paragraphs, if they will be removed, than NO, else ok * @@ -259,7 +265,7 @@ public class RtfText extends RtfElement return true; return false; } - + public boolean isTab() { if(m_text.trim().length()==1 && m_text.charAt(0)== CHAR_TAB) @@ -267,7 +273,7 @@ public class RtfText extends RtfElement else return false; } - + public boolean isNewLine() { if(m_text.trim().length()==1 && m_text.charAt(0)== CHAR_NEW_LINE) @@ -275,7 +281,7 @@ public class RtfText extends RtfElement else return false; } - + public boolean isBold(boolean isStart) { if(isStart){ @@ -289,7 +295,7 @@ public class RtfText extends RtfElement } return false; } - + /** get the attributes of our text */ public RtfAttributes getTextAttributes(){ return m_attr; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/WhitespaceCollapser.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/WhitespaceCollapser.java index 56a8bacf2..034c6df53 100755 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/WhitespaceCollapser.java +++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/WhitespaceCollapser.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.rtfdoc; import java.util.Iterator; @@ -62,7 +68,7 @@ import java.util.StringTokenizer; class WhitespaceCollapser { private final static String SPACE = " "; private boolean m_lastEndSpace = true; - + /** remove extra whitespace in RtfText elements that are inside c */ WhitespaceCollapser(RtfContainer c) { // process all texts @@ -78,11 +84,11 @@ class WhitespaceCollapser { } } } - + /** process one RtfText from our container */ private void processText(RtfText txt) { final String orig = txt.getText(); - + // tokenize the text based on whitespace and regenerate it so as // to collapse multiple spaces into one if(orig != null && orig.length() > 0) { @@ -90,7 +96,7 @@ class WhitespaceCollapser { final boolean endSpace = allSpaces || Character.isWhitespace(orig.charAt(orig.length() - 1)); final boolean beginSpace = Character.isWhitespace(orig.charAt(0)); final StringBuffer sb = new StringBuffer(orig.length()); - + // if text contains spaces only, keep at most one if(allSpaces) { if(!m_lastEndSpace) sb.append(SPACE); @@ -104,14 +110,14 @@ class WhitespaceCollapser { sb.append(SPACE); } first = false; - + sb.append(stk.nextToken()); if(stk.hasMoreTokens() || endSpace) { sb.append(SPACE); } } } - + txt.setText(sb.toString()); m_lastEndSpace = endSpace; } diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java index 222063d76..3fb29c4dc 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import org.apache.fop.rtf.rtflib.rtfdoc.*; diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java index 23dfde4ab..7c4f190bd 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.io.File; diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java index 3d7a4bf24..f1341f97c 100644 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; @@ -64,22 +70,22 @@ import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; class DummyTableColumnsInfo implements ITableColumnsInfo { - + public float getColumnWidth() { return INVALID_COLUM_WIDTH; } - + public void selectFirstColumn() { } - + public int getNumberOfColumns() { return 0; } - + public int getColumnIndex() { return 0; } - + public void selectNextColumn() { - } + } } \ No newline at end of file diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/ExternalGraphic.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/ExternalGraphic.java index ccaa52459..4b21aee8d 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/ExternalGraphic.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/ExternalGraphic.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/ListInTable.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/ListInTable.java index 32bc9266c..a77dd9bd5 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/ListInTable.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/ListInTable.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; @@ -65,19 +71,19 @@ class ListInTable extends TestDocument protected void generateDocument(RtfDocumentArea rda,RtfSection sect) throws IOException { sect.newParagraph().newText("There must be a table below where the second cell contains a bulleted list mixed with normal paragraphs"); - + final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo()); final RtfTableRow row = tbl.newTableRow(); row.newTableCell(RtfTableCell.DEFAULT_CELL_WIDTH).newParagraph().newText("cell A, simple"); - + final RtfTableCell c = row.newTableCell(RtfTableCell.DEFAULT_CELL_WIDTH); c.newParagraph().newText("cell B, contains this paragraph followed by a list and another paragraph"); fillList(c.newList(null),1,3); c.newParagraph().newText("Normal paragraph, follows the list."); - + row.newTableCell(RtfTableCell.DEFAULT_CELL_WIDTH).newParagraph().newText("cell C, simple"); } - + private void fillList(RtfList list,int listIndex,int nItems) throws IOException { diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/MergedTableCells.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/MergedTableCells.java index dfa4f8d53..338cd522c 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/MergedTableCells.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/MergedTableCells.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; @@ -66,7 +72,7 @@ class MergedTableCells extends TestDocument protected void generateDocument(RtfDocumentArea rda,RtfSection sect) throws IOException { sect.newParagraph().newText("This document contains a table with some merged cells."); - + final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo()); final int MM_TO_TWIPS = (int)(1440f / 25.4f); @@ -76,58 +82,58 @@ class MergedTableCells extends TestDocument RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS); c.setHMerge(c.MERGE_START); c.newParagraph().newText("cell 0,0, width 80mm, merge start, followed by two merged cells totalling 80mm width."); - + c = r.newTableCell(40 * MM_TO_TWIPS); c.setHMerge(c.MERGE_WITH_PREVIOUS); c.newParagraph().newText("THIS IS IN AN HMERGED CELL, MUST NOT APPEAR IN RTF DOCUMENT"); - + c = r.newTableCell(40 * MM_TO_TWIPS); c.setHMerge(c.MERGE_WITH_PREVIOUS); c.newParagraph().newText("THIS IS IN AN HMERGED CELL, MUST NOT APPEAR IN RTF DOCUMENT"); } - + // second row, start vertical merging in column 1 { RtfTableRow r = tbl.newTableRow(); RtfTableCell c = r.newTableCell(40 * MM_TO_TWIPS); c.setVMerge(c.MERGE_START); c.newParagraph().newText("cell 1,0, vertical merge start, 40mm, spans three rows."); - + r.newTableCell(80 * MM_TO_TWIPS).newParagraph().newText("cell 1,1, no merge, 80mm"); - + c = r.newTableCell(40 * MM_TO_TWIPS); c.setVMerge(c.MERGE_START); c.newParagraph().newText("cell 1,2, vertical merge start, 40mm, spans two rows."); } - + // third row, column 1 merged with previous row { RtfTableRow r = tbl.newTableRow(); RtfTableCell c = r.newTableCell(40 * MM_TO_TWIPS); c.setVMerge(c.MERGE_WITH_PREVIOUS); c.newParagraph().newText("cell 2,0, VMERGED CELL, MUST NOT APPEAR IN RTF DOCUMENT"); - + r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 2,1, no merge, 40mm"); r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 2,2, no merge, 40mm"); - + c = r.newTableCell(40 * MM_TO_TWIPS); c.setVMerge(c.MERGE_WITH_PREVIOUS); c.newParagraph().newText("cell 2,3, VMERGED CELL, MUST NOT APPEAR IN RTF DOCUMENT"); } - + // fourth row, column 1 merged with previous row { RtfTableRow r = tbl.newTableRow(); RtfTableCell c = r.newTableCell(40 * MM_TO_TWIPS); c.setVMerge(c.MERGE_WITH_PREVIOUS); c.newParagraph().newText("cell 3,0, VMERGED CELL, MUST NOT APPEAR IN RTF DOCUMENT"); - + r.newTableCell(10 * MM_TO_TWIPS).newParagraph().newText("cell 3,1, no merge, 10mm"); r.newTableCell(30 * MM_TO_TWIPS).newParagraph().newText("cell 3,2, no merge, 30mm"); r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 3,3, no merge, 40mm"); r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 3,4, no merge, 40mm"); } - + // fifth row, just one cell { RtfTableRow r = tbl.newTableRow(); diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/NestedTable.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/NestedTable.java index 9be4e0f52..1854e3a65 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/NestedTable.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/NestedTable.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; @@ -61,29 +67,29 @@ import org.apache.fop.rtf.rtflib.rtfdoc.*; class NestedTable extends TestDocument { private static final int MM_TO_TWIPS = (int)(1440f / 25.4f); - + /** generate the body of the test document */ protected void generateDocument(RtfDocumentArea rda,RtfSection sect) throws IOException { sect.newParagraph().newText("This document demonstrates pseudo-nested tables created using merged table cells"); - + firstTestTable(sect); RtfParagraph p = sect.newParagraph(); p.newText("Test continues on next page."); p.newPageBreak(); secondTestTable(sect); - + p = sect.newParagraph(); p.newText("Test continues on next page."); p.newPageBreak(); thirdTestTable(sect); - + sect.newParagraph().newText("End of nested tables test document"); } - + private void firstTestTable(RtfSection sect) throws IOException { - + sect.newParagraph().newText("First test: table with one nested table in cell 1,1"); final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo()); // first row, normal @@ -92,30 +98,30 @@ class NestedTable extends TestDocument { RtfTableCell c = r.newTableCell(160 * MM_TO_TWIPS); c.newParagraph().newText("cell 0,0, width 160mm, only cell in this row."); } - + // second row contains nested table { RtfTableRow r = tbl.newTableRow(); r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 1,0, width 40mm, to the left of nested table."); - + final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS); c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'AFTER NESTED TABLE'."); fillNestedTable(c.newTable(new DummyTableColumnsInfo()),1); c.newParagraph().newText("AFTER NESTED TABLE"); - + r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 1,2, width 40mm, to the right of nested table."); } - + // third row, normal { RtfTableRow r = tbl.newTableRow(); r.newTableCell(80 * MM_TO_TWIPS).newParagraph().newText("cell 2,0, width 80mm, this row has two cells."); r.newTableCell(80 * MM_TO_TWIPS).newParagraph().newText("cell 2,1, width 80mm, last cell."); } - + } - - private void secondTestTable(RtfSection sect) + + private void secondTestTable(RtfSection sect) throws IOException { sect.newParagraph().newText("Second test: table with two nested tables in cell 1,1"); final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo()); @@ -125,22 +131,22 @@ class NestedTable extends TestDocument { RtfTableCell c = r.newTableCell(160 * MM_TO_TWIPS); c.newParagraph().newText("second test table: cell 0,0, width 160mm, only cell in this row."); } - + // second row contains nested table { RtfTableRow r = tbl.newTableRow(); r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 1,0, width 40mm, to the left of nested tables."); - + final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS); c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'BETWEEN', then another table, then 'AFTER'."); fillNestedTable(c.newTable(new DummyTableColumnsInfo()),2); c.newParagraph().newText("BETWEEN"); fillNestedTable(c.newTable(new DummyTableColumnsInfo()),3); c.newParagraph().newText("AFTER"); - + r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 1,2, width 40mm, to the right of nested table."); } - + // third row, normal { RtfTableRow r = tbl.newTableRow(); @@ -148,8 +154,8 @@ class NestedTable extends TestDocument { r.newTableCell(80 * MM_TO_TWIPS).newParagraph().newText("cell 2,1, width 80mm, last cell."); } } - - private void thirdTestTable(RtfSection sect) + + private void thirdTestTable(RtfSection sect) throws IOException { sect.newParagraph().newText("Third test: table with two nested tables in cell 1,1 and one nested table in cell 0,1"); final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo()); @@ -161,22 +167,22 @@ class NestedTable extends TestDocument { c = r.newTableCell(80 * MM_TO_TWIPS); fillNestedTable(c.newTable(new DummyTableColumnsInfo()),4); } - + // second row contains nested table { RtfTableRow r = tbl.newTableRow(); r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 1,0, width 40mm, to the left of nested tables."); - + final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS); c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'BETWEEN', then another table, then 'AFTER'."); fillNestedTable(c.newTable(new DummyTableColumnsInfo()),5); c.newParagraph().newText("BETWEEN"); fillNestedTable(c.newTable(new DummyTableColumnsInfo()),6); c.newParagraph().newText("AFTER"); - + r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText("cell 1,2, width 40mm, to the right of nested table."); } - + // third row, normal { RtfTableRow r = tbl.newTableRow(); @@ -184,7 +190,7 @@ class NestedTable extends TestDocument { r.newTableCell(80 * MM_TO_TWIPS).newParagraph().newText("cell 2,1, width 80mm, last cell."); } } - + /** fill the nested table */ private void fillNestedTable(RtfTable tbl, int index) throws IOException { @@ -195,13 +201,13 @@ class NestedTable extends TestDocument { id + ":nested cell 0,0. Nested table contains 3 rows with 1,2 and 3 cells respectively" ); } - + { RtfTableRow r = tbl.newTableRow(); r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText(id + ":nested cell 1,0, 40mm."); r.newTableCell(40 * MM_TO_TWIPS).newParagraph().newText(id + ":nested cell 1,1, 40mm."); } - + { RtfTableRow r = tbl.newTableRow(); r.newTableCell(30 * MM_TO_TWIPS).newParagraph().newText(id + ":nested cell 2,0, 30mm."); diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/ParagraphAlignment.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/ParagraphAlignment.java index 3d31fcbd4..ac7e2992a 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/ParagraphAlignment.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/ParagraphAlignment.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleDocument.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleDocument.java index fa20fe372..34b1e9b8c 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleDocument.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleDocument.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; @@ -60,14 +66,14 @@ import org.apache.fop.rtf.rtflib.rtfdoc.*; * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch */ -class SimpleDocument +class SimpleDocument extends TestDocument { /** generate the body of the test document */ protected void generateDocument(RtfDocumentArea rda,RtfSection sect) throws IOException { sect.newParagraph().newText("First paragraph of the simple RTF test document."); - + final RtfParagraph para = sect.newParagraph(); para.newText("Second paragraph of simple RTF test document.\n"); for(int i=0; i < 242; i++) { diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleLists.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleLists.java index 129fba3e4..a33291204 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleLists.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleLists.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; @@ -71,13 +77,13 @@ class SimpleLists extends TestDocument sect.newParagraph().newText("Normal paragraph between lists 1 and 2."); makeList(sect,2,3,null); sect.newParagraph().newText("Normal paragraph after list 2."); - + sect.newParagraph().newText("Now a numbered list (4 items):"); final RtfList.NumberingStyle nn = new RtfList.NumberingStyle(); nn.isBulletedList = false; makeList(sect,3,4,nn); } - + private void makeList(RtfSection sect,int listIndex,int nItems,RtfList.NumberingStyle ns) throws IOException { diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleTable.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleTable.java index 06f43d9e2..59e69e44b 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleTable.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleTable.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; @@ -66,14 +72,14 @@ class SimpleTable extends TestDocument { final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo()); final int MAX_ROW = 2; final int MAX_COL = 3; - + final int INCH_TO_TWIPS = 1440; final int c1w = 4; tbl.newTableRow().newTableCell(c1w * INCH_TO_TWIPS).newParagraph().newText("Here's a table row with just one cell, width " + c1w + "''"); - + for(int row=0; row < MAX_ROW; row++) { final RtfTableRow r = tbl.newTableRow(); - + for(int col=0; col < MAX_COL; col++) { final float widthInInches = col / 2f + 1f; final int widthInTwips = (int)(widthInInches * INCH_TO_TWIPS); @@ -86,7 +92,7 @@ class SimpleTable extends TestDocument { } } } - + sect.newParagraph().newText("This paragraph follows the table."); } } \ No newline at end of file diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java index 7d3b26574..c8ed60fb4 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/TextAttributes.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/TextAttributes.java index c5b87e4a5..547f51252 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/TextAttributes.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/TextAttributes.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; @@ -70,21 +76,21 @@ class TextAttributes extends TestDocument para.newText("This is bold\n",new RtfAttributes().set(RtfText.ATTR_BOLD)); para.newText("This is italic\n",new RtfAttributes().set(RtfText.ATTR_ITALIC)); para.newText("This is underline\n",new RtfAttributes().set(RtfText.ATTR_UNDERLINE)); - + // RTF font sizes are in half-points para.newText("This is size 48\n",new RtfAttributes().set(RtfText.ATTR_FONT_SIZE,96)); - + para.newText( "This is bold and italic\n", new RtfAttributes().set(RtfText.ATTR_BOLD).set(RtfText.ATTR_ITALIC) ); - + final RtfAttributes attr = new RtfAttributes(); attr.set(RtfText.ATTR_BOLD).set(RtfText.ATTR_ITALIC); attr.set(RtfText.ATTR_UNDERLINE); attr.set(RtfText.ATTR_FONT_SIZE,72); para.newText("This is bold, italic, underline and size 36\n",attr); - + para.newText("This is back to normal\n"); } } \ No newline at end of file diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/Whitespace.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/Whitespace.java index cffac2c92..663f49bb2 100755 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/Whitespace.java +++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/Whitespace.java @@ -43,13 +43,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. + */ + package org.apache.fop.rtf.rtflib.testdocs; import java.util.Date; @@ -68,7 +74,7 @@ class Whitespace extends TestDocument final RtfParagraph p1 = sect.newParagraph(); p1.newText("\t Each word of this paragraph must be separated\tfrom\t\n\tthe next word with exactly\t \tone"); p1.newText(" space."); - + final RtfParagraph p2 = sect.newParagraph(); p2.newText(""); p2.newText("In this"); @@ -78,7 +84,7 @@ class Whitespace extends TestDocument p2.newText("exactly"); p2.newText(" one space "); p2.newText("between each\tword and the next, and no spaces at the beginning or end of the paragraph."); - + final RtfParagraph p3 = sect.newParagraph(); p3.newText("The word 'boomerang' must be written after this with no funny spacing: "); p3.newText("boo"); diff --git a/src/java/org/apache/fop/rtf/rtflib/tools/ImageConstants.java b/src/java/org/apache/fop/rtf/rtflib/tools/ImageConstants.java index c536535fd..479cab708 100755 --- a/src/java/org/apache/fop/rtf/rtflib/tools/ImageConstants.java +++ b/src/java/org/apache/fop/rtf/rtflib/tools/ImageConstants.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.tools; diff --git a/src/java/org/apache/fop/rtf/rtflib/tools/ImageUtil.java b/src/java/org/apache/fop/rtf/rtflib/tools/ImageUtil.java index 2f3abf452..a09907835 100755 --- a/src/java/org/apache/fop/rtf/rtflib/tools/ImageUtil.java +++ b/src/java/org/apache/fop/rtf/rtflib/tools/ImageUtil.java @@ -43,12 +43,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * - * The RTF library of the FOP project consists of voluntary contributions made by - * many individuals on behalf of the Apache Software Foundation and was originally - * created by Bertrand Delacretaz and contributors of - * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. - * For more information on the Apache Software Foundation, please - * see . + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ + +/* + * This file is part of the RTF library of the FOP project, which was originally + * created by Bertrand Delacretaz and by other + * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to + * the FOP project. */ package org.apache.fop.rtf.rtflib.tools;