You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2014/06/07 18:03:18 UTC
svn commit: r1601144 -
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java
Author: lehmi
Date: Sat Jun 7 16:03:18 2014
New Revision: 1601144
URL: http://svn.apache.org/r1601144
Log:
PDFBOX-2110: take the font family into account when creating the font mapping as proposed by Juraj Lonc
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java?rev=1601144&r1=1601143&r2=1601144&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java Sat Jun 7 16:03:18 2014
@@ -113,9 +113,23 @@ public class FontManager
if (namingTable != null && namingTable.getPSName() != null)
{
String normalizedName = normalizeFontname(namingTable.getPSName());
- ttfFontfiles.put(normalizedName, ttfFilename);
+ if (!ttfFontfiles.containsKey(normalizedName))
+ {
+ LOG.debug("Added font mapping "+normalizedName + " -=> "+ttfFilename);
+ ttfFontfiles.put(normalizedName, ttfFilename);
+ }
}
- }
+ // take the font family name into account
+ if (namingTable != null && namingTable.getFontFamily() != null)
+ {
+ String normalizedName = normalizeFontFamily(namingTable.getFontFamily(), namingTable.getPSName());
+ if (!ttfFontfiles.containsKey(normalizedName))
+ {
+ LOG.debug("Added font mapping "+normalizedName + " -=> "+ttfFilename);
+ ttfFontfiles.put(normalizedName, ttfFilename);
+ }
+ }
+ }
}
/**
@@ -140,9 +154,8 @@ public class FontManager
// normalize all kinds of fonttypes. There are several possible version which have to be normalized
// e.g. Arial,Bold Arial-BoldMT Helevtica-oblique ...
boolean isBold = normalizedFontname.indexOf("bold") > -1;
- boolean isItalic = normalizedFontname.indexOf("italic") > -1
- || normalizedFontname.indexOf("oblique") > -1;
- normalizedFontname = normalizedFontname.toLowerCase().replaceAll("bold", "")
+ boolean isItalic = normalizedFontname.indexOf("italic") > -1 || normalizedFontname.indexOf("oblique") > -1;
+ normalizedFontname = normalizedFontname.replaceAll("bold", "")
.replaceAll("italic", "").replaceAll("oblique", "");
if (isBold)
{
@@ -155,6 +168,28 @@ public class FontManager
return normalizedFontname;
}
+ private static String normalizeFontFamily(String fontFamily, String psFontName)
+ {
+ String normalizedFontFamily=fontFamily.toLowerCase().replaceAll(" ", "").replaceAll(",", "").replaceAll("-", "");
+ if (psFontName!=null)
+ {
+ psFontName=psFontName.toLowerCase();
+
+ boolean isBold = psFontName.indexOf("bold") > -1;
+ boolean isItalic = psFontName.indexOf("italic") > -1 || psFontName.indexOf("oblique") > -1;
+
+ if (isBold)
+ {
+ normalizedFontFamily += "bold";
+ }
+ if (isItalic)
+ {
+ normalizedFontFamily += "italic";
+ }
+ }
+ return normalizedFontFamily;
+ }
+
/**
* Add a font-mapping.
*
@@ -268,7 +303,11 @@ public class FontManager
fontfile = ttfFontfiles.get(mappedFontname);
}
}
- if (fontfile == null)
+ if (fontfile != null)
+ {
+ LOG.debug("Using ttf mapping "+fontname + " -=> "+fontfile);
+ }
+ else
{
LOG.warn("Font not found: " + fontname);
}