diff options
author | William Victor Mote <vmote@apache.org> | 2003-08-14 15:31:10 +0000 |
---|---|---|
committer | William Victor Mote <vmote@apache.org> | 2003-08-14 15:31:10 +0000 |
commit | a9a3ea149314c75ee52f5f2f0f58c8146592736a (patch) | |
tree | c944187b2e2e87956d8db7640997727fc4543559 /src/java/org/apache/fop/tools | |
parent | dbb70a6873319ab9948777513b8149e7a1262364 (diff) | |
download | xmlgraphics-fop-a9a3ea149314c75ee52f5f2f0f58c8146592736a.tar.gz xmlgraphics-fop-a9a3ea149314c75ee52f5f2f0f58c8146592736a.zip |
move layout.FontState to fonts.Font
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196800 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/tools')
-rw-r--r-- | src/java/org/apache/fop/tools/AreaTreeBuilder.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/tools/AreaTreeBuilder.java b/src/java/org/apache/fop/tools/AreaTreeBuilder.java index 5f06e5bf0..16b720db2 100644 --- a/src/java/org/apache/fop/tools/AreaTreeBuilder.java +++ b/src/java/org/apache/fop/tools/AreaTreeBuilder.java @@ -101,7 +101,7 @@ import org.apache.fop.area.inline.Space; import org.apache.fop.area.inline.Viewport; import org.apache.fop.area.inline.Word; import org.apache.fop.control.Document; -import org.apache.fop.layout.FontState; +import org.apache.fop.fonts.Font; import org.apache.fop.render.Renderer; import org.apache.fop.render.pdf.PDFRenderer; import org.apache.fop.render.svg.SVGRenderer; @@ -249,7 +249,7 @@ class TreeLoader extends AbstractLogEnabled { private AreaTree areaTree; private AreaTreeModel model; private Document fontInfo; - private FontState currentFontState; + private Font currentFontState; TreeLoader(Document fi) { fontInfo = fi; @@ -562,7 +562,7 @@ class TreeLoader extends AbstractLogEnabled { String fname = fontInfo.fontLookup("sans-serif", "normal", Document.NORMAL); FontMetrics metrics = fontInfo.getMetricsFor(fname); currentFontState = - new FontState(fname, metrics, 12000); + new Font(fname, metrics, 12000); ch.setWidth(currentFontState.getWidth(ch.getChar())); ch.setOffset(currentFontState.getCapHeight()); @@ -587,7 +587,7 @@ class TreeLoader extends AbstractLogEnabled { String fname = fontInfo.fontLookup("sans-serif", "normal", Document.NORMAL); FontMetrics metrics = fontInfo.getMetricsFor(fname); currentFontState = - new FontState(fname, metrics, 12000); + new Font(fname, metrics, 12000); Word word = getWord((Element) obj); word.addTrait(Trait.FONT_NAME, fname); |