[FOray-commit] SF.net SVN: foray: [8594] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8594] trunk/foray
|
From: <vic...@us...> - 2007-02-02 23:41:36
|
Revision: 8594
http://svn.sourceforge.net/foray/?rev=8594&view=rev
Author: victormote
Date: 2007-02-02 15:41:34 -0800 (Fri, 02 Feb 2007)
Log Message:
-----------
Conform to axsl changes for converting an enumeration to a typesafe enum.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java
trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java
trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java
trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -253,7 +253,7 @@
return font.width(c, traitFontSize()) + traitLetterSpacingOpt();
}
- public short traitFontVariant() {
+ public Font.Variant traitFontVariant() {
return traitGeneratedBy().traitFontVariant(this);
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -281,8 +281,9 @@
*/
public org.axsl.fontR.FontUse selectFontXSL(final int selectionStrategy,
final String [] familyList, final Font.Style style,
- final Font.Weight weight, final int variant, final int stretch,
- final int size, final int codePoint) throws FontException {
+ final Font.Weight weight, final Font.Variant variant,
+ final int stretch, final int size, final int codePoint)
+ throws FontException {
final FontSelector selector = getFontSelector(selectionStrategy);
final RegisteredFontDesc fontDescSelected = selector.selectFont(
familyList, style, weight, variant, stretch, size, codePoint);
@@ -467,9 +468,9 @@
* {@inheritDoc}
*/
public org.axsl.fontR.FontUse selectFontCSS(final String [] familyList,
- final Font.Style style, final Font.Weight weight, final int variant,
- final int stretch, final int size, final int codePoint)
- throws FontException {
+ final Font.Style style, final Font.Weight weight,
+ final Font.Variant variant, final int stretch, final int size,
+ final int codePoint) throws FontException {
return selectFontXSL(Font.SelectionStrategy.CHARACTER_BY_CHARACTER,
familyList, style, weight,
variant, stretch, size, codePoint);
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -657,7 +657,8 @@
if (awtFont.isBold()) {
fontWeight = org.axsl.fontR.Font.Weight.BOLD;
}
- final byte fontVariant = org.axsl.fontR.Font.Variant.NORMAL;
+ final org.axsl.fontR.Font.Variant fontVariant
+ = org.axsl.fontR.Font.Variant.NORMAL;
final byte fontStretch = org.axsl.fontR.Font.Stretch.NORMAL;
new RegisteredFontDesc(rf, rff, null, fontStyle, fontWeight,
fontVariant, fontStretch);
@@ -1147,7 +1148,8 @@
public void registerFontDescription(final String fontFamily,
final String fontID, final Encoding encoding,
final org.axsl.fontR.Font.Style style,
- final org.axsl.fontR.Font.Weight weight, final byte variant,
+ final org.axsl.fontR.Font.Weight weight,
+ final org.axsl.fontR.Font.Variant variant,
final byte stretch,
final float simulatedSmallCaps, final float simulatedOblique,
final float simulatedBackslant, final float[] simulatedStretch)
Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -65,8 +65,8 @@
* @throws FontException For invalid input.
*/
public abstract RegisteredFontDesc selectFont(String [] familyList,
- Font.Style style, Font.Weight weight, int variant, int stretch,
- int size, int codePoint) throws FontException;
+ Font.Style style, Font.Weight weight, Font.Variant variant,
+ int stretch, int size, int codePoint) throws FontException;
/**
* Returns the parent font consumer instance.
Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -57,8 +57,9 @@
* {@inheritDoc}
*/
public RegisteredFontDesc selectFont(final String [] familyList,
- final Font.Style style, final Font.Weight weight, final int variant,
- final int stretch, final int size, final int codePoint)
+ final Font.Style style, final Font.Weight weight,
+ final Font.Variant variant, final int stretch, final int size,
+ final int codePoint)
throws FontException {
FOrayFont fontSelected = null;
RegisteredFontDesc fontDescSelected = null;
@@ -99,8 +100,8 @@
* or null if there is none.
*/
private RegisteredFontDesc selectFont(final String familyToTry,
- final Font.Style style, final Font.Weight weight, final int variant,
- final int stretch, final int size) {
+ final Font.Style style, final Font.Weight weight,
+ final Font.Variant variant, final int stretch, final int size) {
if (familyToTry == null) {
return null;
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -98,7 +98,7 @@
private Font.Weight fontWeight;
/** The variant value of this description. */
- private byte fontVariant;
+ private Font.Variant fontVariant;
/** The stretch value of this description. */
private byte fontStretch;
@@ -158,7 +158,7 @@
public RegisteredFontDesc(final RegisteredFont rf,
final RegisteredFontFamily rff, final Encoding encoding,
final Font.Style fontStyle, final Font.Weight fontWeight,
- final byte fontVariant, final byte fontStretch) {
+ final Font.Variant fontVariant, final byte fontStretch) {
this.registeredFont = rf;
this.registeredFontFamily = rff;
this.encoding = encoding;
@@ -188,7 +188,7 @@
* Return the font-variant for this registered description.
* @return The font-variant value.
*/
- public byte getFontVariant() {
+ public Font.Variant getFontVariant() {
return this.fontVariant;
}
@@ -578,7 +578,7 @@
* considered in the test.
* @return True iff the style of this font description matches the criteria.
*/
- public boolean variantMatches(final int desiredVariant,
+ public boolean variantMatches(final Font.Variant desiredVariant,
final boolean considerSimulated) {
if (desiredVariant == Font.Variant.ANY) {
return true;
@@ -590,7 +590,7 @@
return true;
}
}
- final int actualVariant = getFontVariant();
+ final Font.Variant actualVariant = getFontVariant();
if (actualVariant == desiredVariant) {
return true;
}
@@ -651,8 +651,9 @@
*/
public boolean matchPerfect(final RegisteredFontFamily family,
final boolean considerSimulated, final Font.Style style,
- final Font.Weight weight, final int variant, final int stretch,
- final boolean freeStandingFonts, final boolean systemFonts) {
+ final Font.Weight weight, final Font.Variant variant,
+ final int stretch, final boolean freeStandingFonts,
+ final boolean systemFonts) {
if (! generalTypeMatches(freeStandingFonts, systemFonts)) {
return false;
}
@@ -684,7 +685,7 @@
*/
public boolean matchIgnoreWeight(final RegisteredFontFamily family,
final boolean considerSimulated, final Font.Style style,
- final int variant, final int stretch,
+ final Font.Variant variant, final int stretch,
final boolean freeStandingFonts, final boolean systemFonts) {
if (! generalTypeMatches(freeStandingFonts, systemFonts)) {
return false;
Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -104,8 +104,8 @@
if (fontWeight == Font.Weight.UNKNOWN) {
fontWeight = Font.Weight.NORMAL;
}
- byte fontVariant = FontUtility.foFontVariant(variant, false);
- if (fontVariant < 0) {
+ Font.Variant fontVariant = FontUtility.foFontVariant(variant, false);
+ if (fontVariant == Font.Variant.UNKNOWN) {
fontVariant = Font.Variant.NORMAL;
}
byte fontStretch = FontUtility.foFontStretch(stretch, false);
@@ -150,7 +150,7 @@
protected void registerFontDesc(final RegisteredFont registeredFont,
final Encoding encoding, final Font.Style style,
final Font.Weight weight,
- final byte variant, final byte stretch,
+ final Font.Variant variant, final byte stretch,
final float simulatedSmallCaps, final float simulatedOblique,
final float simulatedBackslant, final float[] simulatedStretch)
throws FontException {
@@ -192,8 +192,9 @@
* or null if none match.
*/
protected RegisteredFontDesc findRegisteredFontDesc(final Font.Style style,
- final Font.Weight weight, final int variant, final int stretch,
- final boolean freeStandingFonts, final boolean systemFonts) {
+ final Font.Weight weight, final Font.Variant variant,
+ final int stretch, final boolean freeStandingFonts,
+ final boolean systemFonts) {
/* First, look for a perfect match without considering simulated
* features. */
for (int i = 0; i < this.fontDescriptions.size(); i++) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -41,6 +41,7 @@
import org.axsl.foR.fo.Leader;
import org.axsl.foR.fo.Marker;
import org.axsl.foR.fo.RetrieveMarker;
+import org.axsl.fontR.Font;
import org.axsl.fontR.FontUse;
import org.axsl.text.line.LineText;
@@ -656,7 +657,7 @@
public boolean inlineIsFauxSmallCaps(final FOContext context) {
final FObj effectiveParent = effectiveParent(context);
if (effectiveParent.traitFontVariant(context)
- != FoValue.SMALL_CAPS) {
+ != Font.Variant.SMALL_CAPS) {
return false;
}
/*
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -1240,7 +1240,7 @@
/**
* {@inheritDoc}
*/
- public short traitFontVariant(final FOContext context) {
+ public Font.Variant traitFontVariant(final FOContext context) {
return propertyList.getFontVariant(context);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -245,7 +245,7 @@
getFontFamily(context),
getFontStyle(context),
getFontWeight(context),
- convertFontVariant(getFontVariant(context)),
+ getFontVariant(context),
convertFontStretch(getFontStretch(context)),
getFontSize(context),
firstChar);
@@ -266,7 +266,7 @@
getFontFamily(context),
getFontStyle(context),
getFontWeight(context),
- convertFontVariant(getFontVariant(context)),
+ getFontVariant(context),
convertFontStretch(getFontStretch(context)),
getFontSize(context),
codePoint);
@@ -1752,7 +1752,7 @@
return FontSize.getValueNoInstance(context, fobj);
}
- public short getFontVariant(final FOContext context) {
+ public org.axsl.fontR.Font.Variant getFontVariant(final FOContext context) {
FontVariant property = (FontVariant) getProperty(
FoProperty.FONT_VARIANT);
if (property != null) {
@@ -3282,20 +3282,6 @@
return org.axsl.fontR.Font.SelectionStrategy.AUTO;
}
- /**
- * Converts a parsed font-variant constant to a Font font-variant
- * constant.
- * @param parsedFontVariant The font-variant constant parsed by the
- * FOTree.
- * @return The font-variant constant expected by the Font package.
- */
- public static int convertFontVariant(final int parsedFontVariant) {
- if (parsedFontVariant == FoValue.SMALL_CAPS) {
- return org.axsl.fontR.Font.Variant.SMALL_CAPS;
- }
- return org.axsl.fontR.Font.Variant.NORMAL;
- }
-
public static org.axsl.fontR.Font.Style convertFontStyle(
final short parsedFontStyle) {
switch (parsedFontStyle) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -37,6 +37,7 @@
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
+import org.axsl.fontR.Font;
/**
* The "font-variant" property in XSL-FO.
@@ -71,24 +72,31 @@
throw unexpectedValue(value, propertyList);
}
- public short getValue(final FOContext context, final FObj fobj) {
+ public Font.Variant getValue(final FOContext context, final FObj fobj) {
if (value() instanceof PropertyKeyword) {
final short keyword = ((PropertyKeyword) value()).getValue();
- if (keyword == FoValue.INHERIT) {
+ switch (keyword) {
+ case FoValue.INHERIT: {
return getValueNoInstance(context, fobj);
}
- return keyword;
+ case FoValue.NORMAL: {
+ return Font.Variant.NORMAL;
+ }
+ case FoValue.SMALL_CAPS: {
+ return Font.Variant.SMALL_CAPS;
+ }
+ }
}
- return FoValue.NORMAL;
+ return Font.Variant.NORMAL;
}
- public static short getValueNoInstance(final FOContext context,
+ public static Font.Variant getValueNoInstance(final FOContext context,
final FObj fobj) {
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.traitFontVariant(context);
}
- return FoValue.NORMAL;
+ return Font.Variant.NORMAL;
}
protected short[] getValidKeywords() {
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -996,7 +996,8 @@
try {
font = this.fontConsumer.selectFontCSS(fontFamily,
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.Weight.NORMAL, 0, 0, 0, ch);
+ org.axsl.fontR.Font.Weight.NORMAL,
+ org.axsl.fontR.Font.Variant.NORMAL, 0, 0, ch);
} catch (final FontException e) {
/* We can't find a font for this character, so skip it. */
continue;
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2007-02-02 23:13:26 UTC (rev 8593)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2007-02-02 23:41:34 UTC (rev 8594)
@@ -306,7 +306,7 @@
this.fontFamily = fam.getFamilyName();
font = this.fontConsumer.selectFontCSS(
FontUtility.foFontFamily(this.fontFamily),
- style, weight, 0,
+ style, weight, Font.Variant.NORMAL,
org.axsl.fontR.Font.Stretch.NORMAL,
fsize * WKConstants.MILLIPOINTS_PER_POINT,
' ');
@@ -323,7 +323,8 @@
this.fontFamily = "any";
return this.fontConsumer.selectFontXSL(
org.axsl.fontR.Font.SelectionStrategy.AUTO,
- new String[] {"any"}, style, weight, 0,
+ new String[] {"any"}, style, weight,
+ Font.Variant.NORMAL,
org.axsl.fontR.Font.Stretch.NORMAL,
fsize * WKConstants.MILLIPOINTS_PER_POINT,
' ');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
