(no commit message)

diff --git a/fluidbook/tools/convert.pe b/fluidbook/tools/convert.pe
index af27136aeee2bbf509a8e7f478e6fd6af36b8224..a70350060dd15e1b02a04021e6681ee2b0c0202d 100644 (file)
--- a/fluidbook/tools/convert.pe
+++ b/fluidbook/tools/convert.pe
@@ -4,12 +4,11 @@ Print("Open font ",$1)
 Print("Em size : ",$em);
 i=2
 while ( i<=$argc-3 )
-       Print ("Merge with font ",$argv[i]);
+       Print ("Merge with font ",$argv[i])
        MergeFonts($argv[i])
    ++i
 endloop
 
-//
 if($argv[i]!="-")
        Print("Rewrite font with CMAP ",$argv[i]);
        cmap=LoadStringFromFile($argv[i])
@@ -18,11 +17,11 @@ if($argv[i]!="-")
        while(j<SizeOf(glyphs))
                if(glyphs[j]!="")
                        glyph=StrSplit(glyphs[j],"      ")
-                       ufrom=(glyph[0],16)
+                       ufrom=Strtol(glyph[0],16)
                        uto=Strtol(glyph[1],16)
                        Select(ufrom)
                        SetUnicodeValue(UCodePoint(uto))
-                       Print("Move ",glyph[0]," to ",glyph[1]);
+                       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 ba54e432b5341d4133096b1d43173c6b951f14fd..592d471d155c78568dce1b5f69dbf9e71e0d67b2 100644 (file)
--- a/inc/ws/Util/fontextractor/class.ws.pdf.font.php
+++ b/inc/ws/Util/fontextractor/class.ws.pdf.font.php
@@ -269,6 +269,10 @@ class wsPDFFont {
                                $inMap = true;
                                continue;
                        }
+                       
+                       if(count($e)==1 && $e[0]=='endbfchar'){
+                               $inMap=false;
+                       }
 
                        if (!$inMap) {
                                continue;
@@ -279,7 +283,7 @@ class wsPDFFont {
 
                        $res[$from] = $to;
                }
-               return true;
+               return $res;
        }
 
        protected function manageLigatures($code) {