(no commit message)

diff --git a/fluidbook/compile/_zinc/send.bat b/fluidbook/compile/_zinc/send.bat
new file mode 100644 (file)
index 0000000..bb95baf
--- /dev/null
+++ b/fluidbook/compile/_zinc/send.bat
@@ -0,0 +1,4 @@
+rm Fluidbook.app.zip\r
+"C:\Program Files\7-Zip\7z.exe" a -tzip Fluidbook.app.zip Fluidbook.app\r
+"H:\Applications\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.exe" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/\r
+"H:\Applications\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.app.zip" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/
\ 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 388b515c126bc595664123183bd4f4bf92ce7b4b..d621fcd9f9c5201dd6cf5bfa02ed748726391b92 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -747,7 +747,7 @@ class wsDocument extends cubeMetier {
 \r
                if (!in_array($method, array(self::BARBARE_PNM, self::BARBARE_GS))) {\r
 \r
-                       if (in_array($version, array('stable', 'latest'))) {\r
+                       if (in_array($version, array('stable', 'latest', 'git'))) {\r
                                $program = '/usr/local/swftools/' . $version . '/bin/pdf2swf';\r
                        } else {\r
                                $program = 'pdf2swf';\r
@@ -792,6 +792,10 @@ class wsDocument extends cubeMetier {
                        $pdf2swf->setArg('set jpegquality', $quality);\r
                        $pdf2swf->setArg('set disablelinks');\r
                        $pdf2swf->setArg('set dots');\r
+                       if ($version == 'git') {\r
+                               $pdf2swf->setArg(null, '-T7');\r
+                               $pdf2swf->setArg('set alignfonts');\r
+                       }\r
                        /* if(file_exists($this->rgb)){\r
                          $pdf2swf->setArg(null, $this->rgb);\r
                          }else{ */\r
@@ -800,6 +804,16 @@ class wsDocument extends cubeMetier {
                        $pdf2swf->setArg('output', $this->out . $prefix . '%.swf');\r
                        $pdf2swf->execute();\r
 \r
+                       if ($version == 'git') {\r
+                               $f = $this->out . $prefix . $page . '.swf';\r
+                               $combine = new cubeCommandLine('swfcombine');\r
+                               $combine->setArg('d');\r
+                               $combine->setArg(null, '-F9');\r
+                               $combine->setArg(null, $f);\r
+                               $combine->setArg('o', $f);\r
+                               $combine->execute();\r
+                       }\r
+\r
                        $this->addToLog($pdf2swf, true, $page);\r
                } else {\r
                        $this->pdf2swfBarbare($page, $resolution, $quality, $method);\r