From 79f8cbdb1e9a5a8f46e23f032b62566c1f458017 Mon Sep 17 00:00:00 2001
From: Adrian Cumiskey <acumiskey@apache.org>
Date: Fri, 26 Sep 2008 11:27:35 +0000
Subject: [PATCH] Merged revisions
 693433,693462,693720,693742,693781,693784,693841,695491,695500,695776,696365,697140,697152,698280,698322,698670
 via svnmerge from https://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r693433 | acumiskey | 2008-09-09 12:00:58 +0100 (Tue, 09 Sep 2008) | 1 line

  Make PFM string parsing a little more robust
........
  r693462 | acumiskey | 2008-09-09 14:35:13 +0100 (Tue, 09 Sep 2008) | 1 line

  This is a better fix which will cater for the case where the first character encountered is the EOF (-1) character.  EOF test now only occurs when loop is exit so this should execute more efficiently.
........
  r693720 | jeremias | 2008-09-10 08:46:23 +0100 (Wed, 10 Sep 2008) | 1 line

  Some older TTF fonts have shorter OS/2 tables. This fixes potential EOFExceptions.
........
  r693742 | jeremias | 2008-09-10 10:00:16 +0100 (Wed, 10 Sep 2008) | 3 lines

  Bugzilla #45616:
  Fix for table handling in RTF output, so the output works with OpenOffice and AbiWord, too.
  Submitted by: Pavel Kysilka <goldenfish.at.linuxsoft.cz>
........
  r693781 | jeremias | 2008-09-10 11:52:45 +0100 (Wed, 10 Sep 2008) | 3 lines

  Bugzilla #45734:
  Fix for PFMReader after bug #43089 (r567078) changed the behavior of PFMFile. Fixes baseline problems when Type 1 fonts are used in conjunction with XML font metric files.
  Submitted by: J. Frantzius <jfrantzius.at.web.de>
........
  r693784 | jeremias | 2008-09-10 11:59:27 +0100 (Wed, 10 Sep 2008) | 1 line

  Credits where credits are due. I only noticed afterwards that there was a patch attached to the issue.
........
  r693841 | adelmelle | 2008-09-10 14:24:00 +0100 (Wed, 10 Sep 2008) | 1 line

  Minor fix: avoid attempts at converting a default namespace declaration as a FO property, if the parser reports it as a regular attribute
........
  r695491 | jeremias | 2008-09-15 16:06:28 +0100 (Mon, 15 Sep 2008) | 1 line

  PDF Output: Made sure the XMP Metadata stream is never compressed.
........
  r695500 | jeremias | 2008-09-15 16:15:44 +0100 (Mon, 15 Sep 2008) | 2 lines

  Bugzilla #45755:
  Removed ALv2 license header as this file does not have a "creativity" value and only serves as an example.
........
  r695776 | maxberger | 2008-09-16 09:56:12 +0100 (Tue, 16 Sep 2008) | 4 lines

  Re-enabled image loader testcases
  Made sure SVG converters use SVG flavor (updated in commons)
  Added new ImageLoaderTest which tests JPGs embedded in SVG
........
  r696365 | jeremias | 2008-09-17 17:41:14 +0100 (Wed, 17 Sep 2008) | 3 lines

  Bugzilla #45795:
  PDF Output: Added support for handling 16-bit alpha channel. They are currently converted to 8 bits.
........
  r697140 | jeremias | 2008-09-19 16:57:54 +0100 (Fri, 19 Sep 2008) | 1 line

  Fixed stray "xml.apache.org".
........
  r697152 | adelmelle | 2008-09-19 18:01:03 +0100 (Fri, 19 Sep 2008) | 1 line

  Bugzilla 45842: Use FOP_OPTS environment variable in fop.bat and fop.cmd (patch submitted by Carsten Siedentop)
........
  r698280 | adelmelle | 2008-09-23 19:48:34 +0100 (Tue, 23 Sep 2008) | 3 lines

  Bugzilla 40798: A conditional-page-master-reference with page-position="last" is also eligible for an only page (first as well as last)
  Additionally: added support for page-position="only"
........
  r698322 | adelmelle | 2008-09-23 20:55:02 +0100 (Tue, 23 Sep 2008) | 1 line

  Cleanup firstWhiteSpaceInSeq at end of block too...
........
  r698670 | adelmelle | 2008-09-24 18:45:51 +0100 (Wed, 24 Sep 2008) | 1 line

  Added two missing files from r698280
........


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@699279 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/fop.xconf                                |  16 ---
 fop.bat                                       |   2 +-
 fop.cmd                                       |   2 +-
 lib/xmlgraphics-commons-1.4svn.jar            | Bin 528636 -> 528722 bytes
 .../content/xdocs/0.94/extensions.xml         |   2 +-
 .../content/xdocs/0.95/extensions.xml         |   2 +-
 .../content/xdocs/trunk/extensions.xml        |   2 +-
 src/java/org/apache/fop/fo/PropertyList.java  |   9 +-
 .../apache/fop/fo/XMLWhiteSpaceHandler.java   |   1 +
 .../ConditionalPageMasterReference.java       |  66 +++-------
 .../fop/fo/pagination/PageSequence.java       |  59 ++++-----
 .../fop/fo/pagination/PageSequenceMaster.java |   6 +-
 .../RepeatablePageMasterAlternatives.java     |   3 +-
 .../RepeatablePageMasterReference.java        |   1 -
 .../pagination/SinglePageMasterReference.java |   5 +-
 .../fo/pagination/SubSequenceSpecifier.java   |   2 -
 .../org/apache/fop/fonts/apps/PFMReader.java  |   8 +-
 .../apache/fop/fonts/truetype/TTFFile.java    |  45 ++++---
 .../fop/fonts/type1/PFMInputStream.java       |   9 +-
 .../loader/batik/ImageConverterSVG2G2D.java   |   7 +-
 .../loader/batik/ImageLoaderFactorySVG.java   |   3 +-
 .../image/loader/batik/ImageLoaderSVG.java    |   4 +-
 .../apache/fop/layoutmgr/PageProvider.java    |   7 +-
 .../org/apache/fop/pdf/AlphaRasterImage.java  |  15 +++
 .../org/apache/fop/pdf/PDFFilterList.java     |  10 +-
 .../org/apache/fop/render/rtf/RTFHandler.java |   2 +-
 .../rtf/rtflib/rtfdoc/RtfTableCell.java       |  17 ++-
 status.xml                                    |  22 ++++
 .../org/apache/fop/StandardTestSuite.java     |   4 +
 .../loader/batik/ImageLoaderTestCase.java     |  70 +++++++++--
 .../page-position_last_bug40798.xml           | 118 ++++++++++++++++++
 .../standard-testcases/page-position_only.xml | 115 +++++++++++++++++
 32 files changed, 462 insertions(+), 172 deletions(-)
 create mode 100644 test/layoutengine/standard-testcases/page-position_last_bug40798.xml
 create mode 100644 test/layoutengine/standard-testcases/page-position_only.xml

diff --git a/conf/fop.xconf b/conf/fop.xconf
index 2f638c2b2..86b72a811 100644
--- a/conf/fop.xconf
+++ b/conf/fop.xconf
@@ -1,20 +1,4 @@
 <?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
 <!-- $Id$ -->
 
 <!--
