Author: vhennebert
Date: Tue Oct 8 15:41:25 2013
New Revision: 1530313
URL: http://svn.apache.org/r1530313
Log:
Do not log a warning when .notdef has been assigned to an unused code of
AdobeStandardEncoding
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/CharMetricsHandler.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/CharMetricsHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/CharMetricsHandler.java?rev=1530313&r1=1530312&r2=1530313&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/CharMetricsHandler.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/CharMetricsHandler.java
Tue Oct 8 15:41:25 2013
@@ -28,6 +28,8 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.fonts.Glyphs;
+
import org.apache.fop.fonts.NamedCharacter;
import org.apache.fop.fonts.type1.AFMParser.ValueHandler;
@@ -102,9 +104,10 @@ abstract class CharMetricsHandler {
AFMCharMetrics chm = defaultHandler.parse(line, stack,
afmFileName);
NamedCharacter namedChar = chm.getCharacter();
if (namedChar != null) {
- int codePoint =
AdobeStandardEncoding.getAdobeCodePoint(namedChar.getName());
- if (chm.getCharCode() != codePoint) {
- LOG.info(afmFileName + ": named character '" +
namedChar.getName() + "'"
+ String charName = namedChar.getName();
+ int codePoint =
AdobeStandardEncoding.getAdobeCodePoint(charName);
+ if (chm.getCharCode() != codePoint &&
!Glyphs.NOTDEF.equals(charName)) {
+ LOG.info(afmFileName + ": named character '" + charName +
"'"
+ " has an incorrect code point: " +
chm.getCharCode()
+ ". Changed to " + codePoint);
chm.setCharCode(codePoint);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
