Author: vhennebert
Date: Fri Jul 2 17:23:36 2010
New Revision: 960065
URL: http://svn.apache.org/viewvc?rev=960065&view=rev
Log:
Trying to get a glyph name out of a Unicode code point is already done by the
call to mapChar, so doing it again in TTFFontLoader is useless. Instead, make
use of the post table if it exists, that may contain a list of glyph names and
allow more glyphs to be supported.
That allows to reference instead of embed a TrueType font that is already
installed on the printer.
Modified:
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFile.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
Modified:
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFile.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFile.java?rev=960065&r1=960064&r2=960065&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFile.java
(original)
+++
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFile.java
Fri Jul 2 17:23:36 2010
@@ -1691,6 +1691,10 @@ public class TTFFile {
return result;
}
+ String getGlyphName(int glyphIndex) {
+ return mtxTab[glyphIndex].getName();
+ }
+
/**
* Static main method to get info about a TrueType font.
* @param args The command line arguments
Modified:
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java?rev=960065&r1=960064&r2=960065&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
(original)
+++
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
Fri Jul 2 17:23:36 2010
@@ -27,8 +27,6 @@ import java.util.Map;
import org.apache.commons.io.IOUtils;
-import org.apache.xmlgraphics.fonts.Glyphs;
-
import org.apache.fop.fonts.BFEntry;
import org.apache.fop.fonts.CIDFontType;
import org.apache.fop.fonts.EncodingMode;
@@ -187,11 +185,11 @@ public class TTFFontLoader extends FontL
for (char u = (char)ce.getUnicodeStart(); u <=
ce.getUnicodeEnd(); u++) {
int codePoint = singleFont.getEncoding().mapChar(u);
if (codePoint <= 0) {
- String unicode = Character.toString(u);
- String charName = Glyphs.stringToGlyph(unicode);
- if (charName.length() > 0) {
- NamedCharacter nc = new NamedCharacter(charName,
unicode);
- int glyphIndex = ce.getGlyphStartIndex() + u -
ce.getUnicodeStart();
+ int glyphIndex = ce.getGlyphStartIndex() + u -
ce.getUnicodeStart();
+ String glyphName = ttf.getGlyphName(glyphIndex);
+ if (glyphName != "") {
+ String unicode = Character.toString(u);
+ NamedCharacter nc = new NamedCharacter(glyphName,
unicode);
singleFont.addUnencodedCharacter(nc,
wx[glyphIndex]);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