diff --git a/fop.bat b/fop.bat
index a01c5ddb7..640ec56d2 100644
--- a/fop.bat
+++ b/fop.bat
@@ -81,4 +81,4 @@ if "%JAVACMD%" == "" set JAVACMD=java
 
 :runFop
 rem ECHO "%JAVACMD%"
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
diff --git a/fop.cmd b/fop.cmd
index 554b80795..b8bfb2096 100644
--- a/fop.cmd
+++ b/fop.cmd
@@ -70,6 +70,6 @@ if "%JAVACMD%" == "" set JAVACMD=java
 
 :runFop
 rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
 
 ENDLOCAL
diff --git a/lib/xmlgraphics-commons-1.4svn.jar b/lib/xmlgraphics-commons-1.4svn.jar
index 69c4dc791b41205fa2bd2854fd235c467fb1b9cb..7328fa62b1fb8ae34ff707bf64c0bf4dcfce715b 100644
GIT binary patch
delta 20197
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
GrTrhF$^8HT

delta 19876
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

diff --git a/src/documentation/content/xdocs/0.94/extensions.xml b/src/documentation/content/xdocs/0.94/extensions.xml
index dd4a79535..04d44ef6f 100644
--- a/src/documentation/content/xdocs/0.94/extensions.xml
+++ b/src/documentation/content/xdocs/0.94/extensions.xml
@@ -48,7 +48,7 @@
         <p>
           By convention, FO extensions in FOP use the "fox" namespace prefix.
           To use any of the FO extensions, add a namespace entry for 
