InlineLM properly creates an AligmentContext for Title.

Add 2006 to the copyright lines of my previous commit.

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

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java
index c80245c2e15f1ddf4e396a3bf91818ca3dcc0566..c55e773ec33ab50d8fc3ffee37fb965be1651244 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
index 902cdec660e873bfbcc66ea2ef224b4642251abe..783c6a60428da339f9322e635870b5f67c418cfe 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
index f7262cafb261627de7f6af7a7634f08a70395b91..e60794acbbac732cbe2be1eeee1ebfabeb7d65c3 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@ package org.apache.fop.layoutmgr.inline;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.Constants;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.flow.RetrieveMarker;
 import org.apache.fop.fo.pagination.Title;
 import org.apache.fop.layoutmgr.AbstractBaseLayoutManager;
 import org.apache.fop.layoutmgr.KnuthElement;
@@ -259,6 +257,7 @@ public class ContentLayoutManager extends AbstractBaseLayoutManager
         LinkedList contentList = new LinkedList();
         LinkedList returnedList;
 
+        childLM.initialize();
         while (!childLM.isFinished()) {
             // get KnuthElements from childLM
             returnedList = childLM.getNextKnuthElements(context, alignment);

diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
index d287b59f838ad4f0dd961947540de61bbde0a847..ba7bdf245df34540394d227d396b50fc3c64e39d 100755 (executable)
--- a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.flow.Inline;
 import org.apache.fop.fo.flow.InlineLevel;
 import org.apache.fop.fo.flow.Leader;
+import org.apache.fop.fo.pagination.Title;
 import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
 import org.apache.fop.fo.properties.CommonMarginInline;
 import org.apache.fop.fo.properties.SpaceProperty;
@@ -38,9 +39,7 @@ import org.apache.fop.layoutmgr.BlockKnuthSequence;
 import org.apache.fop.layoutmgr.BlockLevelLayoutManager;
 import org.apache.fop.layoutmgr.BreakElement;
 import org.apache.fop.layoutmgr.KnuthBox;
-import org.apache.fop.layoutmgr.KnuthElement;
 import org.apache.fop.layoutmgr.KnuthSequence;
-import org.apache.fop.layoutmgr.KnuthPenalty;
 import org.apache.fop.layoutmgr.LayoutContext;
 import org.apache.fop.layoutmgr.NonLeafPosition;
 import org.apache.fop.layoutmgr.SpaceSpecifier;
@@ -48,7 +47,6 @@ import org.apache.fop.layoutmgr.TraitSetter;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.layoutmgr.PositionIterator;
-import org.apache.fop.layoutmgr.inline.InlineStackingLayoutManager.StackingIter;
 import org.apache.fop.traits.MinOptMax;
 import org.apache.fop.traits.SpaceVal;
 
@@ -104,10 +102,10 @@ public class InlineLayoutManager extends InlineStackingLayoutManager {
         int padding = 0;
         font = fobj.getCommonFont().getFontState(fobj.getFOEventHandler().getFontInfo(), this);
         lineHeight = fobj.getLineHeight();
-
+        borderProps = fobj.getCommonBorderPaddingBackground();
+        inlineProps = fobj.getCommonMarginInline();
+        
         if (fobj instanceof Inline) {
-            inlineProps = fobj.getCommonMarginInline();
-            borderProps = fobj.getCommonBorderPaddingBackground();
             alignmentAdjust = ((Inline)fobj).getAlignmentAdjust();
             alignmentBaseline = ((Inline)fobj).getAlignmentBaseline();
             baselineShift = ((Inline)fobj).getBaselineShift();
@@ -229,14 +227,21 @@ public class InlineLayoutManager extends InlineStackingLayoutManager {
 
         SpaceSpecifier leadingSpace = context.getLeadingSpace();
         
-        alignmentContext = new AlignmentContext(font
+        if (fobj instanceof Title) {
+            alignmentContext = new AlignmentContext(font,
+                                    lineHeight.getOptimum(this).getLength().getValue(this),
+                                    context.getWritingMode());
+                                                    
+        } else {
+            alignmentContext = new AlignmentContext(font
                                     , lineHeight.getOptimum(this).getLength().getValue(this)
                                     , alignmentAdjust
                                     , alignmentBaseline
                                     , baselineShift
                                     , dominantBaseline
                                     , context.getAlignmentContext());
-
+        }
+        
         childLC = new LayoutContext(context);
         childLC.setAlignmentContext(alignmentContext);
 

diff --git a/test/layoutengine/standard-testcases/title_empty.xml b/test/layoutengine/standard-testcases/title_empty.xml
index ba1b0829f48f3c9a227fad4df13299ce357083ce..6726bdcc9940e6e2f86407927b30dd5ca3dcde11 100644 (file)
--- a/test/layoutengine/standard-testcases/title_empty.xml
+++ b/test/layoutengine/standard-testcases/title_empty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
+  Copyright 2006 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/test/layoutengine/standard-testcases/title_non-empty.xml b/test/layoutengine/standard-testcases/title_non-empty.xml
new file mode 100644 (file)
index 0000000..381e886
--- /dev/null
+++ b/test/layoutengine/standard-testcases/title_non-empty.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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 that a fo:title is rendered to the area tree
+with the correct content, not causing a NullPointerException.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="small"
+          page-height="10cm" page-width="10cm">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+    
+      <fo:page-sequence master-reference="small">
+        <fo:title>The <fo:inline color="red">title</fo:inline> of the <fo:inline font-size="medium">article</fo:inline></fo:title>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block/>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="The title of the article" xpath="//title"/>
+    <eval expected="4" xpath="count(//title/inlineparent/*)"/>
+    <eval expected="2" xpath="count(//title/inlineparent/inlineparent)"/>
+    <eval expected="2" xpath="count(//title/inlineparent/text)"/>
+  </checks>
+</testcase>