Merge pull request #410 from syjer/366-fix-bold-list-no-reason

danfickle · web-flow · commit 683c28f7e5f4 · 2019-11-17T15:26:47.000+11:00
ListItemPainter: set font specification when calling drawText fixes #366
diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/ListItemPainter.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/ListItemPainter.java
@@ -134,6 +134,9 @@ private static void drawText(RenderingContext c, BlockBox box, IdentValue listSt
         
         c.getOutputDevice().setColor(box.getStyle().getColor());
         c.getOutputDevice().setFont(box.getStyle().getFSFont(c));
+        if (c.getOutputDevice() instanceof AbstractOutputDevice) {
+            ((AbstractOutputDevice) c.getOutputDevice()).setFontSpecification(box.getStyle().getFontSpecification());
+        }
         c.getTextRenderer().drawString(
                 c.getOutputDevice(), text.getText(), x, y);
     }
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/expected/list-counter-after-page-break.pdf b/openhtmltopdf-examples/src/main/resources/visualtest/expected/list-counter-after-page-break.pdf
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/html/list-counter-after-page-break.html b/openhtmltopdf-examples/src/main/resources/visualtest/html/list-counter-after-page-break.html
@@ -0,0 +1,17 @@
+<html>
+<head>
+    <style>
+        p {
+            page-break-after: always;
+        }
+    </style>
+</head>
+<body>
+<p>
+    <b>bolded text</b>
+</p>
+<ol>
+    <li>counter should not be bold</li>
+</ol>
+</body>
+</html>
diff --git a/openhtmltopdf-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java b/openhtmltopdf-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java
@@ -890,6 +890,15 @@ public void testFloatClearBoth() throws IOException {
     public void testBorderRadius() throws IOException {
         assertTrue(vt.runTest("border-radius"));
     }
+
+    /**
+     * Check counter style after page break, it should not be affected by a previous bolded text, see issue
+     * https://github.com/danfickle/openhtmltopdf/issues/366
+     */
+    @Test
+    public void testListCounterAfterPageBreak() throws IOException {
+        assertTrue(vt.runTest("list-counter-after-page-break"));
+    }
     
     // TODO:
     // + Elements that appear just on generated overflow pages.

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,9 @@ private static void drawText(RenderingContext c, BlockBox box, IdentValue listSt`
`134`	`134`
`135`	`135`	`c.getOutputDevice().setColor(box.getStyle().getColor());`
`136`	`136`	`c.getOutputDevice().setFont(box.getStyle().getFSFont(c));`
	`137`	`+ if (c.getOutputDevice() instanceof AbstractOutputDevice) {`
	`138`	`+ ((AbstractOutputDevice) c.getOutputDevice()).setFontSpecification(box.getStyle().getFontSpecification());`
	`139`	`+ }`
`137`	`140`	`c.getTextRenderer().drawString(`
`138`	`141`	`c.getOutputDevice(), text.getText(), x, y);`
`139`	`142`	`}`