Author: vhennebert
Date: Wed Mar 9 20:16:09 2011
New Revision: 1079969
URL: http://svn.apache.org/viewvc?rev=1079969&view=rev
Log:
Bugzilla #50196: padding-start ignored when table-header/footer is repeated.
Patch submitted by Matthias Reischenbacher
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=1079969&r1=1079968&r2=1079969&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
Wed Mar 9 20:16:09 2011
@@ -422,18 +422,6 @@ public class InlineLayoutManager extends
setChildContext(new LayoutContext(context)); // Store current value
- // If this LM has fence, make a new leading space specifier.
- if (hasLeadingFence(areaCreated)) {
- getContext().setLeadingSpace(new SpaceSpecifier(false));
- getContext().setFlags(LayoutContext.RESOLVE_LEADING_SPACE, true);
- } else {
- getContext().setFlags(LayoutContext.RESOLVE_LEADING_SPACE, false);
- }
-
- if (getSpaceStart() != null) {
- context.getLeadingSpace().addSpace(new SpaceVal(getSpaceStart(),
this));
- }
-
// "Unwrap" the NonLeafPositions stored in parentIter and put
// them in a new list. Set lastLM to be the LayoutManager
// which created the last Position: if the LAST_AREA flag is
@@ -447,12 +435,32 @@ public class InlineLayoutManager extends
while (parentIter.hasNext()) {
pos = parentIter.next();
if (pos != null && pos.getPosition() != null) {
+ if (isFirst(pos)) {
+ /*
+ * If this element is a descendant of a
table-header/footer,
+ * its content may be repeated over pages, so the
generation
+ * of its areas may be restarted.
+ */
+ areaCreated = false;
+ }
positionList.add(pos.getPosition());
lastLM = pos.getPosition().getLM();
lastPos = pos;
}
}
+ // If this LM has fence, make a new leading space specifier.
+ if (hasLeadingFence(areaCreated)) {
+ getContext().setLeadingSpace(new SpaceSpecifier(false));
+ getContext().setFlags(LayoutContext.RESOLVE_LEADING_SPACE, true);
+ } else {
+ getContext().setFlags(LayoutContext.RESOLVE_LEADING_SPACE, false);
+ }
+
+ if (getSpaceStart() != null) {
+ context.getLeadingSpace().addSpace(new SpaceVal(getSpaceStart(),
this));
+ }
+
addMarkersToPage(
true,
!areaCreated,
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1079969&r1=1079968&r2=1079969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Wed Mar 9 20:16:09 2011
@@ -59,6 +59,9 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Layout" dev="VH" type="fix" fixes-bug="50196"
due-to="Matthias Reischenbacher">
+ Bugzilla #50196: padding-start ignored when table-header/footer is
repeated.
+ </action>
<action context="Renderers" dev="JM" type="fix">
Increased maximum possible PDF size from 2GB to around 9GB (hard
maximum imposed by the PDF specification).
</action>
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml?rev=1079969&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml
Wed Mar 9 20:16:09 2011
@@ -0,0 +1,77 @@
+<?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>
+ Bugzilla #50196: padding-start ignored when a table-header/footer is
repeated.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="220pt"
page-height="120pt"
+ margin="10pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>
+ <fo:inline id="header" padding-start="10pt">Table
header</fo:inline>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>
+ <fo:inline id="footer" padding-start="10pt">Table
footer</fo:inline>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Before page break</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row break-before="page">
+ <fo:table-cell border="1pt solid black">
+ <fo:block>After page break</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="10000"
xpath="//pageViewport[1]//inlineparent[@prod-id='header']/@padding-start"/>
+ <eval expected="10000"
xpath="//pageViewport[1]//inlineparent[@prod-id='footer']/@padding-start"/>
+ <eval expected="10000"
xpath="//pageViewport[2]//inlineparent[@prod-id='header']/@padding-start"/>
+ <eval expected="10000"
xpath="//pageViewport[2]//inlineparent[@prod-id='footer']/@padding-start"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
