updated to fix table and block-container vertical text, metanorma/met…

…anorma-jis#226
metanorma · Dec 5, 2024 · 1a5cf14 · 1a5cf14
1 parent dd73f8e
commit 1a5cf14
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -202,7 +202,8 @@ protected LayoutContext makeChildLayoutContext(LayoutContext context) {
         childLC.setStackLimitBP(
                 context.getStackLimitBP().minus(MinOptMax.getInstance(relDims.bpd)));
         childLC.setRefIPD(relDims.ipd);
-        childLC.setWritingMode(getBlockContainerFO().getWritingMode());
+        //childLC.setWritingMode(getBlockContainerFO().getWritingMode());
+        childLC.setWritingMode(context.getWritingMode());
         return childLC;
     }
 

diff --git a/src/main/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java b/src/main/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
@@ -115,6 +115,7 @@ private void createElementsForRowGroup(LayoutContext context, int alignment,
                     LayoutContext childLC = LayoutContext.newInstance();
                     childLC.setStackLimitBP(context.getStackLimitBP()); //necessary?
                     childLC.setRefIPD(spanWidth);
+                    childLC.setWritingMode(context.getWritingMode());
 
                     //Get the element list for the cell contents
                     List elems = primary.getCellLM().getNextKnuthElements(

diff --git a/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
@@ -183,6 +183,8 @@ public List getNextKnuthElements(LayoutContext context, int alignment) {
         LayoutManager prevLM = null; // previously active LM
         while ((curLM = getChildLM()) != null) {
             LayoutContext childLC = LayoutContext.newInstance();
+            childLC.setWritingMode(context.getWritingMode());
+
             // curLM is a ?
             childLC.setStackLimitBP(context.getStackLimitBP().minus(stackLimit));
             childLC.setRefIPD(cellIPD);

diff --git a/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -273,6 +273,7 @@ public List getNextKnuthElements(LayoutContext context, int alignment) {
                                  stackSize));*/
         childLC.setRefIPD(context.getRefIPD());
         childLC.copyPendingMarksFrom(context);
+        childLC.setWritingMode(context.getWritingMode());
 
         contentKnuthElements = contentLM.getNextKnuthElements(childLC, alignment);
         //Set index values on elements coming from the content LM