From f5da41a7cfb11bd0b9e813f8c24102c66e6637ba Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Sun, 8 May 2011 15:14:43 +0000 Subject: [PATCH] --- fluidbook/tools/fwstk.jar | Bin 12567172 -> 12567009 bytes .../Util/packager/class.ws.packager.html5.php | 56 ++++++++++++------ 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/fluidbook/tools/fwstk.jar b/fluidbook/tools/fwstk.jar index 6801394948f6208518ff7b3653fd1632e70ee399..0fe43bfaddc11d622bc166230d13d5c658b5312c 100644 GIT binary patch delta 35143 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 CghG7) delta 35339 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 XDA4V6FhtZbJ9&s{tahC(LxTJtcM;Ir diff --git a/inc/ws/Util/packager/class.ws.packager.html5.php b/inc/ws/Util/packager/class.ws.packager.html5.php index 3a5ae527e..799cc8b71 100644 --- a/inc/ws/Util/packager/class.ws.packager.html5.php +++ b/inc/ws/Util/packager/class.ws.packager.html5.php @@ -104,7 +104,7 @@ class wsPackagerHTML5 extends wsPackager { $left = round($line['x'] * $this->multiply, 2); $top = round($line['y'] * $this->multiply, 2); - $res = '
'; + $res = '
'; foreach ($line['groups'] as $group) { $res.=$this->writeGroup($group); } @@ -127,17 +127,11 @@ class wsPackagerHTML5 extends wsPackager { if (!is_null($group['font'])) { $class[] = 'f' . $group['font']; } - if (!is_null($group['wordSpacing'])) { - $class[] = 'w' . $group['wordSpacing']; - } - if (!is_null($group['letterSpacing'])) { - $class[] = 'l' . $group['letterSpacing']; - } $class = implode(' ', $class); $top = round($group['x'] * $this->multiply, 2); - $res = '
'; + $res = '
'; foreach ($group['spans'] as $span) { $res.=$this->writeSpan($span); } @@ -149,10 +143,21 @@ class wsPackagerHTML5 extends wsPackager { if ($span === false) { return ''; } + + $class = array(); + + if (!is_null($span['letterspacing'])) { + $class[] = 'l' . $span['letterspacing']; + } + + if (count($class)) { + $class = ' class="' . implode(' ', $class) . '"'; + } + $left = round($span['x'] * $this->multiply, 2); - $res = ''; - $res .= str_replace(' ', ' ', $span['text']); + $res = ''; + $res .= self::escapeHTML($span['text']); $res .= ''; return $res; } @@ -219,16 +224,22 @@ class wsPackagerHTML5 extends wsPackager { } $res = array(); + foreach ($group->s as $span) { - $res[] = $this->addSpan($span, $document_id); + $newSpan = $this->addSpan($span, $document_id); + if (count($res) > 0) { + $lastSpan = array_pop($res); + $lastSpan['letterspacing'] = $this->getCSSLetterSpacing($newSpan['x'] - $lastSpan['x'] - $lastSpan['width']); + array_push($res, $lastspan); + } + array_push($res, $newSpan); } + return array( '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']), - 'x' => $group['size']/-1.2, + 'x' => $group['size'] / -1.2, 'spans' => $res); } @@ -239,7 +250,9 @@ class wsPackagerHTML5 extends wsPackager { return false; } return array('text' => $text, - 'x' => $this->normalizeFloatValue($span['x'])); + 'x' => $this->normalizeFloatValue($span['x']), + 'width' => $this->normalizeFloatValue($span['width']), + 'letterspacing' => 0); } protected function getCSSSize(&$size) { @@ -265,16 +278,15 @@ class wsPackagerHTML5 extends wsPackager { } protected function getCSSLetterSpacing($letterspacing) { - $letterspacing = $this->normalizeFloatValue($letterspacing, 2); + $letterspacing = $this->normalizeFloatValue($letterspacing, 5); if ($letterspacing == 0) { return null; } - return $this->getIndex($letterspacing, $this->cssLetterSpacing); } protected function getCSSWordSpacing($wordspacing) { - $wordspacing = $this->normalizeFloatValue($wordspacing, 2); + $wordspacing = $this->normalizeFloatValue($wordspacing, 5); if ($wordspacing == 0) { return null; } @@ -318,6 +330,14 @@ class wsPackagerHTML5 extends wsPackager { return $str; } + public static function escapeHTML($in) { + $in = str_replace(' ', ' ', $in); + $in = str_replace("\x2009", " ", $in); + + + return $in; + } + public function __destruct() { } -- 2.39.5