Author: jeremias
Date: Sun Dec 7 04:28:27 2008
New Revision: 724126
URL: http://svn.apache.org/viewvc?rev=724126&view=rev
Log:
FopCharacterSet doesn't follow the same contract as its superclass. The metrics
must not be multiplied by the font size in the FopCharacterSet class. Only
RasterFont or OutlineFont should do that.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java?rev=724126&r1=724125&r2=724126&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
Sun Dec 7 04:28:27 2008
@@ -52,7 +52,7 @@
int size = RASTER_SIZES[i];
FopCharacterSet characterSet = new FopCharacterSet(
CharacterSet.DEFAULT_CODEPAGE,
CharacterSet.DEFAULT_ENCODING,
- charsetName + CHARSET_REF[i], size, base14);
+ charsetName + CHARSET_REF[i], base14);
font.addCharacterSet(size, characterSet);
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java?rev=724126&r1=724125&r2=724126&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
Sun Dec 7 04:28:27 2008
@@ -28,7 +28,6 @@
/** The character set for this font */
private Typeface charSet = null;
- private int size = 0;
/**
* Constructor for the CharacterSetMetric object, the character set is used
@@ -36,19 +35,16 @@
* @param codePage the code page identifier
* @param encoding the encoding of the font
* @param name the character set name
- * @param size the font size
* @param charSet the fop character set
*/
public FopCharacterSet(
String codePage,
String encoding,
String name,
- int size,
Typeface charSet) {
super(codePage, encoding, name, null);
this.charSet = charSet;
- this.size = size * 1000;
}
/**
@@ -64,7 +60,7 @@
* @return the ascender value in millipoints
*/
public int getAscender() {
- return charSet.getAscender(size);
+ return charSet.getAscender(1);
}
/**
@@ -74,7 +70,7 @@
* @return the cap height value in millipoints
*/
public int getCapHeight() {
- return charSet.getCapHeight(size);
+ return charSet.getCapHeight(1);
}
/**
@@ -84,7 +80,7 @@
* @return the descender value in millipoints
*/
public int getDescender() {
- return charSet.getDescender(size);
+ return charSet.getDescender(1);
}
/**
@@ -116,7 +112,7 @@
* @return the typical height of characters
*/
public int getXHeight() {
- return charSet.getXHeight(size);
+ return charSet.getXHeight(1);
}
/**
@@ -126,7 +122,7 @@
* @return the width of the character
*/
public int getWidth(int character) {
- return charSet.getWidth(character, size);
+ return charSet.getWidth(character, 1);
}
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java?rev=724126&r1=724125&r2=724126&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
Sun Dec 7 04:28:27 2008
@@ -24,6 +24,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+
import org.apache.fop.afp.fonts.AFPFontInfo;
import org.apache.fop.afp.fonts.CharacterSet;
import org.apache.fop.afp.fonts.FopCharacterSet;
@@ -124,7 +125,7 @@
try {
Typeface tf = (Typeface)clazz.newInstance();
font.addCharacterSet(size, new FopCharacterSet(
- codepage, encoding, characterset, size, tf));
+ codepage, encoding, characterset, tf));
} catch (Exception ie) {
String msg = "The base 14 font class " +
clazz.getName()
+ " could not be instantiated";
@@ -158,7 +159,7 @@
try {
Typeface tf = (Typeface)clazz.newInstance();
characterSet = new FopCharacterSet(
- codepage, encoding, characterset, 1, tf);
+ codepage, encoding, characterset, tf);
} catch (Exception ie) {
String msg = "The base 14 font class " +
clazz.getName()
+ " could not be instantiated";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
