Merge pull request #171 from rototor/fix-css-rotate-multipage

Testcase and fix for rotation on the second and following pages.
danfickle · Feb 14, 2018 · 09833be · 09833be
2 parents c8ff009 + 43689c2
commit 09833be
Show file tree

Hide file tree

Showing 6 changed files with 3,440 additions and 16 deletions.
diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/Layer.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/Layer.java
@@ -429,6 +429,16 @@ protected List<AffineTransform> applyTranform(RenderingContext c, Box box) {
 			RectPropertySet margin = c.getPage().getMargin(c);
 			relTranslateX += margin.left();
 			relTranslateY += margin.top();
+
+			/*
+			 * We must apply the top/bottom margins from the previous pages, otherwise 
+			 * our transform center is wrong.
+			 */
+			for (int i = 0; i < c.getPageNo(); i++) {
+				RectPropertySet prevMargin = getPages().get(i).getMargin(c);
+				relTranslateY += prevMargin.top() + prevMargin.bottom();
+			}
+
 
 			MarginBoxName[] marginBoxNames = c.getPage().getCurrentMarginBoxNames();
 			if (marginBoxNames != null) {
@@ -494,6 +504,14 @@ protected List<AffineTransform> applyTranform(RenderingContext c, Box box) {
 
 		resultTransforms.add(translateToOrigin);
 
+		applyTransformFunctions(flipFactor, transformList, resultTransforms);
+
+		resultTransforms.add(translateBackFromOrigin);
+
+		return c.getOutputDevice().pushTransforms(resultTransforms);
+	}
+
+	private void applyTransformFunctions(float flipFactor, List<PropertyValue> transformList, List<AffineTransform> resultTransforms) {
 		for (PropertyValue transform : transformList) {
 			String fName = transform.getFunction().getName();
 			List<PropertyValue> params = transform.getFunction().getParameters();
@@ -536,13 +554,9 @@ protected List<AffineTransform> applyTranform(RenderingContext c, Box box) {
 				XRLog.layout(Level.WARNING, "translateY function not implemented at this time");
 			}
 		}
-
-		resultTransforms.add(translateBackFromOrigin);
-
-		return c.getOutputDevice().pushTransforms(resultTransforms);
 	}
 
-    private Box find(CssContext cssCtx, int absX, int absY, List layers, boolean findAnonymous) {
+	private Box find(CssContext cssCtx, int absX, int absY, List layers, boolean findAnonymous) {
         Box result = null;
         // Work backwards since layers are painted forwards and we're looking
         // for the top-most box
@@ -904,7 +918,9 @@ private void position(LayoutContext c) {
     }
 
     public List<PageBox> getPages() {
-        return _pages == null ? Collections.<PageBox>emptyList(): _pages;
+		if (_pages == null)
+			return _parent == null ? Collections.<PageBox> emptyList() : _parent.getPages();
+		return _pages;
     }
 
     public void setPages(List<PageBox> pages) {

diff --git a/openhtmltopdf-examples/src/main/java/com/openhtmltopdf/testcases/TestcaseRunner.java b/openhtmltopdf-examples/src/main/java/com/openhtmltopdf/testcases/TestcaseRunner.java
@@ -103,6 +103,10 @@ public static void main(String[] args) throws Exception {
 
 		runTestCase("math-ml");
 
+		/*
+		 * Broken rotate() on the second page
+		 */
+		runTestCase("RepeatedTableTransformSample");
 		/* Add additional test cases here. */
 	}