From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 10 Jan 2013 13:46:11 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4cd19ae8a9db872bd41c27a3a647aab3d2a15ecf;p=cubeextranet.git

---

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