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 2014/08/25 20:29:37 UTC
svn commit: r1620402 - in /pdfbox/branches/no-awt:
fontbox/src/main/java/org/apache/fontbox/cff/
fontbox/src/main/java/org/apache/fontbox/ttf/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/
Author: jahewson
Date: Mon Aug 25 18:29:36 2014
New Revision: 1620402
URL: http://svn.apache.org/r1620402
Log:
PDFBOX-2262: Handle custom FontMatrix in CFF font
Modified:
pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java
pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
Modified: pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java?rev=1620402&r1=1620401&r2=1620402&view=diff
==============================================================================
--- pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java (original)
+++ pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/cff/CFFFont.java Mon Aug 25 18:29:36 2014
@@ -154,7 +154,7 @@ public abstract class CFFFont
@Override
public String toString()
{
- return getClass().getName() + "[name=" + fontName + ", topDict=" + topDict
+ return getClass().getSimpleName() + "[name=" + fontName + ", topDict=" + topDict
+ ", charset=" + charset + ", charStrings=" + charStrings
+ "]";
}
Modified: pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java?rev=1620402&r1=1620401&r2=1620402&view=diff
==============================================================================
--- pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java (original)
+++ pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java Mon Aug 25 18:29:36 2014
@@ -433,7 +433,6 @@ public class TrueTypeFont implements Typ
GeneralPath path = glyphs[gid].getPath();
// scale to 1000upem, per PostScript convention
- // todo: we could do this with the PostScript "matrix" entry, later?
float scale = 1000f / getUnitsPerEm();
AffineTransform atScale = AffineTransform.getScaleInstance(scale, scale);
path.transform(atScale);
Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java?rev=1620402&r1=1620401&r2=1620402&view=diff
==============================================================================
--- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java (original)
+++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java Mon Aug 25 18:29:36 2014
@@ -26,6 +26,7 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
+import org.apache.pdfbox.pdmodel.common.PDMatrix;
/**
* A CIDFont. A CIDFont is a PDF object that contains information about a CIDFont program. Although
@@ -132,6 +133,11 @@ public abstract class PDCIDFont implemen
}
/**
+ * Returns the font matrix, which represents the transformation from glyph space to text space.
+ */
+ public abstract PDMatrix getFontMatrix();
+
+ /**
* Returns the Type 0 font which is the parent of this font.
*
* @return parent Type 0 font
Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java?rev=1620402&r1=1620401&r2=1620402&view=diff
==============================================================================
--- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java (original)
+++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java Mon Aug 25 18:29:36 2014
@@ -18,6 +18,7 @@ package org.apache.pdfbox.pdmodel.font;
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.apache.fontbox.cff.CFFCIDFont;
@@ -25,8 +26,12 @@ import org.apache.fontbox.cff.CFFFont;
import org.apache.fontbox.cff.CFFParser;
import org.apache.fontbox.cff.CFFType1Font;
import org.apache.fontbox.cff.Type2CharString;
+import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSFloat;
+import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.io.IOUtils;
+import org.apache.pdfbox.pdmodel.common.PDMatrix;
import org.apache.pdfbox.pdmodel.common.PDStream;
/**
@@ -41,9 +46,11 @@ public class PDCIDFontType0 extends PDCI
private final CFFType1Font t1Font; // Top DICT that does not use CIDFont operators
private final Map<Integer, Float> glyphHeights = new HashMap<Integer, Float>();
- private Float avgWidth = null;
private final boolean isEmbedded;
+ private Float avgWidth = null;
+ private PDMatrix fontMatrix;
+
/**
* Constructor.
*
@@ -96,6 +103,46 @@ public class PDCIDFontType0 extends PDCI
}
}
+ @Override
+ public PDMatrix getFontMatrix()
+ {
+ if (fontMatrix == null)
+ {
+ List<Number> numbers;
+ if (cidFont != null)
+ {
+ numbers = cidFont.getFontMatrix();
+ }
+ else
+ {
+ numbers = t1Font.getFontMatrix();
+ }
+
+ if (numbers != null && numbers.size() == 6)
+ {
+ COSArray array = new COSArray();
+ for (Number number : numbers)
+ {
+ array.add(new COSFloat(number.floatValue()));
+ }
+ fontMatrix = new PDMatrix(array);
+ }
+ else
+ {
+ // default 1000 upem
+ COSArray array = new COSArray();
+ array.add(new COSFloat(0.001f));
+ array.add(COSInteger.ZERO);
+ array.add(COSInteger.ZERO);
+ array.add(new COSFloat(0.001f));
+ array.add(COSInteger.ZERO);
+ array.add(COSInteger.ZERO);
+ fontMatrix = new PDMatrix(array);
+ }
+ }
+ return fontMatrix;
+ }
+
/**
* Returns the embedded CFF CIDFont.
*/
@@ -161,7 +208,9 @@ public class PDCIDFontType0 extends PDCI
protected float getWidthFromFont(int code) throws IOException
{
int cid = codeToCID(code);
- return getType2CharString(cid).getWidth();
+ int width = getType2CharString(cid).getWidth();
+ float scaleX = (cidFont != null ? cidFont : t1Font).getFontMatrix().get(0).floatValue();
+ return width * scaleX * 1000;
}
@Override
Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java?rev=1620402&r1=1620401&r2=1620402&view=diff
==============================================================================
--- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java (original)
+++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java Mon Aug 25 18:29:36 2014
@@ -25,13 +25,17 @@ import org.apache.fontbox.ttf.CMAPEncodi
import org.apache.fontbox.ttf.CMAPTable;
import org.apache.fontbox.ttf.TTFParser;
import org.apache.fontbox.ttf.TrueTypeFont;
+import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSFloat;
+import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.encoding.Encoding;
import org.apache.pdfbox.encoding.StandardEncoding;
import org.apache.pdfbox.io.IOUtils;
+import org.apache.pdfbox.pdmodel.common.PDMatrix;
import org.apache.pdfbox.pdmodel.common.PDStream;
/**
@@ -46,6 +50,7 @@ public class PDCIDFontType2 extends PDCI
private final TrueTypeFont ttf;
private final int[] cid2gid;
private final boolean isEmbedded;
+ private PDMatrix fontMatrix;
/**
* Constructor.
@@ -86,6 +91,24 @@ public class PDCIDFontType2 extends PDCI
cid2gid = readCIDToGIDMap();
}
+ @Override
+ public PDMatrix getFontMatrix()
+ {
+ if (fontMatrix == null)
+ {
+ // 1000 upem, this is not strictly true
+ COSArray array = new COSArray();
+ array.add(new COSFloat(0.001f));
+ array.add(COSInteger.ZERO);
+ array.add(COSInteger.ZERO);
+ array.add(new COSFloat(0.001f));
+ array.add(COSInteger.ZERO);
+ array.add(COSInteger.ZERO);
+ fontMatrix = new PDMatrix(array);
+ }
+ return fontMatrix;
+ }
+
private int[] readCIDToGIDMap()
{
int[] cid2gid = null;
Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1620402&r1=1620401&r2=1620402&view=diff
==============================================================================
--- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java (original)
+++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java Mon Aug 25 18:29:36 2014
@@ -24,6 +24,7 @@ import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.common.PDMatrix;
/**
* A Composite (Type 0) font.
@@ -149,6 +150,12 @@ public class PDType0Font extends PDFont
}
@Override
+ public PDMatrix getFontMatrix()
+ {
+ return descendantFont.getFontMatrix();
+ }
+
+ @Override
public float getHeight(int code) throws IOException
{
return descendantFont.getHeight(code);