Bugfix: Area generated by page-number is now cloned for each addAreas() call.

Bugfix: page-number-citations are now properly resolved. The new method in AreaTreeHandler may not be optimal, but I haven't found a better way, yet.


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

1 files changed, 7 insertions, 12 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java
index f03973694..743db69af 100644
--- a/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java
@@ -33,7 +33,7 @@ import org.apache.fop.fonts.Font;
 public class PageNumberCitationLayoutManager extends LeafNodeLayoutManager {
 
     private PageNumberCitation fobj;
-    Font font = null;
+    private Font font = null;
     
     // whether the page referred to by the citation has been resolved yet
     private boolean resolved = false;
@@ -62,8 +62,8 @@ public class PageNumberCitationLayoutManager extends LeafNodeLayoutManager {
         }
     }
     
-    protected void offsetArea(LayoutContext context) {
-        curArea.setOffset(context.getBaseline());
+    protected void offsetArea(InlineArea area, LayoutContext context) {
+        area.setOffset(context.getBaseline());
     }
 
     /**
@@ -81,12 +81,7 @@ public class PageNumberCitationLayoutManager extends LeafNodeLayoutManager {
             int width = getStringWidth(str);
             text.setTextArea(str);
             inline.setIPD(width);
-            inline.setBPD(font.getAscender() - font.getDescender());
-            inline.setOffset(font.getAscender());
             
-            inline.addTrait(Trait.FONT_NAME, font.getFontName());
-            inline.addTrait(Trait.FONT_SIZE,
-                         new Integer(font.getFontSize()));
             resolved = true;
         } else {
             resolved = false;
@@ -94,12 +89,12 @@ public class PageNumberCitationLayoutManager extends LeafNodeLayoutManager {
             String str = "MMM"; // reserve three spaces for page number
             int width = getStringWidth(str);
             inline.setIPD(width);
-            inline.setBPD(font.getAscender() - font.getDescender());
-            inline.setOffset(font.getAscender());
             
-            inline.addTrait(Trait.FONT_NAME, font.getFontName());
-            inline.addTrait(Trait.FONT_SIZE, new Integer(font.getFontSize()));
         }
+        inline.setBPD(font.getAscender() - font.getDescender());
+        inline.setOffset(font.getAscender());
+        inline.addTrait(Trait.FONT_NAME, font.getFontName());
+        inline.addTrait(Trait.FONT_SIZE, new Integer(font.getFontSize()));
         TraitSetter.addTextDecoration(inline, fobj.getTextDecoration());
         
         return inline;