From dbb70a6873319ab9948777513b8149e7a1262364 Mon Sep 17 00:00:00 2001 From: William Victor Mote Date: Thu, 14 Aug 2003 14:59:56 +0000 Subject: [PATCH] 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 --- src/java/org/apache/fop/fonts/CustomFont.java | 2 +- src/java/org/apache/fop/fonts/FontReader.java | 2 +- src/java/org/apache/fop/fonts/LazyFont.java | 6 +++--- src/java/org/apache/fop/fonts/{Font.java => Typeface.java} | 4 ++-- src/java/org/apache/fop/layout/FontState.java | 4 ++-- src/java/org/apache/fop/pdf/PDFFactory.java | 6 +++--- src/java/org/apache/fop/render/pdf/FontSetup.java | 4 ++-- src/java/org/apache/fop/render/pdf/PDFRenderer.java | 4 ++-- src/java/org/apache/fop/render/ps/PSProcSets.java | 6 +++--- src/java/org/apache/fop/render/ps/PSRenderer.java | 6 +++--- src/java/org/apache/fop/svg/PDFGraphics2D.java | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) rename src/java/org/apache/fop/fonts/{Font.java => Typeface.java} (96%) diff --git a/src/java/org/apache/fop/fonts/CustomFont.java b/src/java/org/apache/fop/fonts/CustomFont.java index 80863b373..959bcfd91 100644 --- a/src/java/org/apache/fop/fonts/CustomFont.java +++ b/src/java/org/apache/fop/fonts/CustomFont.java @@ -56,7 +56,7 @@ import java.util.Map; /** * Abstract base class for custom fonts loaded from files, for example. */ -public abstract class CustomFont extends Font +public abstract class CustomFont extends Typeface implements FontDescriptor, MutableFont { private String fontName = null; diff --git a/src/java/org/apache/fop/fonts/FontReader.java b/src/java/org/apache/fop/fonts/FontReader.java index 6af3e9523..f6df61418 100644 --- a/src/java/org/apache/fop/fonts/FontReader.java +++ b/src/java/org/apache/fop/fonts/FontReader.java @@ -148,7 +148,7 @@ public class FontReader extends DefaultHandler { * Get the generated font object * @return the font */ - public Font getFont() { + public Typeface getFont() { return returnFont; } diff --git a/src/java/org/apache/fop/fonts/LazyFont.java b/src/java/org/apache/fop/fonts/LazyFont.java index b18af07dc..f37aa75ec 100644 --- a/src/java/org/apache/fop/fonts/LazyFont.java +++ b/src/java/org/apache/fop/fonts/LazyFont.java @@ -59,14 +59,14 @@ import java.util.Map; /** * This class is used to defer the loading of a font until it is really used. */ -public class LazyFont extends Font implements FontDescriptor { +public class LazyFont extends Typeface implements FontDescriptor { private String metricsFileName = null; private String fontEmbedPath = null; private boolean useKerning = false; private boolean isMetricsLoaded = false; - private Font realFont = null; + private Typeface realFont = null; private FontDescriptor realFontDescriptor = null; /** @@ -109,7 +109,7 @@ public class LazyFont extends Font implements FontDescriptor { * Gets the real font. * @return the real font */ - public Font getRealFont() { + public Typeface getRealFont() { load(); return realFont; } diff --git a/src/java/org/apache/fop/fonts/Font.java b/src/java/org/apache/fop/fonts/Typeface.java similarity index 96% rename from src/java/org/apache/fop/fonts/Font.java rename to src/java/org/apache/fop/fonts/Typeface.java index 3d0b2ed0f..1e4f2af3f 100644 --- a/src/java/org/apache/fop/fonts/Font.java +++ b/src/java/org/apache/fop/fonts/Typeface.java @@ -1,5 +1,5 @@ /* - * $Id: Font.java,v 1.2 2003/03/06 17:43:05 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -56,7 +56,7 @@ package org.apache.fop.fonts; /** * Base class for PDF font classes */ -public abstract class Font implements FontMetrics { +public abstract class Typeface implements FontMetrics { /** * Get the encoding of the font. diff --git a/src/java/org/apache/fop/layout/FontState.java b/src/java/org/apache/fop/layout/FontState.java index 316675ca8..2414a2a25 100644 --- a/src/java/org/apache/fop/layout/FontState.java +++ b/src/java/org/apache/fop/layout/FontState.java @@ -165,8 +165,8 @@ public class FontState { */ public char mapChar(char c) { - if (metric instanceof org.apache.fop.fonts.Font) { - return ((org.apache.fop.fonts.Font)metric).mapChar(c); + if (metric instanceof org.apache.fop.fonts.Typeface) { + return ((org.apache.fop.fonts.Typeface)metric).mapChar(c); } // Use default CodePointMapping diff --git a/src/java/org/apache/fop/pdf/PDFFactory.java b/src/java/org/apache/fop/pdf/PDFFactory.java index cab819d76..45791a549 100644 --- a/src/java/org/apache/fop/pdf/PDFFactory.java +++ b/src/java/org/apache/fop/pdf/PDFFactory.java @@ -64,7 +64,7 @@ import org.apache.commons.io.IOUtil; // FOP import org.apache.fop.fonts.CIDFont; import org.apache.fop.fonts.CustomFont; -import org.apache.fop.fonts.Font; +import org.apache.fop.fonts.Typeface; import org.apache.fop.fonts.FontDescriptor; import org.apache.fop.fonts.FontMetrics; import org.apache.fop.fonts.FontType; @@ -1102,11 +1102,11 @@ public class PDFFactory { + desc.getFontType()); } - Font tempFont; + Typeface tempFont; if (desc instanceof LazyFont) { tempFont = ((LazyFont)desc).getRealFont(); } else { - tempFont = (Font)desc; + tempFont = (Typeface)desc; } if (!(tempFont instanceof CustomFont)) { throw new IllegalArgumentException( 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 ? "