--- /dev/null
+/*
+ * 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$ */
+
+package org.apache.fop.layoutmgr;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.apache.fop.layoutmgr.inline.KnuthInlineBox;
+
+public final class FootenoteUtil {
+
+ private FootenoteUtil() {
+ }
+
+ /**
+ * Returns the footnotes contained in the given element list.
+ */
+ public static List<LayoutManager> getFootnotes(List<ListElement> elemenList) {
+ return getFootnotes(elemenList, 0, elemenList.size() - 1);
+ }
+
+ /**
+ * Returns the footnotes contained in the given element list.
+ *
+ * @param startIndex index in the element list from which to start the scan, inclusive
+ * @param endIndex index in the element list at which to stop the scan, inclusive
+ */
+ public static List<LayoutManager> getFootnotes(List<ListElement> elemenList, int startIndex, int endIndex) {
+ ListIterator<ListElement> iter = elemenList.listIterator(startIndex);
+ List<LayoutManager> footnotes = null;
+ while (iter.nextIndex() <= endIndex) {
+ ListElement element = iter.next();
+ if (element instanceof KnuthInlineBox && ((KnuthInlineBox) element).isAnchor()) {
+ footnotes = getFootnoteList(footnotes);
+ footnotes.add(((KnuthInlineBox) element).getFootnoteBodyLM());
+ } else if (element instanceof KnuthBlockBox && ((KnuthBlockBox) element).hasAnchors()) {
+ footnotes = getFootnoteList(footnotes);
+ footnotes.addAll(((KnuthBlockBox) element).getFootnoteBodyLMs());
+ }
+ }
+ if (footnotes == null) {
+ return Collections.emptyList();
+ } else {
+ return footnotes;
+ }
+ }
+
+ private static <T> List<T> getFootnoteList(List<T> footnotes) {
+ if (footnotes == null) {
+ return new ArrayList<T>();
+ } else {
+ return footnotes;
+ }
+ }
+
+}
import org.apache.fop.fo.flow.table.TablePart;
import org.apache.fop.layoutmgr.BreakElement;
import org.apache.fop.layoutmgr.ElementListUtils;
+import org.apache.fop.layoutmgr.FootenoteUtil;
import org.apache.fop.layoutmgr.Keep;
+import org.apache.fop.layoutmgr.KnuthBlockBox;
import org.apache.fop.layoutmgr.KnuthBox;
import org.apache.fop.layoutmgr.KnuthElement;
import org.apache.fop.layoutmgr.KnuthGlue;
import org.apache.fop.layoutmgr.KnuthPossPosIter;
import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.ListElement;
import org.apache.fop.layoutmgr.Position;
import org.apache.fop.layoutmgr.PositionIterator;
KnuthBox headerAsFirst = null;
KnuthBox headerAsSecondToLast = null;
KnuthBox footerAsLast = null;
+ LinkedList returnList = new LinkedList();
if (headerIter != null && headerList == null) {
this.headerList = getKnuthElementsForRowIterator(
headerIter, context, alignment, TableRowIterator.HEADER);
}
TableHeaderFooterPosition pos = new TableHeaderFooterPosition(
getTableLM(), true, this.headerList);
- KnuthBox box = new KnuthBox(headerNetHeight, pos, false);
+ List<LayoutManager> footnoteList = FootenoteUtil.getFootnotes(headerList);
+ KnuthBox box = (footnoteList.isEmpty() || !getTableLM().getTable().omitHeaderAtBreak())
+ ? new KnuthBox(headerNetHeight, pos, false)
+ : new KnuthBlockBox(headerNetHeight, footnoteList, pos, false);
if (getTableLM().getTable().omitHeaderAtBreak()) {
//We can simply add the table header at the start
//of the whole list
headerAsFirst = box;
} else {
+ if (!footnoteList.isEmpty()) {
+ returnList.add(new KnuthBlockBox(0, footnoteList, new Position(getTableLM()), true));
+ }
headerAsSecondToLast = box;
}
}
//We can simply add the table footer at the end of the whole list
TableHeaderFooterPosition pos = new TableHeaderFooterPosition(
getTableLM(), false, this.footerList);
- KnuthBox box = new KnuthBox(footerNetHeight, pos, false);
- footerAsLast = box;
+ List<LayoutManager> footnoteList = FootenoteUtil.getFootnotes(footerList);
+ footerAsLast = footnoteList.isEmpty()
+ ? new KnuthBox(footerNetHeight, pos, false)
+ : new KnuthBlockBox(footerNetHeight, footnoteList, pos, false);
}
- LinkedList returnList = getKnuthElementsForRowIterator(
- bodyIter, context, alignment, TableRowIterator.BODY);
+ returnList.addAll(getKnuthElementsForRowIterator(
+ bodyIter, context, alignment, TableRowIterator.BODY));
if (headerAsFirst != null) {
int insertionPoint = 0;
if (returnList.size() > 0 && ((ListElement)returnList.getFirst()).isForcedBreak()) {
--- /dev/null
+<?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>
+ A footnote from a table-header should appear once at the bottom of the first page.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="120pt" page-width="220pt" margin="10pt">
+ <fo:region-body background-color="#F0F0F0"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Before the table</fo:block>
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-header border="1pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Header 1.1<fo:footnote>
+ <fo:inline>*</fo:inline>
+ <fo:footnote-body>
+ <fo:block>* Footnote from the table-header.</fo:block>
+ </fo:footnote-body>
+ </fo:footnote></fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Header 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer border="1pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Footer 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Footer 1.2<fo:footnote>
+ <fo:inline>†</fo:inline>
+ <fo:footnote-body>
+ <fo:block>† Footnote from the table-footer.</fo:block>
+ </fo:footnote-body>
+ </fo:footnote></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body border="0.5pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 2.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Before the table</fo:block>
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-header border="1pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Header 1.1<fo:footnote>
+ <fo:inline>*</fo:inline>
+ <fo:footnote-body>
+ <fo:block>* Footnote from the table-header.</fo:block>
+ </fo:footnote-body>
+ </fo:footnote></fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Header 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer border="1pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Footer 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Footer 1.2<fo:footnote>
+ <fo:inline>†</fo:inline>
+ <fo:footnote-body>
+ <fo:block>† Footnote from the table-footer.</fo:block>
+ </fo:footnote-body>
+ </fo:footnote></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body border="0.5pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 2.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 3.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 3.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 4.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 4.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 5.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 5.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 6.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 6.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 7.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 7.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Before the table</fo:block>
+ <fo:table table-layout="fixed" width="100%"
+ table-omit-header-at-break="true" table-omit-footer-at-break="true">
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-header border="1pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Header 1.1<fo:footnote>
+ <fo:inline>*</fo:inline>
+ <fo:footnote-body>
+ <fo:block>* Footnote from the table-header.</fo:block>
+ </fo:footnote-body>
+ </fo:footnote></fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Header 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer border="1pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Footer 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Footer 1.2<fo:footnote>
+ <fo:inline>†</fo:inline>
+ <fo:footnote-body>
+ <fo:block>† Footnote from the table-footer.</fo:block>
+ </fo:footnote-body>
+ </fo:footnote></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body border="0.5pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 2.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Before the table</fo:block>
+ <fo:table table-layout="fixed" width="100%"
+ table-omit-header-at-break="true" table-omit-footer-at-break="true">
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-header border="1pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Header 1.1<fo:footnote>
+ <fo:inline>*</fo:inline>
+ <fo:footnote-body>
+ <fo:block>* Footnote from the table-header.</fo:block>
+ </fo:footnote-body>
+ </fo:footnote></fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Header 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer border="1pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Footer 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Footer 1.2<fo:footnote>
+ <fo:inline>†</fo:inline>
+ <fo:footnote-body>
+ <fo:block>† Footnote from the table-footer.</fo:block>
+ </fo:footnote-body>
+ </fo:footnote></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body border="0.5pt solid black">
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 2.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 3.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 3.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 4.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 4.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 5.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 5.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 6.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 6.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row border="inherit">
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 7.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="inherit">
+ <fo:block>Cell 7.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="1" xpath="count(//pageSequence[1]/pageViewport)"/>
+ <eval expected="Header 1.1*" xpath="//pageSequence[1]//flow/block[2]/block[1]"/>
+ <eval expected="Footer 1.2†" xpath="//pageSequence[1]//flow/block[2]/block[8]"/>
+ <eval expected="2" xpath="count(//pageSequence[1]//footnote/block)"/>
+ <eval expected="* Footnote from the table-header." xpath="//pageSequence[1]//footnote/block[1]"/>
+ <eval expected="† Footnote from the table-footer." xpath="//pageSequence[1]//footnote/block[2]"/>
+
+ <eval expected="2" xpath="count(//pageSequence[2]/pageViewport)"/>
+ <eval expected="1" xpath="count(//pageSequence[2]/pageViewport[1]//footnote/block)"/>
+ <eval expected="* Footnote from the table-header." xpath="//pageSequence[2]/pageViewport[1]//footnote/block[1]"/>
+ <eval expected="Cell 6.1" xpath="//pageSequence[2]/pageViewport[2]//flow/block[1]/block[3]"/>
+ <eval expected="1" xpath="count(//pageSequence[2]/pageViewport[2]//footnote/block)"/>
+ <eval expected="† Footnote from the table-footer." xpath="//pageSequence[2]/pageViewport[2]//footnote/block[1]"/>
+
+ <eval expected="1" xpath="count(//pageSequence[3]/pageViewport)"/>
+ <eval expected="Header 1.1*" xpath="//pageSequence[3]//flow/block[2]/block[1]"/>
+ <eval expected="Footer 1.2†" xpath="//pageSequence[3]//flow/block[2]/block[8]"/>
+ <eval expected="2" xpath="count(//pageSequence[3]//footnote/block)"/>
+ <eval expected="* Footnote from the table-header." xpath="//pageSequence[3]//footnote/block[1]"/>
+ <eval expected="† Footnote from the table-footer." xpath="//pageSequence[3]//footnote/block[2]"/>
+
+ <eval expected="2" xpath="count(//pageSequence[4]/pageViewport)"/>
+ <eval expected="1" xpath="count(//pageSequence[4]/pageViewport[1]//footnote/block)"/>
+ <eval expected="* Footnote from the table-header." xpath="//pageSequence[4]/pageViewport[1]//footnote/block[1]"/>
+ <eval expected="Cell 7.1" xpath="//pageSequence[4]/pageViewport[2]//flow/block[1]/block[1]"/>
+ <eval expected="1" xpath="count(//pageSequence[4]/pageViewport[2]//footnote/block)"/>
+ <eval expected="† Footnote from the table-footer." xpath="//pageSequence[4]/pageViewport[2]//footnote/block[1]"/>
+ </checks>
+</testcase>