From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sun, 21 Aug 2011 16:05:35 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2b5ce64a3aad0398344e965f36a864823dfc6c1a;p=cubeextranet.git

---

diff --git a/fluidbook/tools/convert.pe b/fluidbook/tools/convert.pe
index 43c65f706..5980204b0 100644
--- a/fluidbook/tools/convert.pe
+++ b/fluidbook/tools/convert.pe
@@ -10,7 +10,7 @@ endloop
 
 //
 if($argv[i]!="-")
-	cmap=LoadStringFromFile()
+	cmap=LoadStringFromFile($argv[i])
 	glyphs=StrSplit(cmap,"\\n");
 	j=0
 	while(j<SizeOf(glyphs))
diff --git a/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Layout.properties b/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Layout.properties
index 4a5d0304d..792765451 100644
--- a/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Layout.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Layout.properties
@@ -1 +1 @@
-application.args=--input H:\\Documents\\fwstk\\layout\\document.pdf --layout H:\\Documents\\fwstk\\layout\\p%d.layout --cmaps H:\\Documents\\fwstk\\layout\\
+application.args=--input H:\\Documents\\fwstk\\layout\\document.pdf --layout H:\\Documents\\fwstk\\layout\\p%d.layout --fonts H:\\Documents\\fwstk\\layout\\fonts\\ --cmaps H:\\Documents\\fwstk\\layout\\
diff --git a/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java b/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
index 4174288e4..30c61bfe5 100644
--- a/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
+++ b/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
@@ -375,17 +375,16 @@ public class PDFStreamEngine {
 				String currentChar = Character.toString(currentString.charAt(i));
 				if (!currentChar.equals(c)) {
 					if (c.toUpperCase().equals(currentChar)) {
+						System.out.println("up");
 						c = c.toUpperCase();
 					} else if (c.toLowerCase().equals(currentChar)) {
+						System.out.println("low");
 						c = c.toLowerCase();
 					}
 				}
 			} catch (NullPointerException | StringIndexOutOfBoundsException e) {
 			}
-			
-			
 
-			//System.out.println(c+";"+currentString.charAt(i));
 
 			// the space width has to be transformed into display units
 			float spaceWidthDisp = spaceWidthText * fontSizeText * horizontalScalingText * textMatrix.getValue(0, 0) * ctm.getValue(0, 0);
@@ -395,6 +394,20 @@ public class PDFStreamEngine {
 			float characterHorizontalDisplacementText = font.getFontWidth(string, i, codeLength);
 			float characterVerticalDisplacementText = font.getFontHeight(string, i, codeLength);
 
+			PDFont ef = null;
+			if (characterHorizontalDisplacementText == 0.0f) {
+				ef = this.getExternalFont(font.getBaseFont());
+
+				if (ef != null) {
+					characterHorizontalDisplacementText = Math.max(ef.getFontWidth(string, i, codeLength),ef.getStringWidth(c));
+					characterVerticalDisplacementText = ef.getFontHeight(string, i, codeLength);
+				}
+			}
+
+			if (characterHorizontalDisplacementText == 0.0f && ef != null) {
+				System.out.println(c+":"+ef.getStringWidth(c));
+			}
+
 			// multiply the width/height with the scaling factor
 			characterHorizontalDisplacementText = characterHorizontalDisplacementText * fontMatrixXScaling;
 			characterVerticalDisplacementText = characterVerticalDisplacementText * fontMatrixYScaling;
@@ -494,6 +507,10 @@ public class PDFStreamEngine {
 		}
 	}
 
+	public PDFont getExternalFont(String name) {
+		return null;
+	}
+
 	public void updateCmaps(String c, byte b, PDFont font) {
 	}
 
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 7b707046a..cb28a31b2 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -395,8 +395,15 @@ class wsDocument extends cubeMetier {
 		$fwstk->setArg('--input ' . $this->cropped);
 		$fwstk->setArg('--extractTexts ' . $this->out . '%s%d.txt');
 		$fwstk->setArg('--extractLinks ' . $this->out . 'p%d.csv');
+		$fwstk->execute();
+		$this->addToLog($fwstk);
+
+		$fwstk = new cubeCommandLine('fwstk');
+		$fwstk->setPath(CONVERTER_PATH);
+		$fwstk->setArg('--input ' . $this->in);
 		$fwstk->setArg('--layout ' . $this->html . 'p%d.layout');
 		$fwstk->setArg('--cmaps ' . $this->html);
+		$fwstk->setArg('--fonts' . $this->out . 'fonts/web/');
 		$fwstk->execute();
 		$this->addToLog($fwstk);