diff options
| author | William Victor Mote <vmote@apache.org> | 2003-08-14 14:59:56 +0000 |
|---|---|---|
| committer | William Victor Mote <vmote@apache.org> | 2003-08-14 14:59:56 +0000 |
| commit | dbb70a6873319ab9948777513b8149e7a1262364 (patch) | |
| tree | cc3340d21d7d14207af27ff36569188e1a033bac /src/java/org/apache/fop/render/pdf | |
| parent | 1041ea8c48bebd72fe8544906fbff40f43ca70e0 (diff) | |
| download | xmlgraphics-fop-dbb70a6873319ab9948777513b8149e7a1262364.tar.gz xmlgraphics-fop-dbb70a6873319ab9948777513b8149e7a1262364.zip | |
move fonts.Font to fonts.Typeface (in preparation for moving layout.FontState to fonts.Font)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196799 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/render/pdf')
| -rw-r--r-- | src/java/org/apache/fop/render/pdf/FontSetup.java | 4 | ||||
| -rw-r--r-- | src/java/org/apache/fop/render/pdf/PDFRenderer.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/render/pdf/FontSetup.java b/src/java/org/apache/fop/render/pdf/FontSetup.java index 7687328d9..3d30f6c8c 100644 --- a/src/java/org/apache/fop/render/pdf/FontSetup.java +++ b/src/java/org/apache/fop/render/pdf/FontSetup.java @@ -53,7 +53,7 @@ package org.apache.fop.render.pdf; // FOP import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.fop.fonts.Font; +import org.apache.fop.fonts.Typeface; import org.apache.fop.fonts.FontDescriptor; import org.apache.fop.fonts.FontUtil; import org.apache.fop.fonts.LazyFont; @@ -253,7 +253,7 @@ public class FontSetup { Iterator e = fonts.keySet().iterator(); while (e.hasNext()) { String f = (String)e.next(); - Font font = (Font)fonts.get(f); + Typeface font = (Typeface)fonts.get(f); FontDescriptor desc = null; if (font instanceof FontDescriptor) { desc = (FontDescriptor)font; diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java index 2850be8c6..8b469f6e2 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java +++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java @@ -77,7 +77,7 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.apps.Version; import org.apache.fop.fo.properties.RuleStyle; import org.apache.fop.fo.properties.BackgroundRepeat; -import org.apache.fop.fonts.Font; +import org.apache.fop.fonts.Typeface; import org.apache.fop.fonts.FontMetrics; import org.apache.fop.pdf.PDFEncryptionManager; import org.apache.fop.pdf.PDFFilterList; @@ -867,7 +867,7 @@ public class PDFRenderer extends PrintRenderer { int size = ((Integer) word.getTrait(Trait.FONT_SIZE)).intValue(); // This assumes that *all* CIDFonts use a /ToUnicode mapping - Font f = (Font) fontInfo.getFonts().get(name); + Typeface f = (Typeface) fontInfo.getFonts().get(name); boolean useMultiByte = f.isMultiByte(); // String startText = useMultiByte ? "<FEFF" : "("; |