(no commit message)

diff --git a/fluidbook/tools/FWSTK_Resources/nbproject/private/private.xml b/fluidbook/tools/FWSTK_Resources/nbproject/private/private.xml
new file mode 100644 (file)
index 0000000..cc2c0e5
--- /dev/null
+++ b/fluidbook/tools/FWSTK_Resources/nbproject/private/private.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">\r
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>\r
+</project-private>\r

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 c5190e60d94510d83091a03e746920a76ef6ce47..35039c2fd67fddfbbf0bf9afe0415a8bd98f127d 100644 (file)
--- a/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
+++ b/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
@@ -287,6 +287,7 @@ public class PDFStreamEngine {
         * @param str The string to be processed.
         */
        protected String inspectFontEncoding(String str) {
+               System.out.println(str);
                return str;
        }
 
@@ -398,16 +399,6 @@ 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);
-                               }
-                       }
-
                        // multiply the width/height with the scaling factor
                        characterHorizontalDisplacementText = characterHorizontalDisplacementText * fontMatrixXScaling;
                        characterVerticalDisplacementText = characterVerticalDisplacementText * fontMatrixYScaling;
@@ -507,10 +498,6 @@ public class PDFStreamEngine {
                }
        }
 
-       public PDFont getExternalFont(String name) {
-               return null;
-       }
-
        public void updateCmaps(String c, byte b, PDFont font) {
        }