apply patch from Peter Herweg for RTF pagination properties (see http://nagoya.apache...

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

diff --git a/src/java/org/apache/fop/rtf/renderer/PageAttributesConverter.java b/src/java/org/apache/fop/rtf/renderer/PageAttributesConverter.java
new file mode 100644 (file)
index 0000000..4f1bc58
--- /dev/null
+++ b/src/java/org/apache/fop/rtf/renderer/PageAttributesConverter.java
@@ -0,0 +1,123 @@
+/*
+ * ============================================================================
+ *                    The Apache Software License, Version 1.1
+ * ============================================================================
+ *
+ * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if any, must
+ *    include the following acknowledgment: "This product includes software
+ *    developed by the Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself, if
+ *    and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "FOP" and "Apache Software Foundation" must not be used to
+ *    endorse or promote products derived from this software without prior
+ *    written permission. For written permission, please contact
+ *    apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache", nor may
+ *    "Apache" appear in their name, without prior written permission of the
+ *    Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ============================================================================
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * on behalf of the Apache Software Foundation and was originally created by
+ * James Tauber <jtauber@jtauber.com>. For more information on the Apache
+ * Software Foundation, please see <http://www.apache.org/>.
+ */
+
+package org.apache.fop.rtf.renderer;
+
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+
+//FOP
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
+import org.apache.fop.rtf.rtflib.rtfdoc.RtfPage;
+import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.Property;
+
+
+/**  Converts simple-page-master attributes into strings as defined in RtfPage.
+ *  @author Christopher Scott, scottc@westinghouse.com
+ *  @author Peter Herweg, pherweg@web.de
+ */
+
+class PageAttributesConverter {
+
+    private static Logger log = new ConsoleLogger();
+
+    /** convert xsl:fo attributes to RTF text attributes */
+    static RtfAttributes convertPageAttributes(PropertyList props, PropertyList defProps) {
+        RtfAttributes attrib = null;
+
+        try {
+            Property p;
+
+            if (defProps != null) {
+                attrib = convertPageAttributes(defProps, null);
+            } else {
+                attrib = new RtfAttributes();
+            }
+
+            if ((p = props.get("page-width")) != null) {
+                Float f = new Float(p.getLength().getValue() / 1000f);
+                attrib.set(RtfPage.PAGE_WIDTH,
+                    (int)FoUnitsConverter.getInstance().convertToTwips(f.toString() + "pt"));
+            }
+            if ((p = props.get("page-height")) != null) {
+                Float f = new Float(p.getLength().getValue() / 1000f);
+                attrib.set(RtfPage.PAGE_HEIGHT,
+                    (int)FoUnitsConverter.getInstance().convertToTwips(f.toString() + "pt"));
+            }
+            if ((p = props.get("margin-top")) != null) {
+                Float f = new Float(p.getLength().getValue() / 1000f);
+                attrib.set(RtfPage.MARGIN_TOP,
+                    (int)FoUnitsConverter.getInstance().convertToTwips(f.toString() + "pt"));
+            }
+            if ((p = props.get("margin-bottom")) != null) {
+                Float f = new Float(p.getLength().getValue() / 1000f);
+                attrib.set(RtfPage.MARGIN_BOTTOM,
+                    (int)FoUnitsConverter.getInstance().convertToTwips(f.toString() + "pt"));
+            }
+            if ((p = props.get("margin-left")) != null) {
+                Float f = new Float(p.getLength().getValue() / 1000f);
+                attrib.set(RtfPage.MARGIN_LEFT,
+                    (int)FoUnitsConverter.getInstance().convertToTwips(f.toString() + "pt"));
+            }
+            if ((p = props.get("margin-right")) != null) {
+                Float f = new Float(p.getLength().getValue() / 1000f);
+                attrib.set(RtfPage.MARGIN_RIGHT,
+                    (int)FoUnitsConverter.getInstance().convertToTwips(f.toString() + "pt"));
+            }
+        } catch (FOPException e) {
+            log.error("Exception in convertPageAttributes: " + e.getMessage() + "- page attributes ignored");
+            attrib=new RtfAttributes();
+        }
+
+        return attrib;
+    }
+}

diff --git a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
index 6319390b22135a67dbc85d9ce4cac9f4e10df57f..acd5ee2f6a3884f95496f4cf2decb5c3a740c64d 100644 (file)
--- a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
+++ b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
@@ -74,6 +74,7 @@ import org.apache.fop.fo.flow.TableCell;
 import org.apache.fop.fo.flow.TableRow;
 import org.apache.fop.fo.pagination.Flow;
 import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.fo.pagination.SimplePageMaster;
 import org.apache.fop.fo.properties.Constants;
 import org.apache.fop.fo.Property;
 import org.apache.fop.apps.Document;
@@ -179,6 +180,23 @@ public class RTFHandler extends FOInputHandler {
     public void startPageSequence(PageSequence pageSeq)  {
         try {
             sect = docArea.newSection();
+
+            //read page size and margins, if specified
+            Property prop;
+            if((prop=pageSeq.properties.get("master-reference"))!=null) {
+                String reference=prop.getString();
+
+                SimplePageMaster pagemaster=
+                    pageSeq.getLayoutMasterSet().getSimplePageMaster(reference);
+
+                //only simple-page-master supported, so pagemaster may be null
+                if(pagemaster!=null) {
+                    sect.getRtfAttributes().set(
+                        PageAttributesConverter.convertPageAttributes(
+                            pagemaster.properties,null));
+                }
+            }
+
             builderContext.pushContainer(sect);
 
             bHeaderSpecified = 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 2ab15a40a122d307ad1a6d6187cf20814499866f..ae915ba7566cb40122a584de52a87861e4e43777 100755 (executable)
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java
@@ -213,6 +213,7 @@ implements
      */
     protected void writeRtfPrefix() throws IOException {
         writeControlWord("sectd");
+        writeAttributes(attrib, RtfPage.PAGE_ATTR);
     }
 
     /**