Skip to content

ListItemPainter: set font specification when calling drawText #366 #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danfickle merged 1 commit into from
Nov 17, 2019
Merged

ListItemPainter: set font specification when calling drawText #366 #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/ListItemPainter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Binary file added ...mltopdf-examples/src/main/resources/visualtest/expected/list-counter-after-page-break.pdf
View file
Open in desktop
Binary file not shown.
17 changes: 17 additions & 0 deletions openhtmltopdf-examples/src/main/resources/visualtest/html/list-counter-after-page-break.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 9 additions & 0 deletions ...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down