Merge branch 'hyphens' into 'master'

Turn soft hyphens to hard when chunking after them See merge request tools/pagedjs!21

Merge branch 'hyphens' into 'master'
Turn soft hyphens to hard when chunking after them See merge request tools/pagedjs!21
fdb31dcd · Fred Chasen · 32455eb9 · 7c7b5c78 · fdb31dcd · fdb31dcd
Commit fdb31dcd authored Sep 11, 2018 by Fred Chasen
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

awesome.html specs/hyphens/awesome/awesome.html +1 -1

layout.js src/chunker/layout.js +2 -2

No files found.
--- a/specs/hyphens/awesome/awesome.html
+++ b/specs/hyphens/awesome/awesome.html
@@ -65,7 +65,7 @@
  <body>


-  <p>CSS IS AWESOME!</p>
+  <p>CSS IS AWE&shy;SOME!</p>

  <p>
    The quick brown fox jumps over the lazy dog.

--- a/src/chunker/layout.js
+++ b/src/chunker/layout.js
@@ -348,8 +348,8 @@ class Layout {
      let startOffset = overflow.startOffset;
      let prevLetter = startText[startOffset-1];

-      // Add a hyphen if previous character is a letter
-      if (/^\w$/.test(prevLetter)) {
+      // Add a hyphen if previous character is a letter or soft hyphen
+      if (/^\w|\u00AD$/.test(prevLetter)) {
        overflow.startContainer.textContent = startText.slice(0, startOffset) + "\u2010";
        overflow.setStart(overflow.startContainer, startOffset + 1);
      }