Skip to content

Fix incorrect handling of line-height CSS in HTML → PDF conversion #1427

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

Open
wants to merge 1 commit into
base: 1.3-java8
Choose a base branch
from
Open

Fix incorrect handling of line-height CSS in HTML → PDF conversion #1427

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
4 changes: 0 additions & 4 deletions openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,6 @@ public static void insertStyle(Map<String, String> h, ChainedProperties cprops)
actualFontSize = Markup.DEFAULT_FONT_SIZE;
}
float v = parseLength(prop.getProperty(key), actualFontSize);
if (ss.endsWith("%")) {
h.put("leading", "0," + (v / 100));
return;
}
if ("normal".equalsIgnoreCase(ss)) {
h.put("leading", "0,1.5");
return;
Expand Down
40 changes: 40 additions & 0 deletions openpdf/src/test/java/com/lowagie/text/html/StylesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.lowagie.text.Chunk;
import com.lowagie.text.Document;
import com.lowagie.text.Element;
import com.lowagie.text.Font;
import com.lowagie.text.Paragraph;
import com.lowagie.text.html.simpleparser.HTMLWorker;
import com.lowagie.text.html.simpleparser.StyleSheet;
Expand Down Expand Up @@ -126,4 +127,43 @@ void testNamedFontSize() throws Exception {
Chunk chunk10 = (Chunk) paragraph.get(18);
Assertions.assertEquals(FontSize.LARGER.getScale() * 20f, chunk10.getFont().getSize());
}

@Test
void testLineHeightPercentage() throws Exception {
List<Element> elements = htmlToPdf("stylesTest/lineHeightPercentage.html", "target/Line Height Percentage.pdf");
Paragraph paragraph = (Paragraph) elements.get(0);
Chunk chunk = (Chunk) paragraph.get(0);
float fontSize;
if (chunk.getFont() != null) {
fontSize = chunk.getFont().getSize();
} else {
fontSize = Font.DEFAULTSIZE;
}
float expectedMultiplier = 1.15f; // derived from <span style="line-height:115%"> in lineHeightPercentage.html
float expectedTotalLeading = fontSize * expectedMultiplier;
float totalLeading = paragraph.getTotalLeading();

Assertions.assertEquals(expectedTotalLeading, totalLeading, 0.1f,
"Total leading should be ~fontSize * " + expectedMultiplier);
}

@Test
void testDefaultLineHeight() throws Exception {
List<Element> elements = htmlToPdf("stylesTest/lineHeightDefault.html", "target/Line Height Default.pdf");
Paragraph paragraph = (Paragraph) elements.get(0);
Chunk chunk = (Chunk) paragraph.get(0);
float fontSize;
if (chunk.getFont() != null) {
fontSize = chunk.getFont().getSize();
} else {
fontSize = Font.DEFAULTSIZE;
}
float expectedMultiplier = 1.5f;
float expectedTotalLeading = fontSize * expectedMultiplier;
float totalLeading = paragraph.getTotalLeading();

Assertions.assertEquals(expectedTotalLeading, totalLeading, 0.1f,
"Total leading should be ~fontSize * " + expectedMultiplier);
}

}
15 changes: 15 additions & 0 deletions openpdf/src/test/resources/stylesTest/lineHeightDefault.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
</head>
<body>
<span>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam eget hendrerit nulla.
Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae.
Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat.
</span>
</body>
</html>
15 changes: 15 additions & 0 deletions openpdf/src/test/resources/stylesTest/lineHeightPercentage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
</head>
<body>
<span style="line-height:115%">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam eget hendrerit nulla.
Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae.
Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat.
</span>
</body>
</html>