From d22c1f83ac573dd241fc9f22ed6b0a47a9e32424 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 13 Oct 2011 08:59:14 +0000
Subject: [PATCH]

---
 fluidbook/tools/convert.pe                      | 7 +++----
 inc/ws/Util/fontextractor/class.ws.pdf.font.php | 6 +++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/fluidbook/tools/convert.pe b/fluidbook/tools/convert.pe
index af27136ae..a70350060 100644
--- 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 ba54e432b..592d471d1 100644
--- 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) {
-- 
2.39.5