(no commit message)

diff --git a/fluidbook/tools/convert.pe b/fluidbook/tools/convert.pe
index 0edcc64759ffeb03817629e2ba47ca864c45f3fe..af27136aeee2bbf509a8e7f478e6fd6af36b8224 100644 (file)
--- 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 adf68bb641a1dcc814b2456b71eef9c505e3c1f0..ba54e432b5341d4133096b1d43173c6b951f14fd 100644 (file)
--- 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 4cd286275305a7c5e5532543394a65b3d6d1a0f3..3b53184b665720fc171806ada409fe9b074457c2 100644 (file)
--- 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 {