From e533832b11cea16e8599c549f015cab12c653f66 Mon Sep 17 00:00:00 2001
From: Glenn Adams <gadams@apache.org>
Date: Tue, 17 Apr 2012 21:34:52 +0000
Subject: [PATCH] Bugzilla #53086: Ensure that table footer and header are
 included in bididirectional resolution.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1327291 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/fop/fo/flow/table/Table.java   | 23 +++++
 status.xml                                    |  3 +
 .../table_writing-mode_rl.xml                 | 91 +++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 test/layoutengine/standard-testcases/table_writing-mode_rl.xml

diff --git a/src/java/org/apache/fop/fo/flow/table/Table.java b/src/java/org/apache/fop/fo/flow/table/Table.java
index 304996f1c..a574723b1 100644
--- a/src/java/org/apache/fop/fo/flow/table/Table.java
+++ b/src/java/org/apache/fop/fo/flow/table/Table.java
@@ -20,11 +20,14 @@
 package org.apache.fop.fo.flow.table;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Stack;
 
 import org.xml.sax.Locator;
 
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.complexscripts.bidi.DelimitedTextRange;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.ValidationPercentBaseContext;
 import org.apache.fop.fo.FONode;
@@ -597,4 +600,24 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder, Break
     RowGroupBuilder getRowGroupBuilder() {
         return rowGroupBuilder;
     }
+
+    @Override
+    protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
+        // header sub-tree
+        TableHeader header = getTableHeader();
+        if ( header != null ) {
+            ranges = header.collectDelimitedTextRanges ( ranges );
+        }
+        // footer sub-tree
+        TableFooter footer = getTableFooter();
+        if ( footer != null ) {
+            ranges = footer.collectDelimitedTextRanges ( ranges );
+        }
+        // body sub-tree
+        for ( Iterator it = getChildNodes(); ( it != null ) && it.hasNext();) {
+            ranges = ( (FONode) it.next() ).collectDelimitedTextRanges ( ranges );
+        }
+        return ranges;
+    }
+
 }
diff --git a/status.xml b/status.xml
index 413ecfac1..67e2fb973 100644
--- a/status.xml
+++ b/status.xml
@@ -62,6 +62,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="Code" dev="GA" type="fix" fixes-bug="53086">
+        Ensure that table footer and header are included in bididirectional resolution.
+      </action>
       <action context="Code" dev="GA" type="fix" fixes-bug="53097">
         Ensure writing-mode specified on fo:table is used to determine writing mode of table and its descendants.
       </action>
diff --git a/test/layoutengine/standard-testcases/table_writing-mode_rl.xml b/test/layoutengine/standard-testcases/table_writing-mode_rl.xml
new file mode 100644
index 000000000..65927ec48
--- /dev/null
+++ b/test/layoutengine/standard-testcases/table_writing-mode_rl.xml
@@ -0,0 +1,91 @@
+<?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 table header, footer, and body cells all respect writing-mode="rl" specified on table. See also Bugzilla #53086.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="first" page-height="29.7cm" page-width="21cm" margin-top="1cm" margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
+          <fo:region-body margin-top="3cm"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="first">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block-container  writing-mode="rl-tb">
+            <fo:table table-layout="fixed" width="100%" border-collapse="collapse">
+              <fo:table-header>
+                <fo:table-row>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block>HEADER ROW</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">ABC</fo:bidi-override></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">DEF</fo:bidi-override></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </fo:table-header>
+              <fo:table-footer>
+                <fo:table-row>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block>FOOTER ROW</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">ABC</fo:bidi-override></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">DEF</fo:bidi-override></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </fo:table-footer>
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block>BODY ROW</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">ABC</fo:bidi-override></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell border="solid 1px black">
+                    <fo:block><fo:bidi-override unicode-bidi="bidi-override" direction="rtl">DEF</fo:bidi-override></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </fo:table-body>
+            </fo:table>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="9" xpath="count(//lineArea)"/>
+    <eval expected="HEADER ROWCBAFEDBODY ROWCBAFEDFOOTER ROWCBAFED" xpath="/"/>
+    <eval expected="HEADER ROW" xpath="//flow/block/block/block/block[1]//lineArea"/>
+    <eval expected="1" xpath="//flow/block/block/block/block[1]//lineArea/@level"/>
+    <eval expected="BODY ROW" xpath="//flow/block/block/block/block[4]//lineArea"/>
+    <eval expected="1" xpath="//flow/block/block/block/block[4]//lineArea/@level"/>
+    <eval expected="FOOTER ROW" xpath="//flow/block/block/block/block[7]//lineArea"/>
+    <eval expected="1" xpath="//flow/block/block/block/block[7]//lineArea/@level"/>
+  </checks>
+</testcase>
-- 
2.39.5