From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 13 Oct 2011 08:50:18 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4680e1abe6b702adfcee676de93775fa519dcab9;p=cubeextranet.git

---

diff --git a/fluidbook/tools/convert.pe b/fluidbook/tools/convert.pe
index 0edcc6475..af27136ae 100644
--- a/fluidbook/tools/convert.pe
+++ b/fluidbook/tools/convert.pe
@@ -22,6 +22,7 @@ if($argv[i]!="-")
 			uto=Strtol(glyph[1],16)
 			Select(ufrom)
 			SetUnicodeValue(UCodePoint(uto))
+			Print("Move ",glyph[0]," to ",glyph[1]);
 			j++
 		endif
 	endloop	
diff --git a/inc/ws/Util/fontextractor/class.ws.pdf.font.php b/inc/ws/Util/fontextractor/class.ws.pdf.font.php
index adf68bb64..ba54e432b 100644
--- a/inc/ws/Util/fontextractor/class.ws.pdf.font.php
+++ b/inc/ws/Util/fontextractor/class.ws.pdf.font.php
@@ -137,7 +137,7 @@ class wsPDFFont {
 			if ($e[0] == '/ToUnicode') {
 				$this->cmap_id = $e[1];
 			} elseif ($e[0] == '/DescendantFonts') {
-				$this->descendant = new wsPDFFont($this->extractor, $e[1]);
+				$this->descendant = new wsPDFFont($this->extractor, $e[2]);
 			} elseif ($e[0] == '/BaseFont') {
 				$this->name = ltrim($e[1], '/');
 			} elseif ($e[0] == '/FontDescriptor') {
@@ -331,7 +331,7 @@ class wsPDFFont {
 		$cmap = $this->writeCMAP();
 		$file = $this->writeFont();
 
-		$this->ttffile = $dir . '/' . $this->name . '-' . $this->id . '.ttf';
+		$this->ttffile = $dir . '/' . $this->name . '-' . $this->id . '.otf';
 
 		$fontforge = new cubeCommandLine('convert.pe');
 		$fontforge->setPath(CONVERTER_PATH);
@@ -341,8 +341,8 @@ class wsPDFFont {
 		$fontforge->execute();
 		$this->addToLog($fontforge);
 
-		unlink($cmap);
-		unlink($file);
+		//unlink($cmap);
+		//unlink($file);
 	}
 
 	protected function writeFont() {
diff --git a/inc/ws/Util/fontextractor/class.ws.pdf.fontextractor.php b/inc/ws/Util/fontextractor/class.ws.pdf.fontextractor.php
index 4cd286275..3b53184b6 100644
--- a/inc/ws/Util/fontextractor/class.ws.pdf.fontextractor.php
+++ b/inc/ws/Util/fontextractor/class.ws.pdf.fontextractor.php
@@ -42,7 +42,7 @@ class wsPDFFontExtractor {
 		}
 
 		foreach ($collections as $name => $fonts) {
-			$out = $this->outweb . '/' . $fonts[0]->getCanonicalName() . '.ttf';
+			$out = $this->outweb . '/' . $fonts[0]->getCanonicalName() . '.otf';
 			if (count($fonts) == 1) {
 				copy($fonts[0]->getTTFFile(), $out);
 			} else {