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/09/19 23:32:08 UTC
svn commit: r1626342 - in /pdfbox/trunk:
fontbox/src/main/java/org/apache/fontbox/cff/
fontbox/src/main/java/org/apache/fontbox/ttf/
fontbox/src/main/java/org/apache/fontbox/type1/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/
Author: jahewson
Date: Fri Sep 19 21:32:08 2014
New Revision: 1626342
URL: http://svn.apache.org/r1626342
Log:
PDFBOX-2366: Consistent access to Type1Equivalent names and access via PDType1Equivalent
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/Type1Equivalent.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java?rev=1626342&r1=1626341&r2=1626342&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFType1Font.java Fri Sep 19 21:32:08 2014
@@ -56,7 +56,7 @@ public class CFFType1Font extends CFFFon
}
@Override
- public String getFullName()
+ public String getName()
{
return fontName;
}
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java?rev=1626342&r1=1626341&r2=1626342&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java Fri Sep 19 21:32:08 2014
@@ -368,7 +368,7 @@ public class TrueTypeFont implements Typ
}
@Override
- public String getFullName() throws IOException
+ public String getName() throws IOException
{
if (getNaming() != null)
{
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/Type1Equivalent.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/Type1Equivalent.java?rev=1626342&r1=1626341&r2=1626342&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/Type1Equivalent.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/Type1Equivalent.java Fri Sep 19 21:32:08 2014
@@ -33,7 +33,7 @@ public interface Type1Equivalent
/**
* The PostScript name of the font.
*/
- public String getFullName() throws IOException;
+ public String getName() throws IOException;
/**
* Returns the Type 1 CharString for the character with the given name.
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java?rev=1626342&r1=1626341&r2=1626342&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/type1/Type1Font.java Fri Sep 19 21:32:08 2014
@@ -142,6 +142,12 @@ public final class Type1Font implements
}
@Override
+ public String getName()
+ {
+ return fontName;
+ }
+
+ @Override
public GeneralPath getPath(String name) throws IOException
{
return getType1CharString(name).getPath();
@@ -293,10 +299,9 @@ public final class Type1Font implements
/**
* Returns the full name.
- *
+ *
* @return the full name
*/
- @Override
public String getFullName()
{
return fullName;
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=1626342&r1=1626341&r2=1626342&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 Fri Sep 19 21:32:08 2014
@@ -110,12 +110,8 @@ public class PDType1CFont extends PDSimp
fontMatrixTransform.scale(1000, 1000);
}
- /**
- * Returns the embedded or system font for rendering. This font is a Type 1-equivalent, but
- * may not be a Type 1 font, it could be a CFF font or TTF font. If there is no suitable font
- * then the fallback font will be returned: this method never returns null.
- */
- public Type1Equivalent getFontForRendering()
+ @Override
+ public Type1Equivalent getType1Equivalent()
{
return type1Equivalent;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java?rev=1626342&r1=1626341&r2=1626342&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Equivalent.java Fri Sep 19 21:32:08 2014
@@ -18,6 +18,7 @@ package org.apache.pdfbox.pdmodel.font;
import java.awt.geom.GeneralPath;
import java.io.IOException;
+import org.apache.fontbox.ttf.Type1Equivalent;
/**
* A Type 1-equivalent font in a PDF, i.e. a font which can access glyphs by their PostScript name.
@@ -46,4 +47,11 @@ public interface PDType1Equivalent
* @throws java.io.IOException if the font could not be read
*/
public GeneralPath getPath(String name) throws IOException;
+
+ /**
+ * Returns the embedded or system font for rendering. This font is a Type 1-equivalent, but
+ * may not be a Type 1 font, it could be a CFF font or TTF font. If there is no suitable font
+ * then the fallback font will be returned: this method never returns null.
+ */
+ public Type1Equivalent getType1Equivalent();
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1626342&r1=1626341&r2=1626342&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Fri Sep 19 21:32:08 2014
@@ -381,12 +381,8 @@ public class PDType1Font extends PDSimpl
return type1font;
}
- /**
- * Returns the embedded or system font for rendering. This font is a Type 1-equivalent, but
- * may not be a Type 1 font, it could be a CFF font or TTF font. If there is no suitable font
- * then the fallback font will be returned: this method never returns null.
- */
- public Type1Equivalent getFontForRendering()
+ @Override
+ public Type1Equivalent getType1Equivalent()
{
return type1Equivalent;
}