fixed disappearing space characters is some circumstances

YetiForceCompany · Jan 23, 2019 · 32b6c51 · 32b6c51
1 parent 1f0a79a
commit 32b6c51
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/examples/simpleInline.html b/examples/simpleInline.html
@@ -1,5 +1,6 @@
 <!--<div style="display:block;border:1px solid #FF8000;line-height:2;">test</div>-->
-<div style="font-family:'PT Sans';font-size:12px;line-height:1.2;">
+
+<div style="font-family:'DejaVu Sans';font-size:12px;line-height:1.2;">
     <div style="display:inline;border:1px solid #000000;">
         <div style="display:inline;border:1px solid #FF8000;vertical-align:top;">inline1</div>
         <div style="display:inline-block;padding:10px;border:1px solid #0000ff;line-height:2">inline-block1</div>
@@ -13,6 +14,10 @@
         <div style="display:inline-block;padding:10px;border:1px solid #0000ff;line-height:2">inline-block3</div>
     </div>
 </div>
+
+<div style="font-family:'DejaVu Sans';font-size:16px;">
+    <span>1</span> <span>2 3 </span><span>4</span>
+</div>
 <!--
 <div style="display:inline;">inline</div>
 <div style="display:inline;">inline2</div>

diff --git a/examples/simpleInline.pdf b/examples/simpleInline.pdf
diff --git a/lib/Layout/InlineBox.php b/lib/Layout/InlineBox.php
@@ -210,14 +210,18 @@ public function appendText($childDomElement, $element = null, $style = null, $pa
 		}
 		if ($text !== '') {
 			if ($whiteSpace === 'normal') {
-				$words = preg_split('/ /u', $text, 0, PREG_SPLIT_NO_EMPTY);
+				$words = preg_split('/ /u', $text, 0);
 				$count = count($words);
 				if ($count) {
 					foreach ($words as $index => $word) {
-						$this->createText($word);
-						$parent = $this->getParent();
-						$anonymous = ($parent instanceof self && $parent->isAnonymous()) || $parent instanceof LineBox;
-						if ($index + 1 !== $count || $anonymous) {
+						if ($word !== '') {
+							$this->createText($word);
+							$parent = $this->getParent();
+							$anonymous = ($parent instanceof self && $parent->isAnonymous()) || $parent instanceof LineBox;
+							if ($index + 1 !== $count || $anonymous) {
+								$this->createText(' ', true);
+							}
+						} else {
 							$this->createText(' ', true);
 						}
 					}