(no commit message)

diff --git a/inc/ws/Util/packager/html5/class.ws.packager.html5.php b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
index bd1c2b22ace0fb18a0bab8f42705f2c30d739dd5..a396a9ad5193564c26671017029107be063d5de9 100644 (file)
--- a/inc/ws/Util/packager/html5/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
@@ -130,7 +130,7 @@ class wsPackagerHTML5 extends wsPackager {
                }\r
                $style = array();\r
                foreach ($sheets as $sheet) {\r
-                       $style[] = '<link type="text/css" rel="stylesheet" href="' . $sheet . '" />';\r
+                       $style[] = '<link type="text/css" rel="stylesheet" href="' . $sheet . '?junk=' . TIME . '" />';\r
                }\r
                $style = implode("\n\t\t", $style);\r
 \r
@@ -251,25 +251,18 @@ class wsPackagerHTML5 extends wsPackager {
        }\r
 \r
        protected function writeFonts() {\r
-               $formats = array('ttf', 'woff', 'svg', 'svgz', 'eot');\r
+               $formats = array('ttf', 'woff', 'svg');\r
 \r
                foreach ($this->cssFont as $font => $index) {\r
 \r
                        foreach ($formats as $format) {\r
-                               if ($format == 'eot') {\r
-                                       $ttf2eot = new cubeCommandLine('ttf2eot', $this->vdir . '/data/style/F' . $index . '.' . $format);\r
-                                       $ttf2eot->setPath(CONVERTER_PATH);\r
-                                       $ttf2eot->setManualArg('< ' . $this->vdir . '/data/style/F' . $index . '.ttf');\r
-                                       $ttf2eot->execute();\r
-                               } else {\r
-                                       $fontforge = new cubeCommandLine('convert.pe');\r
-                                       $fontforge->setPath(CONVERTER_PATH);\r
-                                       foreach ($this->fontDocs[$font] as $document_id => $dummy) {\r
-                                               $fontforge->setArg(null, WS_DOCS . '/' . $document_id . '/fonts/web/' . $font . '.ttf');\r
-                                       }\r
-                                       $fontforge->setArg(null, $this->vdir . '/data/style/F' . $index . '.' . $format);\r
-                                       $fontforge->execute();\r
+                               $fontforge = new cubeCommandLine('convert.pe');\r
+                               $fontforge->setPath(CONVERTER_PATH);\r
+                               foreach ($this->fontDocs[$font] as $document_id => $dummy) {\r
+                                       $fontforge->setArg(null, WS_DOCS . '/' . $document_id . '/fonts/web/' . $font . '.ttf');\r
                                }\r
+                               $fontforge->setArg(null, $this->vdir . '/data/style/F' . $index . '.' . $format);\r
+                               $fontforge->execute();\r
                        }\r
                }\r
        }\r
@@ -407,6 +400,13 @@ class wsPackagerHTML5 extends wsPackager {
                $res[] = '.doublePage,#pages,.landscape #shadow.double{width:' . $w2 . ';max-width:' . $w2 . ';height:' . $h . ';max-height:' . $h . '}';\r
                $res[] = '.landscape #shadow.single.right{left: ' . $w . ';}';\r
                $res[] = '.landscape .page.right{left:' . $w . '}';\r
+               if ($this->theme->parametres->displayPageNumber) {\r
+                       $res[] = '#pagesnumbers{top:' . $h . ';color:' . self::colorToCSS($this->theme->parametres->colorPageNumber) . '}';\r
+                       $res[] = '#pagesnumbers div{width:' . $w . '}';\r
+               } else {\r
+                       $res[] = '#pagesnumbers{display:none;}';\r
+               }\r
+\r
                $texts = '.texts{' . $this->writeCSSUA('transform-origin', 'top left') . ';';\r
                $texts.=$this->writeCSSUA('transform', 'scale(' . round(1 / $this->multiply, 2) . ')') . ';';\r
                $texts.='width:' . $wm . '; max-width:' . $wm . ';';\r
@@ -563,7 +563,7 @@ class wsPackagerHTML5 extends wsPackager {
                }\r
 \r
                foreach ($this->cssFont as $font => $index) {\r
-                       $res[] = "@font-face{font-family:F" . $index . ";src:url('F" . $index . ".eot');src:url('F" . $index . ".eot?#iefix') format('eot'),url('F" . $index . ".ttf') format('truetype'),url('F" . $index . ".svgz#" . $font . "') format('svgz'),url('F" . $index . ".svg#" . $font . "') format('svg')}";\r
+                       $res[] = "@font-face{font-family:F" . $index . ";src:url('F" . $index . ".woff') format('woff'),url('F" . $index . ".ttf') format('truetype'),url('F" . $index . ".svg#" . $font . "') format('svg')}";\r
                        $res[] = '.f' . $index . '{font-family:F' . $index . ',Arial,Helvetica}';\r
                }\r
 \r
@@ -750,7 +750,7 @@ class wsPackagerHTML5 extends wsPackager {
 \r
        protected function getCSSLetterSpacing($letterspacing) {\r
 \r
-               $letterspacing = $this->normalizeFloatValue($letterspacing, 5);\r
+               $letterspacing = $this->normalizeFloatValue($letterspacing, 4);\r
 \r
                if ($letterspacing == 0) {\r
                        return null;\r
@@ -759,7 +759,7 @@ class wsPackagerHTML5 extends wsPackager {
        }\r
 \r
        protected function getCSSWordSpacing($wordspacing) {\r
-               $wordspacing = $this->normalizeFloatValue($wordspacing, 5);\r
+               $wordspacing = $this->normalizeFloatValue($wordspacing, 4);\r
 \r
                if ($wordspacing == 0) {\r
                        return null;\r