You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2015/04/25 04:14:24 UTC
svn commit: r1675990 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font:
PDFont.java PDSimpleFont.java PDTrueTypeFont.java PDType0Font.java
PDType1CFont.java
Author: jahewson
Date: Sat Apr 25 02:14:24 2015
New Revision: 1675990
URL: http://svn.apache.org/r1675990
Log:
PDFBOX-1900: Fix glyph stretch bug for AFM fonts
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1675990&r1=1675989&r2=1675990&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Sat Apr 25 02:14:24 2015
@@ -237,10 +237,24 @@ public abstract class PDFont implements
}
}
+ // standard 14 font widths are specified by an AFM
+ if (isStandard14())
+ {
+ return getStandard14Width(code);
+ }
+
// if there's nothing to override with, then obviously we fall back to the font
return getWidthFromFont(code);
}
+ /**
+ * Returns the glyph width from the AFM if this is a Standard 14 font.
+ *
+ * @param code character code
+ * @return width in 1/1000 text space
+ */
+ protected abstract float getStandard14Width(int code);
+
@Override
public abstract float getWidthFromFont(int code) throws IOException;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java?rev=1675990&r1=1675989&r2=1675990&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java Sat Apr 25 02:14:24 2015
@@ -16,8 +16,11 @@
*/
package org.apache.pdfbox.pdmodel.font;
+import java.io.IOException;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSBase;
@@ -30,10 +33,6 @@ import org.apache.pdfbox.pdmodel.font.en
import org.apache.pdfbox.pdmodel.font.encoding.StandardEncoding;
import org.apache.pdfbox.pdmodel.font.encoding.WinAnsiEncoding;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* A simple font. Simple fonts use a PostScript encoding vector.
*
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=1675990&r1=1675989&r2=1675990&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Sat Apr 25 02:14:24 2015
@@ -225,11 +225,6 @@ public class PDTrueTypeFont extends PDSi
@Override
public float getWidthFromFont(int code) throws IOException
{
- if (getStandard14AFM() != null && getEncoding() != null)
- {
- return getStandard14Width(code);
- }
-
int gid = codeToGID(code);
float width = ttf.getAdvanceWidth(gid);
float unitsPerEM = ttf.getUnitsPerEm();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1675990&r1=1675989&r2=1675990&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java Sat Apr 25 02:14:24 2015
@@ -317,6 +317,12 @@ public class PDType0Font extends PDFont
}
@Override
+ protected float getStandard14Width(int code)
+ {
+ throw new UnsupportedOperationException("not suppported");
+ }
+
+ @Override
public float getWidthFromFont(int code) throws IOException
{
return descendantFont.getWidthFromFont(code);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java?rev=1675990&r1=1675989&r2=1675990&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java Sat Apr 25 02:14:24 2015
@@ -217,11 +217,6 @@ public class PDType1CFont extends PDSimp
@Override
public float getWidthFromFont(int code) throws IOException
{
- if (getStandard14AFM() != null)
- {
- return getStandard14Width(code);
- }
-
String name = codeToName(code);
float width = type1Equivalent.getWidth(name);