From a19aeb7ba735a72ddcff86287f5c8cce2ec60d81 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 17 May 2011 16:59:05 +0000
Subject: [PATCH]

---
 .../Util/packager/class.ws.packager.html5.php | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/inc/ws/Util/packager/class.ws.packager.html5.php b/inc/ws/Util/packager/class.ws.packager.html5.php
index 094ec2ab8..60e2c2283 100644
--- a/inc/ws/Util/packager/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/class.ws.packager.html5.php
@@ -34,7 +34,7 @@ class wsPackagerHTML5 extends wsPackager {
 
 		$imagesize = getimagesize(WS_DOCS . '/' . $this->pages[1]['document_id'] . '/html/h150-' . $this->pages[1]['document_page'] . '.jpg');
 		$this->pdf2htmlRatio = $imagesize[0] / $this->layouts[1]['width'];
-		$this->scale = 5;
+		$this->scale = 10;
 		$this->multiply = $this->pdf2htmlRatio * $this->scale;
 
 		$this->createHTML();
@@ -141,6 +141,12 @@ class wsPackagerHTML5 extends wsPackager {
 		if (!is_null($group['y'])) {
 			$class[] = 'y' . $group['y'];
 		}
+		if (!is_null($group['letterspacing'])) {
+			$class[] = 'l' . $group['letterspacing'];
+		}
+		if (!is_null($group['wordspacing'])) {
+			$class[] = 'w' . $group['wordspacing'];
+		}
 		$class = implode(' ', $class);
 
 		$res = '<div class="' . $class . '">';
@@ -163,9 +169,6 @@ class wsPackagerHTML5 extends wsPackager {
 		if (!is_null($span['x'])) {
 			$class[] = 'x' . $span['x'];
 		}
-		if (!is_null($span['letterspacing'])) {
-			$class[] = 'l' . $span['letterspacing'];
-		}
 
 		if (count($class)) {
 			$class = ' class="' . implode(' ', $class) . '"';
@@ -190,13 +193,11 @@ class wsPackagerHTML5 extends wsPackager {
 		}
 
 		foreach ($this->cssLetterSpacing as $letterspacing => $index) {
-			$letterspacing*=$this->multiply;
-			$res[] = '.l' . $index . '{letter-spacing:' . $letterspacing . 'px}';
+			$res[] = '.l' . $index . '{letter-spacing:' . $letterspacing . 'em}';
 		}
 
 		foreach ($this->cssWordSpacing as $wordspacing => $index) {
-			$wordspacing*=$this->multiply;
-			$res[] = '.w' . $index . '{word-spacing:' . $wordspacing . 'px}';
+			$res[] = '.w' . $index . '{word-spacing:' . $wordspacing . 'em}';
 		}
 
 		foreach ($this->cssX as $x => $index) {
@@ -259,6 +260,8 @@ class wsPackagerHTML5 extends wsPackager {
 			'color' => $this->getCSSColor($group['color']),
 			'size' => $this->getCSSSize($group['size']),
 			'font' => $this->getCSSFont($group['font'], $document_id),
+			'letterspacing' => $this->getCSSLetterSpacing($group['letterspacing']),
+			'wordspacing' => $this->getCSSWordSpacing($group['wordspacing']),
 			'y' => ($group['size']) / -1.2,
 			'spans' => $res);
 	}
@@ -271,12 +274,11 @@ class wsPackagerHTML5 extends wsPackager {
 		}
 		return array('text' => $text,
 			'x' => $this->normalizeFloatValue($span['x']),
-			'width' => $this->normalizeFloatValue($span['width']),
-			'letterspacing' => null);
+			'width' => $this->normalizeFloatValue($span['width']));
 	}
 
 	protected function getCSSSize(&$size) {
-		$size/=1.05;
+		$size=$this->normalizeFloatValue($size, 1);
 		$sizer = round($size * $this->multiply);
 		return $this->getIndex($sizer, $this->cssSize);
 	}
@@ -297,7 +299,9 @@ class wsPackagerHTML5 extends wsPackager {
 	}
 
 	protected function getCSSLetterSpacing($letterspacing) {
+
 		$letterspacing = $this->normalizeFloatValue($letterspacing, 5);
+
 		if ($letterspacing == 0) {
 			return null;
 		}
@@ -306,6 +310,7 @@ class wsPackagerHTML5 extends wsPackager {
 
 	protected function getCSSWordSpacing($wordspacing) {
 		$wordspacing = $this->normalizeFloatValue($wordspacing, 5);
+
 		if ($wordspacing == 0) {
 			return null;
 		}
-- 
2.39.5