(no commit message)

diff --git a/fluidbook/tools/convert.pe b/fluidbook/tools/convert.pe
index 84528222b65ccb14e8751fe2015c52223fe6a250..b960a08bdfe567966401879c042c420d83fb0316 100644 (file)
--- a/fluidbook/tools/convert.pe
+++ b/fluidbook/tools/convert.pe
@@ -1,13 +1,13 @@
 #!/usr/local/bin/fontforge
 Open($1,1)
-
+Print("Open font ",$1)
 i=2;
 while ( i<=$argc-2 )
-   if (i==1)
-               MergeFonts($argv[i],1)
-   endif
+       Print ("Merge with font ",$argv[i]);
+       MergeFonts($argv[i],1)
    ++i
 endloop
 
 RemoveAllKerns()
+Print("Write font ",$argv[i])
 Generate($argv[i])
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index fb9e444b092ea9bb5026bf806b51a7d8ce9931d9..97d3c1483464a28d0c92d3d8147e7f682ea4b9f0 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -129,11 +129,11 @@ class wsDocument extends cubeMetier {
                if (!file_exists($this->out . '/fonts/web')) {\r
                        mkdir($this->out . '/fonts/web', 0777, true);\r
                }\r
-               $formats = array('ttf', 'woff', 'svg', 'svgz', 'eot');\r
+               $images = array('pnm', 'jpg', 'jpeg', 'png', 'pam');\r
                // Fonts conversion\r
                $collections = array();\r
                while ($file = readdir($dr)) {\r
-                       if ($file == '.' || $file == '..') {\r
+                       if ($file == '.' || $file == '..' || in_array(files::getExtension($file), $images)) {\r
                                continue;\r
                        }\r
 \r
@@ -151,24 +151,15 @@ class wsDocument extends cubeMetier {
                        $collections[$fname][] = $file;\r
                }\r
 \r
-               foreach ($collections as $fontname => $files) {\r
-                       foreach ($formats as $format) {\r
-                               if ($format == 'eot') {\r
-                                       $ttf2eot = new cubeCommandLine('ttf2eot', $this->out . '/fonts/web/' . $fontname . '.eot');\r
-                                       $ttf2eot->setPath(CONVERTER_PATH);\r
-                                       $ttf2eot->setManualArg('< ' . $this->out . '/fonts/web/' . $fontname . '.ttf');\r
-                                       $ttf2eot->execute();\r
-                               } else {\r
-                                       $fontforge = new cubeCommandLine('convert.pe');\r
-                                       $fontforge->setPath(CONVERTER_PATH);\r
-                                       foreach ($files as $file) {\r
-                                               $fontforge->setArg(null, $out . '/' . $file);\r
-                                       }\r
-                                       $fontforge->setArg(null, $this->out . '/fonts/web/' . $fontname . '.' . $format);\r
-                                       $fontforge->execute();\r
-                                       $this->addToLog($fontforge);\r
-                               }\r
+               foreach ($collections as $fontname => $files)  {\r
+                       $fontforge = new cubeCommandLine('convert.pe');\r
+                       $fontforge->setPath(CONVERTER_PATH);\r
+                       foreach ($files as $file) {\r
+                               $fontforge->setArg(null, $out . '/' . $file);\r
                        }\r
+                       $fontforge->setArg(null, $this->out . '/fonts/web/' . $fontname . '.ttf');\r
+                       $fontforge->execute();\r
+                       $this->addToLog($fontforge);\r
                }\r
        }\r
 \r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 78702703e1227390621ac3a3dab710ff071d3298..5258b68f1436bcad400c7ad89c20d88c77d8ca91 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -13,7 +13,8 @@ class wsPackager {
        protected $daoBook;\r
 \r
        public static function package($book_id, $version) {\r
-               cubePHP::neverStop();\r
+               //cubePHP::neverStop();\r
+               set_time_limit(10);\r
                if ($version == 'html') {\r
                        $packager = new wsPackagerHTML($book_id);\r
                } elseif ($version == 'win-exe') {\r

diff --git a/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php b/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
index e65d619a9cea908b2984d0af98e60897ee3d6024..e47b0f47fbd1f319f28c52617519425ecf23d95e 100644 (file)
--- a/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
+++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
@@ -231,7 +231,7 @@ class videoLink extends wsPackagerHTML5Link {
                        'controls' => $this->video_controls == '1',
                        'autoPlay' => $this->video_auto_start == '1',
                        'loop' => $this->video_loop);
-               $res.=cubeMedia::flashObject('data/swf/video.swf', $w, $h, $flashvars, 'swfplayer-' . $basename, '', 9, '#ffffff', '', 'true', 'noscale', 'normal');
+               $res.=cubeMedia::flashObject('swf/video.swf', $w, $h, $flashvars, 'swfplayer-' . $basename, '', 9, '#ffffff', '', 'true', 'noscale', 'normal');
                $res.='</video>';
                return $res;
        }

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 3f7e6052a76e6c85944bfac784db452496f70ca0..7a82629ec4ac064a379dc18f141ac59a4b70b63e 100644 (file)
--- a/inc/ws/Util/packager/html5/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
@@ -19,6 +19,7 @@ class wsPackagerHTML5 extends wsPackager {
        protected $numerotation;\r
        protected static $resolutions = array(36, 72, 150);\r
        protected static $uaPrefixes = array('-moz-', '-webkit-', '-o-', '-ms-', '');\r
+       protected $fontDocs = array();\r
 \r
        public function __construct($book_id) {\r
                parent::__construct($book_id);\r
@@ -139,7 +140,7 @@ class wsPackagerHTML5 extends wsPackager {
                        if (isset($pages[$i])) {\r
                                $c = $pages[$i];\r
                        }\r
-                       file_put_contents($this->vdir . '/data/links/pages/p' . $i . '.html', $c);\r
+                       file_put_contents($this->vdir . 'data/links/pages/p' . $i . '.html', $c);\r
                }\r
                return $css;\r
        }\r
@@ -153,11 +154,25 @@ class wsPackagerHTML5 extends wsPackager {
        }\r
 \r
        protected function writeFonts() {\r
-               $fext = array('ttf', 'eot', 'svg', 'svgz', 'woff');\r
+               $formats = array('ttf', 'woff', 'svg', 'svgz', 'eot');\r
+\r
                foreach ($this->cssFont as $font => $index) {\r
-                       list($font, $document_id) = explode('//', $font);\r
-                       foreach ($fext as $ext) {\r
-                               copy(WS_DOCS . '/' . $document_id . "/fonts/web/" . $font . '.' . $ext, $this->vdir . '/data/style/F' . $index . '.' . $ext);\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
+                               }\r
                        }\r
                }\r
        }\r
@@ -451,7 +466,6 @@ class wsPackagerHTML5 extends wsPackager {
                }\r
 \r
                foreach ($this->cssFont as $font => $index) {\r
-                       list($font, $document_id) = explode('//', $font);\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[] = '.f' . $index . '{font-family:F' . $index . ',Arial,Helvetica}';\r
                }\r
@@ -505,9 +519,6 @@ class wsPackagerHTML5 extends wsPackager {
                                $pos+=$span['width'];\r
                                $first = false;\r
                        } else {\r
-                               if ((string) $span == 'MARDI 19') {\r
-                                       fb($span['x'], $newSpan['x']);\r
-                               }\r
                                if ((float) $span['x'] < (float) $newSpan['x']) {\r
                                        // On change de groupe\r
                                        $ls = $ws = 0;\r
@@ -521,7 +532,7 @@ class wsPackagerHTML5 extends wsPackager {
                                        $res[] = array(\r
                                                'color' => $this->getCSSColor($group['color']),\r
                                                'size' => $this->getCSSSize($group['size']),\r
-                                               'font' => $this->getCSSFont($group['font'], $document_id),\r
+                                               'font' => $this->getCSSFont((string)$group['font'], $document_id),\r
                                                'letterspacing' => $this->getCSSLetterSpacing($ls),\r
                                                'wordspacing' => $this->getCSSLetterSpacing($ws),\r
                                                'y' => 0,\r
@@ -619,7 +630,13 @@ class wsPackagerHTML5 extends wsPackager {
        }\r
 \r
        protected function getCSSFont($font, $document_id) {\r
-               return $this->getIndex($font . "//" . $document_id, $this->cssFont);\r
+               $font=(string) $font;\r
+               if (!isset($this->fontDocs[$font])) {\r
+                       $this->fontDocs[$font] = array();\r
+               }\r
+               $this->fontDocs[$font][$document_id] = true;\r
+\r
+               return $this->getIndex($font, $this->cssFont);\r
        }\r
 \r
        protected function getCSSColor($color) {\r