-          <code>http://xml.apache.org/fop/extensions</code> to the root element:
+          <code>http://xmlgraphics.apache.org/fop/extensions</code> to the root element:
         </p>
         <source><![CDATA[<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">]]></source>
diff --git a/src/documentation/content/xdocs/0.95/extensions.xml b/src/documentation/content/xdocs/0.95/extensions.xml
index 483866e61..878494ecb 100644
--- a/src/documentation/content/xdocs/0.95/extensions.xml
+++ b/src/documentation/content/xdocs/0.95/extensions.xml
@@ -48,7 +48,7 @@
         <p>
           By convention, FO extensions in FOP use the "fox" namespace prefix.
           To use any of the FO extensions, add a namespace entry for 
-          <code>http://xml.apache.org/fop/extensions</code> to the root element:
+          <code>http://xmlgraphics.apache.org/fop/extensions</code> to the root element:
         </p>
         <source><![CDATA[<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">]]></source>
diff --git a/src/documentation/content/xdocs/trunk/extensions.xml b/src/documentation/content/xdocs/trunk/extensions.xml
index 483866e61..878494ecb 100644
--- a/src/documentation/content/xdocs/trunk/extensions.xml
+++ b/src/documentation/content/xdocs/trunk/extensions.xml
@@ -48,7 +48,7 @@
         <p>
           By convention, FO extensions in FOP use the "fox" namespace prefix.
           To use any of the FO extensions, add a namespace entry for 
-          <code>http://xml.apache.org/fop/extensions</code> to the root element:
+          <code>http://xmlgraphics.apache.org/fop/extensions</code> to the root element:
         </p>
         <source><![CDATA[<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">]]></source>
diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java
index 13f983841..709c4303b 100644
--- a/src/java/org/apache/fop/fo/PropertyList.java
+++ b/src/java/org/apache/fop/fo/PropertyList.java
@@ -370,8 +370,10 @@ public abstract class PropertyList {
 
         if (attributeValue != null) {
 
-            if (attributeName.startsWith("xmlns:")) {
-                //Ignore namespace declarations
+            if (attributeName.startsWith("xmlns:")
+                    || "xmlns".equals(attributeName)) {
+                //Ignore namespace declarations if the XML parser/XSLT processor
+                //reports them as 'regular' attributes
                 return;
             }
 
@@ -519,7 +521,7 @@ public abstract class PropertyList {
     }
 
     /**
-     * @param propID ID of property
+     * @param propId ID of property
      * @return new Property object
      * @throws PropertyException if there's a problem while processing the property
      */
@@ -638,7 +640,6 @@ public abstract class PropertyList {
         return new CommonAbsolutePosition(this);
     }
 
-
     /**
      * Constructs a CommonFont object.
      *
diff --git a/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java b/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
index 759cdaed9..cad9fb729 100644
--- a/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
+++ b/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
@@ -228,6 +228,7 @@ public class XMLWhiteSpaceHandler {
                     nestedBlockStack.pop();
                 }
                 charIter = null;
+                firstWhiteSpaceInSeq = null;
             }
         }
     }
diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
index eaa8c2491..7953731f1 100644
--- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
@@ -94,61 +94,33 @@ public class ConditionalPageMasterReference extends FObj {
      * @param isFirstPage True if page is first page
      * @param isLastPage True if page is last page
      * @param isBlankPage True if page is blank
-     * @param isOnlyPage True if page is the only page
      * @return True if the conditions for this reference are met
      */
     protected boolean isValid(boolean isOddPage,
                               boolean isFirstPage,
                               boolean isLastPage,
-                              boolean isOnlyPage,
                               boolean isBlankPage) {
-        // page-position
-        if (isOnlyPage) {
-            if (pagePosition != EN_ONLY) {
-                return false;
-            }
-        } else if (isFirstPage) {
-            if (pagePosition == EN_REST) {
-                return false;
-            } else if (pagePosition == EN_LAST) {
-                return false;
-            }
-        } else if (isLastPage) {
-            if (pagePosition == EN_REST) {
-                return false;
-            } else if (pagePosition == EN_FIRST) {
-                return false;
-            }
-        } else {
-            if (pagePosition == EN_FIRST) {
-                return false;
-            } else if (pagePosition == EN_LAST) {
-                return false;
-            }
-        }
 
-        // odd-or-even
-        if (isOddPage) {
-            if (oddOrEven == EN_EVEN) {
-              return false;
-            }
-        } else {
-            if (oddOrEven == EN_ODD) {
-              return false;
-            }
-        }
+        return (
+            // page-position
+            (pagePosition == EN_ANY
+                || (pagePosition == EN_FIRST && isFirstPage)
+                || (pagePosition == EN_LAST && isLastPage)
+                || (pagePosition == EN_ONLY && (isFirstPage && isLastPage))
+                || (pagePosition == EN_REST && !(isFirstPage || isLastPage))
+                )
+            // odd-or-even
+            && (oddOrEven == EN_ANY
+                || (oddOrEven == EN_ODD && isOddPage)
+                || (oddOrEven == EN_EVEN && !isOddPage)
+                )
+            // blank-or-not-blank
+            && (blankOrNotBlank == EN_ANY
+                || (blankOrNotBlank == EN_BLANK && isBlankPage)
+                || (blankOrNotBlank == EN_NOT_BLANK && !isBlankPage)
+                ));
+
 
-        // blank-or-not-blank
-        if (isBlankPage) {
-            if (blankOrNotBlank == EN_NOT_BLANK) {
-                return false;
-            }
-        } else {
-            if (blankOrNotBlank == EN_BLANK) {
-                return false;
-            }
-        }
-        return true;
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index bdcb27198..d41ac86ab 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -127,19 +127,19 @@ public class PageSequence extends AbstractPageSequence {
     protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
-            if (localName.equals("title")) {
+            if ("title".equals(localName)) {
                 if (titleFO != null) {
                     tooManyNodesError(loc, "fo:title");
-                } else if (flowMap.size() > 0) {
+                } else if (!flowMap.isEmpty()) {
                     nodesOutOfOrderError(loc, "fo:title", "fo:static-content");
                 } else if (mainFlow != null) {
                     nodesOutOfOrderError(loc, "fo:title", "fo:flow");
                 }
-            } else if (localName.equals("static-content")) {
+            } else if ("static-content".equals(localName)) {
                 if (mainFlow != null) {
                     nodesOutOfOrderError(loc, "fo:static-content", "fo:flow");
                 }
-            } else if (localName.equals("flow")) {
+            } else if ("flow".equals(localName)) {
                 if (mainFlow != null) {
                     tooManyNodesError(loc, "fo:flow");
                 }
@@ -157,15 +157,20 @@ public class PageSequence extends AbstractPageSequence {
     public void addChildNode(FONode child) throws FOPException {
         int childId = child.getNameId();
 
-        if (childId == FO_TITLE) {
-            this.titleFO = (Title) child;
-        } else if (childId == FO_FLOW) {
-            this.mainFlow = (Flow) child;
+        switch (childId) {
+        case FO_TITLE:
+            this.titleFO = (Title)child;
+            break;
+        case FO_FLOW:
+            this.mainFlow = (Flow)child;
             addFlow(mainFlow);
-        } else if (childId == FO_STATIC_CONTENT) {
-            addFlow((StaticContent) child);
-            String flowName = ((StaticContent) child).getFlowName();
-            flowMap.put(flowName, child);
+            break;
+        case FO_STATIC_CONTENT:
+            addFlow((StaticContent)child);
+            flowMap.put(((StaticContent)child).getFlowName(), child);
+            break;
+        default:
+            assert false;
         }
     }
 
@@ -245,17 +250,14 @@ public class PageSequence extends AbstractPageSequence {
      *      page sequence
      * @param isLastPage indicator whether this page is the last page of the
      *      page sequence
-     * @param isOnlyPage indicator whether this page is the only page of the
-     *      page sequence
      * @param isBlank indicator whether the page will be blank
      * @return the SimplePageMaster to use for this page
      * @throws PageProductionException if there's a problem determining the page master
      */
     public SimplePageMaster getNextSimplePageMaster(int page,
-            boolean isFirstPage,
-            boolean isLastPage,
-            boolean isOnlyPage,
-            boolean isBlank) throws PageProductionException {
+                                                    boolean isFirstPage,
+                                                    boolean isLastPage,
+                                                    boolean isBlank) throws PageProductionException {
 
         if (pageSequenceMaster == null) {
             return simplePageMaster;
@@ -266,11 +268,10 @@ public class PageSequence extends AbstractPageSequence {
                     + " isOdd=" + isOddPage
                     + " isFirst=" + isFirstPage
                     + " isLast=" + isLastPage
-                    + " isOnly=" + isOnlyPage
                     + " isBlank=" + isBlank + ")");
         }
         return pageSequenceMaster.getNextSimplePageMaster(isOddPage,
-            isFirstPage, isLastPage, isOnlyPage, isBlank);
+            isFirstPage, isLastPage, isBlank);
     }
 
     /**
@@ -278,29 +279,17 @@ public class PageSequence extends AbstractPageSequence {
      * @return true if there is a previous item, false if the current one was the first one.
      */
     public boolean goToPreviousSimplePageMaster() {
-        if (pageSequenceMaster == null) {
-            return true;
-        } else {
-            return pageSequenceMaster.goToPreviousSimplePageMaster();
-        }
+        return pageSequenceMaster == null || pageSequenceMaster.goToPreviousSimplePageMaster();
     }
 
     /** @return true if the page-sequence has a page-master with page-position="last" */
     public boolean hasPagePositionLast() {
-        if (pageSequenceMaster == null) {
-            return false;
-        } else {
-            return pageSequenceMaster.hasPagePositionLast();
-        }
+        return pageSequenceMaster != null && pageSequenceMaster.hasPagePositionLast();
     }
 
     /** @return true if the page-sequence has a page-master with page-position="only" */
     public boolean hasPagePositionOnly() {
-        if (pageSequenceMaster == null) {
-            return false;
-        } else {
-            return pageSequenceMaster.hasPagePositionOnly();
-        }
+        return pageSequenceMaster != null && pageSequenceMaster.hasPagePositionOnly();
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
index b1d8d4055..705b955e9 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
@@ -177,7 +177,6 @@ public class PageSequenceMaster extends FObj {
      * @param isOddPage True if the next page number is odd
      * @param isFirstPage True if the next page is the first
      * @param isLastPage True if the next page is the last
-     * @param isOnlyPage True if the next page is the only page
      * @param isBlankPage True if the next page is blank
      * @return the requested page master
      * @throws PageProductionException if there's a problem determining the next page master
@@ -185,7 +184,6 @@ public class PageSequenceMaster extends FObj {
     public SimplePageMaster getNextSimplePageMaster(boolean isOddPage,
                                                     boolean isFirstPage,
                                                     boolean isLastPage,
-                                                    boolean isOnlyPage,
                                                     boolean isBlankPage)
                                                       throws PageProductionException {
         if (currentSubSequence == null) {
@@ -198,7 +196,7 @@ public class PageSequenceMaster extends FObj {
             }
         }
         String pageMasterName = currentSubSequence
-            .getNextPageMasterName(isOddPage, isFirstPage, isLastPage, isOnlyPage, isBlankPage);
+            .getNextPageMasterName(isOddPage, isFirstPage, isLastPage, isBlankPage);
         boolean canRecover = true;
         while (pageMasterName == null) {
             SubSequenceSpecifier nextSubSequence = getNextSubSequence();
@@ -213,7 +211,7 @@ public class PageSequenceMaster extends FObj {
                 currentSubSequence = nextSubSequence;
             }
             pageMasterName = currentSubSequence
-                .getNextPageMasterName(isOddPage, isFirstPage, isLastPage, isOnlyPage, isBlankPage);
+                .getNextPageMasterName(isOddPage, isFirstPage, isLastPage, isBlankPage);
         }
         SimplePageMaster pageMaster = this.layoutMasterSet
             .getSimplePageMaster(pageMasterName);
diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
index d1e710c89..9b4c6544f 100644
--- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
+++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
@@ -117,7 +117,6 @@ public class RepeatablePageMasterAlternatives extends FObj
     public String getNextPageMasterName(boolean isOddPage,
                                         boolean isFirstPage,
                                         boolean isLastPage,
-                                        boolean isOnlyPage,
                                         boolean isBlankPage) {
         if (getMaximumRepeats() != INFINITE) {
             if (numberConsumed < getMaximumRepeats()) {
@@ -132,7 +131,7 @@ public class RepeatablePageMasterAlternatives extends FObj
         for (int i = 0; i < conditionalPageMasterRefs.size(); i++) {
             ConditionalPageMasterReference cpmr
                 = (ConditionalPageMasterReference)conditionalPageMasterRefs.get(i);
-            if (cpmr.isValid(isOddPage, isFirstPage, isLastPage, isOnlyPage, isBlankPage)) {
+            if (cpmr.isValid(isOddPage, isFirstPage, isLastPage, isBlankPage)) {
                 return cpmr.getMasterReference();
             }
         }
diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
index 60f8e0d6a..9bbe55939 100644
--- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
@@ -90,7 +90,6 @@ public class RepeatablePageMasterReference extends FObj
     public String getNextPageMasterName(boolean isOddPage,
                                         boolean isFirstPage,
                                         boolean isLastPage,
-                                        boolean isOnlyPage,
                                         boolean isEmptyPage) {
         if (getMaximumRepeats() != INFINITE) {
             if (numberConsumed < getMaximumRepeats()) {
diff --git a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
index 89416a534..be13455d7 100644
--- a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
@@ -86,8 +86,7 @@ public class SinglePageMasterReference extends FObj
     public String getNextPageMasterName(boolean isOddPage,
                                         boolean isFirstPage,
                                         boolean isLastPage,
-                                        boolean isOnlyPage,
-                                        boolean isEmptyPage) {
+                                        boolean isBlankPage) {
         if (this.state == FIRST) {
             this.state = DONE;
             return masterReference;
@@ -101,8 +100,6 @@ public class SinglePageMasterReference extends FObj
         this.state = FIRST;
     }
 
-
-
     /** {@inheritDoc} */
     public boolean goToPrevious() {
         if (state == FIRST) {
diff --git a/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java b/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java
index a8eddf5d3..aa2c2bb8b 100644
--- a/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java
+++ b/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java
@@ -31,7 +31,6 @@ public interface SubSequenceSpecifier {
      * @param isOddPage True if the next page number is odd
      * @param isFirstPage True if the next page is the first
      * @param isLastPage True if the next page is the last
-     * @param isOnlyPage True if the next page is the only page
      * @param isBlankPage True if the next page is blank
      * @return the page master name
      * @throws PageProductionException if there's a problem determining the next page master
@@ -39,7 +38,6 @@ public interface SubSequenceSpecifier {
     String getNextPageMasterName(boolean isOddPage,
                                  boolean isFirstPage,
                                  boolean isLastPage,
-                                 boolean isOnlyPage,
                                  boolean isBlankPage)
                                     throws PageProductionException;
 
diff --git a/src/java/org/apache/fop/fonts/apps/PFMReader.java b/src/java/org/apache/fop/fonts/apps/PFMReader.java
index 18b40993d..90dd1fd28 100644
--- a/src/java/org/apache/fop/fonts/apps/PFMReader.java
+++ b/src/java/org/apache/fop/fonts/apps/PFMReader.java
@@ -26,12 +26,14 @@ import java.util.Map;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
 import org.apache.commons.logging.LogFactory;
+
 import org.apache.fop.Version;
 import org.apache.fop.fonts.type1.PFMFile;
 import org.apache.fop.util.CommandLineLogger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
 /**
  * A tool which reads PFM files from Adobe Type 1 fonts and creates
@@ -256,7 +258,7 @@ public class PFMReader extends AbstractFontReader {
 
         el = doc.createElement("descender");
         root.appendChild(el);
-        value = new Integer(-pfm.getLowerCaseDescent());
+        value = new Integer(pfm.getLowerCaseDescent());
         el.appendChild(doc.createTextNode(value.toString()));
 
         Element bbox = doc.createElement("bbox");
diff --git a/src/java/org/apache/fop/fonts/truetype/TTFFile.java b/src/java/org/apache/fop/fonts/truetype/TTFFile.java
index f6b9ac020..409b3908b 100644
--- a/src/java/org/apache/fop/fonts/truetype/TTFFile.java
+++ b/src/java/org/apache/fop/fonts/truetype/TTFFile.java
@@ -983,10 +983,17 @@ public class TTFFile {
     /**
      * Read the "OS/2" table
      */
-    private final void readOS2(FontFileReader in) throws IOException {
+    private void readOS2(FontFileReader in) throws IOException {
         // Check if font is embeddable
-        if (dirTabs.get("OS/2") != null) {
-            seekTab(in, "OS/2", 2 * 2);
+        TTFDirTabEntry os2Entry = (TTFDirTabEntry)dirTabs.get("OS/2");
+        if (os2Entry != null) {
+            seekTab(in, "OS/2", 0);
+            int version = in.readTTFUShort();
+            if (log.isDebugEnabled()) {
+                log.debug("OS/2 table: version=" + version
+                        + ", offset=" + os2Entry.getOffset() + ", len=" + os2Entry.getLength());
+            }
+            in.skip(2); //xAvgCharWidth
             this.usWeightClass = in.readTTFUShort();
 
             // usWidthClass
@@ -1005,22 +1012,30 @@ public class TTFFile {
             in.skip(3 * 2);
             int v;
             os2Ascender = in.readTTFShort(); //sTypoAscender
-            log.debug("sTypoAscender: " + os2Ascender
-                        + " " + convertTTFUnit2PDFUnit(os2Ascender));
             os2Descender = in.readTTFShort(); //sTypoDescender
-            log.debug("sTypoDescender: " + os2Descender
-                        + " " + convertTTFUnit2PDFUnit(os2Descender));
             v = in.readTTFShort(); //sTypoLineGap
-            log.debug("sTypoLineGap: " + v);
             v = in.readTTFUShort(); //usWinAscent
-            log.debug("usWinAscent: " + v  + " " + convertTTFUnit2PDFUnit(v));
             v = in.readTTFUShort(); //usWinDescent
-            log.debug("usWinDescent: " + v + " " + convertTTFUnit2PDFUnit(v));
-            in.skip(2 * 4);
-            this.os2xHeight = in.readTTFShort(); //sxHeight
-            log.debug("sxHeight: " + this.os2xHeight);
-            this.os2CapHeight = in.readTTFShort(); //sCapHeight
-            log.debug("sCapHeight: " + this.os2CapHeight);
+            if (log.isDebugEnabled()) {
+                log.debug("sTypoAscender: " + os2Ascender
+                        + " " + convertTTFUnit2PDFUnit(os2Ascender));
+                log.debug("sTypoDescender: " + os2Descender
+                        + " " + convertTTFUnit2PDFUnit(os2Descender));
+                log.debug("sTypoLineGap: " + v);
+                log.debug("usWinAscent: " + v  + " " + convertTTFUnit2PDFUnit(v));
+                log.debug("usWinDescent: " + v + " " + convertTTFUnit2PDFUnit(v));
+            }
+
+            //version 1 OS/2 table might end here
+            if (os2Entry.getLength() >= 78 + (2 * 4) + (2 * 2)) {
+                in.skip(2 * 4);
+                this.os2xHeight = in.readTTFShort(); //sxHeight
+                this.os2CapHeight = in.readTTFShort(); //sCapHeight
+                if (log.isDebugEnabled()) {
+                    log.debug("sxHeight: " + this.os2xHeight);
+                    log.debug("sCapHeight: " + this.os2CapHeight);
+                }
+            }
 
         } else {
             isEmbeddable = true;
diff --git a/src/java/org/apache/fop/fonts/type1/PFMInputStream.java b/src/java/org/apache/fop/fonts/type1/PFMInputStream.java
index 596bf69bd..f563059c3 100644
--- a/src/java/org/apache/fop/fonts/type1/PFMInputStream.java
+++ b/src/java/org/apache/fop/fonts/type1/PFMInputStream.java
@@ -19,6 +19,7 @@
 
 package org.apache.fop.fonts.type1;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.DataInputStream;
@@ -30,7 +31,7 @@ import java.io.InputStreamReader;
  */
 public class PFMInputStream extends java.io.FilterInputStream {
 
-    private DataInputStream datain;
+    private final DataInputStream datain;
 
     /**
      * Constructs a PFMInputStream based on an InputStream representing the
@@ -97,11 +98,15 @@ public class PFMInputStream extends java.io.FilterInputStream {
     public String readString() throws IOException {
         InputStreamReader reader = new InputStreamReader(in, "ISO-8859-1");
         StringBuffer buf = new StringBuffer();
+
         int ch = reader.read();
-        while (ch != 0) {
+        while (ch > 0) {
             buf.append((char)ch);
             ch = reader.read();
         }
+        if (ch == -1) {
+            throw new EOFException("Unexpected end of stream reached");
+        }
         return buf.toString();
     }
 
diff --git a/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java b/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
index 624d99fc0..4d01e20fa 100644
--- a/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
@@ -32,19 +32,18 @@ import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.gvt.GraphicsNode;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
+import org.apache.fop.svg.SimpleSVGUserAgent;
 import org.apache.xmlgraphics.image.loader.Image;
 import org.apache.xmlgraphics.image.loader.ImageException;
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
 import org.apache.xmlgraphics.image.loader.ImageProcessingHints;
+import org.apache.xmlgraphics.image.loader.XMLNamespaceEnabledImageFlavor;
 import org.apache.xmlgraphics.image.loader.impl.AbstractImageConverter;
 import org.apache.xmlgraphics.image.loader.impl.ImageGraphics2D;
 import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
 import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
 import org.apache.xmlgraphics.util.UnitConv;
 
-import org.apache.fop.svg.SimpleSVGUserAgent;
-
 /**
  * This ImageConverter converts SVG images to Java2D.
  * <p>
@@ -132,7 +131,7 @@ public class ImageConverterSVG2G2D extends AbstractImageConverter {
 
     /** {@inheritDoc} */
     public ImageFlavor getSourceFlavor() {
-        return ImageFlavor.XML_DOM;
+        return XMLNamespaceEnabledImageFlavor.SVG_DOM;
     }
 
     /** {@inheritDoc} */
diff --git a/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java b/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java
index 9203bf7e8..b37ba925b 100644
--- a/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java
@@ -20,6 +20,7 @@
 package org.apache.fop.image.loader.batik;
 
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.XMLNamespaceEnabledImageFlavor;
 import org.apache.xmlgraphics.image.loader.impl.AbstractImageLoaderFactory;
 import org.apache.xmlgraphics.image.loader.spi.ImageLoader;
 import org.apache.xmlgraphics.util.MimeConstants;
@@ -30,7 +31,7 @@ import org.apache.xmlgraphics.util.MimeConstants;
 public class ImageLoaderFactorySVG extends AbstractImageLoaderFactory {
 
     private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
-        ImageFlavor.XML_DOM};
+        XMLNamespaceEnabledImageFlavor.SVG_DOM};
 
     private static final String[] MIMES = new String[] {
         MimeConstants.MIME_SVG};
diff --git a/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java b/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
index 483d6c502..c5c113b04 100644
--- a/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
+++ b/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
@@ -23,12 +23,12 @@ import java.io.IOException;
 import java.util.Map;
 
 import org.apache.batik.dom.svg.SVGDOMImplementation;
-
 import org.apache.xmlgraphics.image.loader.Image;
 import org.apache.xmlgraphics.image.loader.ImageException;
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
 import org.apache.xmlgraphics.image.loader.ImageInfo;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.XMLNamespaceEnabledImageFlavor;
 import org.apache.xmlgraphics.image.loader.impl.AbstractImageLoader;
 import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
 import org.apache.xmlgraphics.util.MimeConstants;
@@ -45,7 +45,7 @@ public class ImageLoaderSVG extends AbstractImageLoader {
      * @param targetFlavor the target flavor
      */
     public ImageLoaderSVG(ImageFlavor targetFlavor) {
-        if (!(ImageFlavor.XML_DOM.equals(targetFlavor))) {
+        if (!(XMLNamespaceEnabledImageFlavor.SVG_DOM.equals(targetFlavor))) {
             throw new IllegalArgumentException("Unsupported target ImageFlavor: " + targetFlavor);
         }
         this.targetFlavor = targetFlavor;
diff --git a/src/java/org/apache/fop/layoutmgr/PageProvider.java b/src/java/org/apache/fop/layoutmgr/PageProvider.java
index 55c78ba52..9073c48bb 100644
--- a/src/java/org/apache/fop/layoutmgr/PageProvider.java
+++ b/src/java/org/apache/fop/layoutmgr/PageProvider.java
@@ -234,13 +234,13 @@ public class PageProvider implements Constants {
             indexOfCachedLastPage = (isLastPage ? intIndex : -1);
         }
         if (replace) {
-            disardCacheStartingWith(intIndex);
+            discardCacheStartingWith(intIndex);
             page = cacheNextPage(index, isBlank, isLastPage);
         }
         return page;
     }
 
-    private void disardCacheStartingWith(int index) {
+    private void discardCacheStartingWith(int index) {
         while (index < cachedPages.size()) {
             this.cachedPages.remove(cachedPages.size() - 1);
             if (!pageSeq.goToPreviousSimplePageMaster()) {
@@ -251,8 +251,9 @@ public class PageProvider implements Constants {
 
     private Page cacheNextPage(int index, boolean isBlank, boolean isLastPage) {
         String pageNumberString = pageSeq.makeFormattedPageNumber(index);
+        boolean isFirstPage = (startPageOfPageSequence == index);
         SimplePageMaster spm = pageSeq.getNextSimplePageMaster(
-                index, (startPageOfPageSequence == index), isLastPage, false, isBlank);
+                index, isFirstPage, isLastPage, isBlank);
 
         Region body = spm.getRegion(FO_REGION_BODY);
         if (!pageSeq.getMainFlow().getFlowName().equals(body.getRegionName())) {
diff --git a/src/java/org/apache/fop/pdf/AlphaRasterImage.java b/src/java/org/apache/fop/pdf/AlphaRasterImage.java
index ae39cadb7..bd31148be 100644
--- a/src/java/org/apache/fop/pdf/AlphaRasterImage.java
+++ b/src/java/org/apache/fop/pdf/AlphaRasterImage.java
@@ -48,6 +48,9 @@ public class AlphaRasterImage implements PDFImage {
      */
     public AlphaRasterImage(String k, Raster alpha) {
         this.key = k;
+        //Enable the commented line below if 16-bit alpha channels are desired.
+        //Otherwise, we compress the alpha channel to 8 bit which should be sufficient.
+        //this.bitsPerComponent = alpha.getSampleModel().getSampleSize(0);
         this.bitsPerComponent = 8;
         this.colorSpace = new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_GRAY);
         if (alpha == null) {
@@ -148,6 +151,18 @@ public class AlphaRasterImage implements PDFImage {
                 alpha.getDataElements(0, y, w, 1, line);
                 out.write(line);
             }
+        } else if (dataType == DataBuffer.TYPE_USHORT) {
+            short[] sline = new short[nbands * w];
+            byte[] line = new byte[nbands * w];
+            for (int y = 0; y < h; y++) {
+                alpha.getDataElements(0, y, w, 1, sline);
+                for (int i = 0; i < w; i++) {
+                    //this compresses a 16-bit alpha channel to 8 bits!
+                    //we probably don't ever need a 16-bit channel
+                    line[i] = (byte)(sline[i] >> 8);
+                }
+                out.write(line);
+            }
         } else if (dataType == DataBuffer.TYPE_INT) {
             //Is there an better way to get a 8bit raster from a TYPE_INT raster?
             int shift = 24;
diff --git a/src/java/org/apache/fop/pdf/PDFFilterList.java b/src/java/org/apache/fop/pdf/PDFFilterList.java
index 5eab5c81a..3025b8788 100644
--- a/src/java/org/apache/fop/pdf/PDFFilterList.java
+++ b/src/java/org/apache/fop/pdf/PDFFilterList.java
@@ -163,6 +163,11 @@ public class PDFFilterList {
      * @param type which filter list to modify
      */
     public void addDefaultFilters(Map filters, String type) {
+        if (METADATA_FILTER.equals(type)) {
+            //XMP metadata should not be embedded in clear-text
+            addFilter(new NullFilter());
+            return;
+        }
         List filterset = null;
         if (filters != null) {
             filterset = (List)filters.get(type);
@@ -171,10 +176,7 @@ public class PDFFilterList {
             }
         }
         if (filterset == null || filterset.size() == 0) {
-            if (METADATA_FILTER.equals(type)) {
-                //XMP metadata should not be embedded in clear-text
-                addFilter(new NullFilter());
-            } else if (JPEG_FILTER.equals(type)) {
+            if (JPEG_FILTER.equals(type)) {
                 //JPEG is already well compressed
                 addFilter(new NullFilter());
             } else if (TIFF_FILTER.equals(type)) {
diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java
index 65c7bf681..d3762a436 100644
--- a/src/java/org/apache/fop/render/rtf/RTFHandler.java
+++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java
@@ -222,7 +222,7 @@ public class RTFHandler extends FOEventHandler {
                     PageSequenceMaster master
                         = pageSeq.getRoot().getLayoutMasterSet().getPageSequenceMaster(reference);
                     this.pagemaster = master.getNextSimplePageMaster(
-                            false, false, false, false, false);
+                            false, false, false, false);
                 }
             }
 
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
index 740ea36e5..09c39be12 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
@@ -26,8 +26,8 @@ package org.apache.fop.render.rtf.rtflib.rtfdoc;
  * the FOP project.
  */
 
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 import java.util.Iterator;
 
 /**  A cell in an RTF table, container for paragraphs, lists, etc.
@@ -237,12 +237,12 @@ public class RtfTableCell
             // Reach the column index in table context corresponding to the current column cell
             // id is the index of the current cell (it begins at 1)
             // getColumnIndex() is the index of the current column in table context (it begins at 0)
-            //  => so we must widthdraw 1 when comparing these two variables.
+            //  => so we must withdraw 1 when comparing these two variables.
             while ((this.id - 1) != tableColumnsInfo.getColumnIndex()) {
                tableColumnsInfo.selectNextColumn();
             }
 
-            // We widthdraw one cell because the first cell is already created
+            // We withdraw one cell because the first cell is already created
             // (it's the current cell) !
             int i = nbMergedCells - 1;
             while (i > 0) {
@@ -255,21 +255,18 @@ public class RtfTableCell
         final int xPos = offset + iCurrentWidth;
 
         //these lines added by Chris Scott, Westinghouse
-        //some attributes need to be writting before opening block
+        //some attributes need to be written before opening block
         if (setCenter) {
-            writeControlWord("qc");
+            writeControlWord("trqc");
         } else if (setRight) {
-            writeControlWord("qr");
+            writeControlWord("trqr");
         } else {
-            writeControlWord("ql");
+            writeControlWord("trql");
         }
         writeAttributes (attrib, ITableAttributes.CELL_VERT_ALIGN);
 
         writeControlWord("cellx" + xPos);
 
-        //TODO Why is this here, right after an alignment command is written (see above)?
-        writeControlWord("ql");
-
         return xPos;
 
     }
diff --git a/status.xml b/status.xml
index 45ffdc714..b017528fe 100644
--- a/status.xml
+++ b/status.xml
@@ -53,6 +53,28 @@
 
   <changes>
     <release version="FOP Trunk" date="TBD">
+      <action context="Layout" dev="AD" type="fix" fixes-bug="40798">
+        Bugzilla 40798: A conditional-page-master-reference with page-position="last" qualifies
+        for a first page, if it is also the last. Additionally: also added support for
+        page-position="only".
+      </action>
+      <action context="Code" dev="AD" type="fix" fixes-bug="45842" due-to="Carsten Siedentop">
+        Make fop.bat and fop.cmd use the %FOP_OPTS% environment variable.
+      </action>
+      <action context="Renderers" dev="JM" type="add" fixes-bug="45795">
+        PDF Output: Added support for handling 16-bit alpha channel. They are currently
+        converted to 8 bits.
+      </action>
+      <action context="Renderers" dev="JM" type="fix">
+        PDF Output: Made sure the XMP Metadata stream is never compressed.
+      </action>
+      <action context="Fonts" dev="JM" type="fix" fixes-bug="45734" due-to="J. Frantzius">
+        Fix for PFMReader after bug #43089 changed the behavior of PFMFile. Fixes baseline
+        problems when Type 1 fonts are used in conjunction with XML font metric files.
+      </action>
+      <action context="Renderers" dev="JM" type="fix" fixes-bug="45616" due-to="Pavel Kysilka">
+        Fix for table handling in RTF output, so the output works with OpenOffice and AbiWord, too.
+      </action>
       <action context="Code" dev="AD" type="fix" fixes-bug="45667">
         Quick-fix to avoid a possible NullPointerException when using
         empty inlines and hyphenation.
diff --git a/test/java/org/apache/fop/StandardTestSuite.java b/test/java/org/apache/fop/StandardTestSuite.java
index c20683912..290b29050 100644
--- a/test/java/org/apache/fop/StandardTestSuite.java
+++ b/test/java/org/apache/fop/StandardTestSuite.java
@@ -23,6 +23,8 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.fop.fonts.TrueTypeAnsiTestCase;
+import org.apache.fop.image.loader.batik.ImageLoaderTestCase;
+import org.apache.fop.image.loader.batik.ImagePreloaderTestCase;
 import org.apache.fop.render.pdf.PDFAConformanceTestCase;
 import org.apache.fop.render.pdf.PDFCMapTestCase;
 import org.apache.fop.render.pdf.PDFEncodingTestCase;
@@ -50,6 +52,8 @@ public class StandardTestSuite {
         suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
         suite.addTest(new TestSuite(TrueTypeAnsiTestCase.class));
         suite.addTest(RichTextFormatTestSuite.suite());
+        suite.addTest(new TestSuite(ImageLoaderTestCase.class));
+        suite.addTest(new TestSuite(ImagePreloaderTestCase.class));
         //$JUnit-END$
         return suite;
     }
diff --git a/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java b/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
index 457aa91d4..97bfb4d5c 100644
--- a/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
+++ b/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
@@ -19,21 +19,23 @@
 
 package org.apache.fop.image.loader.batik;
 
+import java.awt.image.Raster;
+import java.awt.image.RenderedImage;
 import java.io.File;
 
 import junit.framework.TestCase;
 
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.FopFactory;
 import org.apache.xmlgraphics.image.loader.Image;
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
 import org.apache.xmlgraphics.image.loader.ImageInfo;
 import org.apache.xmlgraphics.image.loader.ImageManager;
+import org.apache.xmlgraphics.image.loader.XMLNamespaceEnabledImageFlavor;
 import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
 import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
 import org.apache.xmlgraphics.image.writer.ImageWriterUtil;
 
-import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.FopFactory;
-
 /**
  * Tests for bundled ImageLoader implementations.
  */
@@ -59,10 +61,10 @@ public class ImageLoaderTestCase extends TestCase {
         ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
         assertNotNull("ImageInfo must not be null", info);
 
-        Image img = manager.getImage(info, ImageFlavor.XML_DOM,
+        Image img = manager.getImage(info, XMLNamespaceEnabledImageFlavor.SVG_DOM,
                 userAgent.getImageSessionContext());
         assertNotNull("Image must not be null", img);
-        assertEquals(ImageFlavor.XML_DOM, img.getFlavor());
+        assertEquals(XMLNamespaceEnabledImageFlavor.SVG_DOM, img.getFlavor());
         ImageXMLDOM imgDom = (ImageXMLDOM)img;
         assertNotNull(imgDom.getDocument());
         assertEquals("http://www.w3.org/2000/svg", imgDom.getRootNamespace());
@@ -101,10 +103,10 @@ public class ImageLoaderTestCase extends TestCase {
         ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
         assertNotNull("ImageInfo must not be null", info);
 
-        Image img = manager.getImage(info, ImageFlavor.XML_DOM,
+        Image img = manager.getImage(info, XMLNamespaceEnabledImageFlavor.SVG_DOM,
                 userAgent.getImageSessionContext());
         assertNotNull("Image must not be null", img);
-        assertEquals(ImageFlavor.XML_DOM, img.getFlavor());
+        assertEquals(XMLNamespaceEnabledImageFlavor.SVG_DOM, img.getFlavor());
         ImageXMLDOM imgDom = (ImageXMLDOM)img;
         assertNotNull(imgDom.getDocument());
         assertEquals("http://www.w3.org/2000/svg", imgDom.getRootNamespace());
@@ -160,4 +162,58 @@ public class ImageLoaderTestCase extends TestCase {
         assertEquals(612000, info.getSize().getHeightMpt());
     }
 
+    public void testSVGWithReferences() throws Exception {
+        String uri = "test/resources/fop/svg/images.svg";
+        FopFactory ff = FopFactory.newInstance();
+        FOUserAgent userAgent = ff.newFOUserAgent();
+
+        ImageManager manager = ff.getImageManager();
+        ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
+        assertNotNull("ImageInfo must not be null", info);
+
+        Image img = manager.getImage(info, XMLNamespaceEnabledImageFlavor.SVG_DOM,
+                userAgent.getImageSessionContext());
+        assertNotNull("Image must not be null", img);
+        assertEquals(XMLNamespaceEnabledImageFlavor.SVG_DOM, img.getFlavor());
+        ImageXMLDOM imgDom = (ImageXMLDOM)img;
+        assertNotNull(imgDom.getDocument());
+        assertEquals("http://www.w3.org/2000/svg", imgDom.getRootNamespace());
+        info = imgDom.getInfo(); //Switch to the ImageInfo returned by the image
+        assertEquals(400000, info.getSize().getWidthMpt());
+        assertEquals(400000, info.getSize().getHeightMpt());
+        assertEquals(400, info.getSize().getWidthPx());
+        assertEquals(400, info.getSize().getHeightPx());
+
+        img = manager.getImage(info, ImageFlavor.RENDERED_IMAGE,
+                    userAgent.getImageSessionContext());
+        assertNotNull("Image must not be null", img);
+        assertEquals(ImageFlavor.RENDERED_IMAGE, img.getFlavor());
+        ImageRendered imgRed = (ImageRendered)img;
+        RenderedImage renImg = imgRed.getRenderedImage();
+        assertNotNull(renImg);
+        if (DEBUG_TARGET_DIR != null) {
+            ImageWriterUtil.saveAsPNG(renImg,
+                    (int)userAgent.getTargetResolution(),
+                    new File(DEBUG_TARGET_DIR, "images.svg.png"));
+        }
+        assertEquals(400, renImg.getWidth());
+        assertEquals(400, renImg.getHeight());
+        info = imgRed.getInfo(); //Switch to the ImageInfo returned by the image
+        assertEquals(400000, info.getSize().getWidthMpt());
+        assertEquals(400000, info.getSize().getHeightMpt());
+        Raster raster = renImg.getData();
+        // This pixel is white
+        int[] pixel1 = raster.getPixel(1, 1, (int[] )null);
+        // This pixel is from the embedded JPG and is not white
+        int[] pixel80 = raster.getPixel(80, 80, (int[]) null);
+        assertEquals(pixel1.length, pixel80.length);
+        boolean same = true;
+        for (int i = 0; i < pixel1.length; i++) {
+            same &= (pixel1[i] == pixel80[i]);
+        }
+        assertFalse("Embedding JPG into SVG failed", same);
+    }
+
+
+    
 }
diff --git a/test/layoutengine/standard-testcases/page-position_last_bug40798.xml b/test/layoutengine/standard-testcases/page-position_last_bug40798.xml
new file mode 100644
index 000000000..3292b42b1
--- /dev/null
+++ b/test/layoutengine/standard-testcases/page-position_last_bug40798.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks for the use of a 'last' conditional-page-master-reference 
+      for a first/only page (see: https://issues.apache.org/bugzilla/show_bug.cgi?id=40798)
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+           font-family="Times" font-size="20pt">
+    
+       <fo:layout-master-set>
+         <fo:simple-page-master master-name="only-page-layout"
+                             page-height="297mm" page-width="210mm"
+                             margin-top="15mm" margin-bottom="15mm"
+                             margin-left="15mm" margin-right="15mm">
+           <fo:region-body region-name="frame-body" margin-top="10mm"/>
+           <fo:region-before region-name="only-region" extent="10mm"/>
+         </fo:simple-page-master>
+         <fo:simple-page-master master-name="first-page-layout"
+                             page-height="297mm" page-width="210mm"
+                             margin-top="15mm" margin-bottom="15mm"
+                             margin-left="15mm" margin-right="15mm">
+           <fo:region-body region-name="frame-body" margin-top="10mm"/>
+           <fo:region-before region-name="first-region" extent="10mm"/>
+         </fo:simple-page-master>
+         <fo:simple-page-master master-name="last-page-layout"
+                             page-height="297mm" page-width="210mm"
+                             margin-top="15mm" margin-bottom="15mm"
+                             margin-left="15mm" margin-right="15mm">
+           <fo:region-body region-name="frame-body" margin-top="10mm"/>
+           <fo:region-before region-name="last-region" extent="10mm"/>
+         </fo:simple-page-master>
+         <fo:simple-page-master master-name="rest-page-layout"
+                             page-height="297mm" page-width="210mm"
+                             margin-top="15mm" margin-bottom="15mm"
+                             margin-left="15mm" margin-right="15mm">
+           <fo:region-body region-name="frame-body" margin-top="10mm"/>
+           <fo:region-before region-name="rest-region" extent="10mm"/>
+         </fo:simple-page-master>
+    
+       <fo:page-sequence-master master-name="whatever">
+         <fo:repeatable-page-master-alternatives maximum-repeats="1">
+           <fo:conditional-page-master-reference master-reference="only-page-layout"
+                                              page-position="last"/>
+           <fo:conditional-page-master-reference master-reference="first-page-layout"
+                                              page-position="first"/>
+         </fo:repeatable-page-master-alternatives>
+         <fo:repeatable-page-master-alternatives maximum-repeats="no-limit">
+           <fo:conditional-page-master-reference master-reference="last-page-layout"
+                                              page-position="last"/>
+           <fo:conditional-page-master-reference master-reference="rest-page-layout"
+                                              page-position="rest"/>
+         </fo:repeatable-page-master-alternatives>
+       </fo:page-sequence-master>
+    
+       </fo:layout-master-set>
+    
+       <fo:page-sequence master-reference="whatever">
+         <fo:static-content flow-name="first-region">
+           <fo:block id="header.first.1" text-align="center">first</fo:block>
+         </fo:static-content>
+         <fo:static-content flow-name="only-region">
+           <fo:block id="header.only.1" text-align="center">only</fo:block>
+         </fo:static-content>
+         <fo:flow flow-name="frame-body">
+           <fo:block>This is the only page</fo:block>
+         </fo:flow>
+       </fo:page-sequence>
+       <fo:page-sequence master-reference="whatever">
+         <fo:static-content flow-name="only-region">
+           <fo:block id="header.only.2" text-align="center">only</fo:block>
+         </fo:static-content>
+         <fo:static-content flow-name="first-region">
+           <fo:block id="header.first.2" text-align="center">first</fo:block>
+         </fo:static-content>
+         <fo:static-content flow-name="last-region">
+           <fo:block id="header.last.2" text-align="center">last</fo:block>
+         </fo:static-content>
+         <fo:static-content flow-name="rest-region">
+           <fo:block id="header.rest.2" text-align="center">rest</fo:block>
+         </fo:static-content>
+         <fo:flow flow-name="frame-body">
+           <fo:block>This is the first page</fo:block>
+           <fo:block break-before="page">This is a middle page</fo:block>
+           <fo:block break-before="page">This is a middle page</fo:block>
+           <fo:block break-before="page">This is the last page</fo:block>
+         </fo:flow>
+       </fo:page-sequence>
+      
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="header.only.1" xpath="(/areaTree/pageSequence[1]//regionBefore)[1]/block[1]/@prod-id" />
+    <eval expected="header.first.2" xpath="(/areaTree/pageSequence[2]//regionBefore)[1]/block[1]/@prod-id" />
+    <eval expected="header.rest.2" xpath="(/areaTree/pageSequence[2]//regionBefore)[2]/block[1]/@prod-id" />
+    <eval expected="header.rest.2" xpath="(/areaTree/pageSequence[2]//regionBefore)[3]/block[1]/@prod-id" />
+    <eval expected="header.last.2" xpath="(/areaTree/pageSequence[2]//regionBefore)[4]/block[1]/@prod-id" />
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-position_only.xml b/test/layoutengine/standard-testcases/page-position_only.xml
new file mode 100644
index 000000000..bcf05db2c
--- /dev/null
+++ b/test/layoutengine/standard-testcases/page-position_only.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks for the use of an 'only' conditional-page-master-reference (XSL 1.1)
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+           font-family="Times" font-size="20pt">
+    
+       <fo:layout-master-set>
+         <fo:simple-page-master master-name="only-page-layout"
+                             page-height="297mm" page-width="210mm"
+                             margin-top="15mm" margin-bottom="15mm"
+                             margin-left="15mm" margin-right="15mm">
+           <fo:region-body region-name="frame-body" margin-top="10mm"/>
+           <fo:region-before region-name="only-region" extent="10mm"/>
+         </fo:simple-page-master>
+         <fo:simple-page-master master-name="first-page-layout"
+                             page-height="297mm" page-width="210mm"
+                             margin-top="15mm" margin-bottom="15mm"
+                             margin-left="15mm" margin-right="15mm">
+           <fo:region-body region-name="frame-body" margin-top="10mm"/>
+           <fo:region-before region-name="first-region" extent="10mm"/>
+         </fo:simple-page-master>
+         <fo:simple-page-master master-name="last-page-layout"
+                             page-height="297mm" page-width="210mm"
+                             margin-top="15mm" margin-bottom="15mm"
+                             margin-left="15mm" margin-right="15mm">
+           <fo:region-body region-name="frame-body" margin-top="10mm"/>
+           <fo:region-before region-name="last-region" extent="10mm"/>
+         </fo:simple-page-master>
+         <fo:simple-page-master master-name="rest-page-layout"
+                             page-height="297mm" page-width="210mm"
+                             margin-top="15mm" margin-bottom="15mm"
+                             margin-left="15mm" margin-right="15mm">
+           <fo:region-body region-name="frame-body" margin-top="10mm"/>
+           <fo:region-before region-name="rest-region" extent="10mm"/>
+         </fo:simple-page-master>
+    
+       <fo:page-sequence-master master-name="whatever">
+         <fo:repeatable-page-master-alternatives maximum-repeats="no-limit">
+           <fo:conditional-page-master-reference master-reference="only-page-layout"
+                                              page-position="only"/>
+           <fo:conditional-page-master-reference master-reference="first-page-layout"
+                                              page-position="first"/>
+           <fo:conditional-page-master-reference master-reference="last-page-layout"
+                                              page-position="last"/>
+           <fo:conditional-page-master-reference master-reference="rest-page-layout"
+                                              page-position="rest"/>
+         </fo:repeatable-page-master-alternatives>
+       </fo:page-sequence-master>
+    
+       </fo:layout-master-set>
+    
+       <fo:page-sequence master-reference="whatever">
+         <fo:static-content flow-name="first-region">
+           <fo:block id="header.first.1" text-align="center">first</fo:block>
+         </fo:static-content>
+         <fo:static-content flow-name="only-region">
+           <fo:block id="header.only.1" text-align="center">only</fo:block>
+         </fo:static-content>
+         <fo:flow flow-name="frame-body">
+           <fo:block>This is the only page</fo:block>
+         </fo:flow>
+       </fo:page-sequence>
+       <fo:page-sequence master-reference="whatever">
+         <fo:static-content flow-name="only-region">
+           <fo:block id="header.only.2" text-align="center">only</fo:block>
+         </fo:static-content>
+         <fo:static-content flow-name="first-region">
+           <fo:block id="header.first.2" text-align="center">first</fo:block>
+         </fo:static-content>
+         <fo:static-content flow-name="last-region">
+           <fo:block id="header.last.2" text-align="center">last</fo:block>
+         </fo:static-content>
+         <fo:static-content flow-name="rest-region">
+           <fo:block id="header.rest.2" text-align="center">rest</fo:block>
+         </fo:static-content>
+         <fo:flow flow-name="frame-body">
+           <fo:block>This is the first page</fo:block>
+           <fo:block break-before="page">This is a middle page</fo:block>
+           <fo:block break-before="page">This is a middle page</fo:block>
+           <fo:block break-before="page">This is the last page</fo:block>
+         </fo:flow>
+       </fo:page-sequence>
+      
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="header.only.1" xpath="(/areaTree/pageSequence[1]//regionBefore)[1]/block[1]/@prod-id" />
+    <eval expected="header.first.2" xpath="(/areaTree/pageSequence[2]//regionBefore)[1]/block[1]/@prod-id" />
+    <eval expected="header.rest.2" xpath="(/areaTree/pageSequence[2]//regionBefore)[2]/block[1]/@prod-id" />
+    <eval expected="header.rest.2" xpath="(/areaTree/pageSequence[2]//regionBefore)[3]/block[1]/@prod-id" />
+    <eval expected="header.last.2" xpath="(/areaTree/pageSequence[2]//regionBefore)[4]/block[1]/@prod-id" />
+  </checks>
+</testcase>
-- 
2.39.5