Fixes #440 - Remove trailing whitespace when not left aligned.

With test. Also had to recommit bidi tests because changed the result pixel wise.
danfickle · Feb 20, 2020 · 2548d79 · 2548d79
1 parent 179494b
commit 2548d79
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/InlineBoxing.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/InlineBoxing.java
@@ -337,8 +337,7 @@ private static void startNewInlineLine(LayoutContext c, BlockBox box, int breakA
  List<Layer> pendingInlineLayers, int lineOffset, InlineBox inlineBox, LineBreakContext lbContext) {
 
  IdentValue align = inlineBox.getStyle().getIdent(CSSName.TEXT_ALIGN);
- if (align == IdentValue.JUSTIFY ||
- (align != IdentValue.LEFT && inlineBox.getStyle().getWordWrap() == IdentValue.BREAK_WORD)) {
+ if (align != IdentValue.LEFT) {
  current.line.trimTrailingSpace(c);
  }
 

diff --git a/...pdf-examples/src/main/resources/visualtest/expected/issue-440-trailing-ws-align-right.pdf b/...pdf-examples/src/main/resources/visualtest/expected/issue-440-trailing-ws-align-right.pdf
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/expected/text/arabic-bidi.pdf b/openhtmltopdf-examples/src/main/resources/visualtest/expected/text/arabic-bidi.pdf
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/expected/text/letter-spacing-bidi.pdf b/openhtmltopdf-examples/src/main/resources/visualtest/expected/text/letter-spacing-bidi.pdf
diff --git a/...ltopdf-examples/src/main/resources/visualtest/html/issue-440-trailing-ws-align-right.html b/...ltopdf-examples/src/main/resources/visualtest/html/issue-440-trailing-ws-align-right.html
@@ -0,0 +1,17 @@
+<html>
+ <head>
+ <style>
+ @page {
+ size: 250px 600px;
+ }
+ body {
+ font-size: 16px;
+ text-align: right;
+ }
+ </style>
+ </head>
+ <body>
+ This is some text to show that text aligned right has the trailing spaces removed, 
+ just like justified text. All the characters at the right should line up em 
+ </body>
+</html>
diff --git a/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java b/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java
@@ -1017,6 +1017,15 @@ public void testIssue446LangSelector() throws IOException {
  assertTrue(vt.runTest("issue-446-lang-selector"));
  }
 
+ /**
+ * Tests that aligned right text doesn't have trailing spaces
+ * that cause ragged text on the right.
+ */
+ @Test
+ public void testIssue440TrailingWsAlignRight() throws IOException {
+ assertTrue(vt.runTest("issue-440-trailing-ws-align-right"));
+ }
+
  /**
  * Don't launch a ClassCastException if a td in a table is floated.
  *