/*-- $Id$ --

 ============================================================================
									 The Apache Software License, Version 1.1
 ============================================================================

		Copyright (C) 1999 The Apache Software Foundation. All rights reserved.

 Redistribution and use in source and binary forms, with or without modifica-
 tion, are permitted provided that the following conditions are met:

 1. Redistributions of  source code must  retain the above copyright  notice,
		this list of conditions and the following disclaimer.

 2. Redistributions in binary form must reproduce the above copyright notice,
		this list of conditions and the following disclaimer in the documentation
		and/or other materials provided with the distribution.

 3. The end-user documentation included with the redistribution, if any, must
		include  the following  acknowledgment:  "This product includes  software
		developed  by the  Apache Software Foundation  (http://www.apache.org/)."
		Alternately, this  acknowledgment may  appear in the software itself,  if
		and wherever such third-party acknowledgments normally appear.

 4. The names "Fop" and  "Apache Software Foundation"  must not be used to
		endorse  or promote  products derived  from this  software without  prior
		written permission. For written permission, please contact
		apache@apache.org.

 5. Products  derived from this software may not  be called "Apache", nor may
		"Apache" appear  in their name,  without prior written permission  of the
		Apache Software Foundation.

 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
 FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
 APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
 INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
 DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
 OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
 ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
 (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 This software  consists of voluntary contributions made  by many individuals
 on  behalf of the Apache Software  Foundation and was  originally created by
 James Tauber <jtauber@jtauber.com>. For more  information on the Apache
 Software Foundation, please see <http://www.apache.org/>.

 */
package org.apache.fop.layout;

import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.FontVariant;

public class FontState {

		protected FontInfo fontInfo;
		private String fontName;
		private int fontSize;
		private String fontFamily;
		private String fontStyle;
		private String fontWeight;
		private FontMetric metric;
		private int fontVariant;

		public FontState(FontInfo fontInfo, String fontFamily, String fontStyle, String fontWeight, int fontSize) throws FOPException {
			this(fontInfo, fontFamily, fontStyle, fontWeight, fontSize, FontVariant.NORMAL);
		}
		public FontState(FontInfo fontInfo, String fontFamily, String fontStyle, String fontWeight, int fontSize, int fontVariant) throws FOPException {
	this.fontInfo = fontInfo;
	this.fontFamily = fontFamily;
	this.fontStyle = fontStyle;
	this.fontWeight = fontWeight;
	this.fontSize = fontSize;
	this.fontName = fontInfo.fontLookup(fontFamily,fontStyle,fontWeight);
	this.metric = fontInfo.getMetricsFor(fontName);
	this.fontVariant = fontVariant;
		}

		public int getAscender() {
	return  metric.getAscender(fontSize) / 1000;
		}

		public int getCapHeight() {
	return metric.getCapHeight(fontSize) / 1000;
		}

		public int getDescender() {
	return metric.getDescender(fontSize) / 1000;
		}

		public String getFontName() {
	return this.fontName;
		}

		public int getFontSize() {
	return this.fontSize;
		}

		public String getFontWeight() {
	return this.fontWeight;
		}

		public String getFontFamily() {
	return this.fontFamily;
		}

		public String getFontStyle() {
	return this.fontStyle;
		}

		public int getFontVariant() {
	return this.fontVariant;
		}

		public FontInfo getFontInfo() {
	return this.fontInfo;
		}

		public int getXHeight() {
	return metric.getXHeight(fontSize) / 1000;
		}

		public int width(int charnum) {
	// returns width of given character number in millipoints
	return (metric.width(charnum, fontSize) / 1000);
		}
}

@@ -3017,226 +3017,8 @@
 t;%0A%0A
-%09%09public FontState(FontInfo fontInfo, String fontFamily, String fontStyle, String fontWeight, int fontSize) throws FOPException %7B%0A%09%09%09this(fontInfo, fontFamily, fontStyle, fontWeight, fontSize, FontVariant.NORMAL);%0A%09%09%7D%0A
 %09%09pu

Add font-variant property, change constructor. PR: Obtained from: Submitted by: Reviewed by: