[FOray-commit] SF.net SVN: foray: [8548] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8548] trunk/foray
|
From: <vic...@us...> - 2007-01-30 04:16:00
|
Revision: 8548
http://svn.sourceforge.net/foray/?rev=8548&view=rev
Author: victormote
Date: 2007-01-29 20:16:00 -0800 (Mon, 29 Jan 2007)
Log Message:
-----------
Conform to axsl changes for a new inner enumeration class.
Modified Paths:
--------------
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.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-font/src/java/org/foray/font/format/MetricsFileAFM.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.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
trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2007-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -249,7 +249,7 @@
/* Try to find one with normal characteristics. */
defaultFont = rff.findRegisteredFontDesc(
org.axsl.fontR.Font.Style.NORMAL,
- FOrayFont.FONT_WEIGHT_NORMAL,
+ org.axsl.fontR.Font.Weight.NORMAL,
FOrayFont.FONT_VARIANT_NORMAL,
FOrayFont.FONT_STRETCH_NORMAL,
freeStandingFont,
@@ -260,7 +260,7 @@
/* Try to find one with regardless of characteristics. */
defaultFont = rff.findRegisteredFontDesc(
org.axsl.fontR.Font.Style.ANY,
- FOrayFont.FONT_WEIGHT_ANY,
+ org.axsl.fontR.Font.Weight.ANY,
FOrayFont.FONT_VARIANT_ANY,
FOrayFont.FONT_STRETCH_ANY,
freeStandingFont,
@@ -275,7 +275,7 @@
rff = (RegisteredFontFamily) entry.getValue();
defaultFont = rff.findRegisteredFontDesc(
org.axsl.fontR.Font.Style.ANY,
- FOrayFont.FONT_WEIGHT_ANY,
+ org.axsl.fontR.Font.Weight.ANY,
FOrayFont.FONT_VARIANT_ANY,
FOrayFont.FONT_STRETCH_ANY,
freeStandingFont,
@@ -467,17 +467,17 @@
}
registerBase14Description("Base14-Courier", "Base14-Courier",
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.FONT_WEIGHT_NORMAL);
+ org.axsl.fontR.Font.Weight.NORMAL);
registerBase14Description("Base14-Courier", "Base14-Courier-Oblique",
org.axsl.fontR.Font.Style.OBLIQUE,
- org.axsl.fontR.Font.FONT_WEIGHT_NORMAL);
+ org.axsl.fontR.Font.Weight.NORMAL);
registerBase14Description("Base14-Courier", "Base14-Courier-Bold",
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.FONT_WEIGHT_BOLD);
+ org.axsl.fontR.Font.Weight.BOLD);
registerBase14Description("Base14-Courier",
"Base14-Courier-BoldOblique",
org.axsl.fontR.Font.Style.OBLIQUE,
- org.axsl.fontR.Font.FONT_WEIGHT_BOLD);
+ org.axsl.fontR.Font.Weight.BOLD);
}
/**
@@ -492,18 +492,18 @@
}
registerBase14Description("Base14-Helvetica", "Base14-Helvetica",
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.FONT_WEIGHT_NORMAL);
+ org.axsl.fontR.Font.Weight.NORMAL);
registerBase14Description("Base14-Helvetica",
"Base14-Helvetica-Oblique",
org.axsl.fontR.Font.Style.OBLIQUE,
- org.axsl.fontR.Font.FONT_WEIGHT_NORMAL);
+ org.axsl.fontR.Font.Weight.NORMAL);
registerBase14Description("Base14-Helvetica", "Base14-Helvetica-Bold",
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.FONT_WEIGHT_BOLD);
+ org.axsl.fontR.Font.Weight.BOLD);
registerBase14Description("Base14-Helvetica",
"Base14-Helvetica-BoldOblique",
org.axsl.fontR.Font.Style.OBLIQUE,
- org.axsl.fontR.Font.FONT_WEIGHT_BOLD);
+ org.axsl.fontR.Font.Weight.BOLD);
}
/**
@@ -518,16 +518,16 @@
}
registerBase14Description("Base14-Times", "Base14-Times",
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.FONT_WEIGHT_NORMAL);
+ org.axsl.fontR.Font.Weight.NORMAL);
registerBase14Description("Base14-Times", "Base14-Times-Italic",
org.axsl.fontR.Font.Style.ITALIC,
- org.axsl.fontR.Font.FONT_WEIGHT_NORMAL);
+ org.axsl.fontR.Font.Weight.NORMAL);
registerBase14Description("Base14-Times", "Base14-Times-Bold",
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.FONT_WEIGHT_BOLD);
+ org.axsl.fontR.Font.Weight.BOLD);
registerBase14Description("Base14-Times", "Base14-Times-BoldItalic",
org.axsl.fontR.Font.Style.ITALIC,
- org.axsl.fontR.Font.FONT_WEIGHT_BOLD);
+ org.axsl.fontR.Font.Weight.BOLD);
}
/**
@@ -542,7 +542,7 @@
}
registerBase14Description("Base14-Symbol", "Base14-Symbol",
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.FONT_WEIGHT_NORMAL);
+ org.axsl.fontR.Font.Weight.NORMAL);
}
/**
@@ -557,7 +557,7 @@
}
registerBase14Description("Base14-ZapfDingbats", "Base14-ZapfDingbats",
org.axsl.fontR.Font.Style.NORMAL,
- org.axsl.fontR.Font.FONT_WEIGHT_NORMAL);
+ org.axsl.fontR.Font.Weight.NORMAL);
}
/**
@@ -646,9 +646,9 @@
if (awtFont.isItalic()) {
fontStyle = org.axsl.fontR.Font.Style.ITALIC;
}
- short fontWeight = org.axsl.fontR.Font.FONT_WEIGHT_NORMAL;
+ short fontWeight = org.axsl.fontR.Font.Weight.NORMAL;
if (awtFont.isBold()) {
- fontWeight = org.axsl.fontR.Font.FONT_WEIGHT_BOLD;
+ fontWeight = org.axsl.fontR.Font.Weight.BOLD;
}
final byte fontVariant = org.axsl.fontR.Font.FONT_VARIANT_NORMAL;
final byte fontStretch = org.axsl.fontR.Font.FONT_STRETCH_NORMAL;
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2007-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -30,6 +30,7 @@
import org.foray.common.WKConstants;
+import org.axsl.fontR.Font;
import org.axsl.fontR.FontConsumer;
import org.axsl.fontR.FontException;
import org.axsl.fontR.output.FontOutput;
@@ -145,7 +146,7 @@
if (desc != null) {
return desc.getFontWeight();
}
- return (short) Math.min(FOrayFont.FONT_WEIGHT_900,
+ return (short) Math.min(Font.Weight.RELATIVE_900,
this.registeredFontDesc.getFontWeight()
+ FOrayFontUse.FONT_WEIGHT_INCREMENT);
}
@@ -159,7 +160,7 @@
if (desc != null) {
return desc.getFontWeight();
}
- return (short) Math.max(FOrayFont.FONT_WEIGHT_100,
+ return (short) Math.max(Font.Weight.RELATIVE_100,
this.registeredFontDesc.getFontWeight()
- FOrayFontUse.FONT_WEIGHT_INCREMENT);
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2007-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -621,7 +621,7 @@
* @return True iff the style of this font description matches the criteria.
*/
public boolean weightMatches(final int desiredWeight) {
- if (desiredWeight == FOrayFont.FONT_WEIGHT_ANY) {
+ if (desiredWeight == Font.Weight.ANY) {
return true;
}
final int actualWeight = getFontWeight();
Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2007-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -100,15 +100,15 @@
}
short fontWeight = FontUtility.foFontWeight(weight, false);
if (fontWeight < 0) {
- fontWeight = org.axsl.fontR.Font.FONT_WEIGHT_NORMAL;
+ fontWeight = Font.Weight.NORMAL;
}
byte fontVariant = FontUtility.foFontVariant(variant, false);
if (fontVariant < 0) {
- fontVariant = org.axsl.fontR.Font.FONT_VARIANT_NORMAL;
+ fontVariant = Font.FONT_VARIANT_NORMAL;
}
byte fontStretch = FontUtility.foFontStretch(stretch, false);
if (fontStretch < 0) {
- fontStretch = org.axsl.fontR.Font.FONT_STRETCH_NORMAL;
+ fontStretch = Font.FONT_STRETCH_NORMAL;
}
final float simSmallCaps = convertPercent(simulatedSmallCaps);
final float simOblique = convertPercent(simulatedOblique);
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java 2007-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -1014,13 +1014,13 @@
}
final String weightString = this.currentTokenizer.nextToken();
if (weightString.equals("Light")) {
- this.setWeight(Font.FONT_WEIGHT_300);
+ this.setWeight(Font.Weight.RELATIVE_300);
} else if (weightString.equals("Medium")) {
- this.setWeight(Font.FONT_WEIGHT_NORMAL);
+ this.setWeight(Font.Weight.NORMAL);
} else if (weightString.equals("Regular")) {
- this.setWeight(Font.FONT_WEIGHT_NORMAL);
+ this.setWeight(Font.Weight.NORMAL);
} else if (weightString.equals("Bold")) {
- this.setWeight(Font.FONT_WEIGHT_BOLD);
+ this.setWeight(Font.Weight.BOLD);
} else {
this.setWeight(0);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2007-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -76,15 +76,15 @@
if (pv instanceof DtInteger) {
final int integer = ((DtInteger) pv).getValue();
switch (integer) {
- case Font.FONT_WEIGHT_100:
- case Font.FONT_WEIGHT_200:
- case Font.FONT_WEIGHT_300:
- case Font.FONT_WEIGHT_400:
- case Font.FONT_WEIGHT_500:
- case Font.FONT_WEIGHT_600:
- case Font.FONT_WEIGHT_700:
- case Font.FONT_WEIGHT_800:
- case Font.FONT_WEIGHT_900: {
+ case Font.Weight.RELATIVE_100:
+ case Font.Weight.RELATIVE_200:
+ case Font.Weight.RELATIVE_300:
+ case Font.Weight.RELATIVE_400:
+ case Font.Weight.RELATIVE_500:
+ case Font.Weight.RELATIVE_600:
+ case Font.Weight.RELATIVE_700:
+ case Font.Weight.RELATIVE_800:
+ case Font.Weight.RELATIVE_900: {
return pv;
}
}
@@ -101,10 +101,10 @@
return getValueNoInstance(context, fobj);
}
case FoValue.NORMAL: {
- return Font.FONT_WEIGHT_NORMAL;
+ return Font.Weight.NORMAL;
}
case FoValue.BOLD: {
- return Font.FONT_WEIGHT_BOLD;
+ return Font.Weight.BOLD;
}
case FoValue.BOLDER: {
/*
@@ -135,7 +135,7 @@
if (value() instanceof DtInteger) {
return (short) ((DtInteger) value()).getValue();
}
- return Font.FONT_WEIGHT_NORMAL;
+ return Font.Weight.NORMAL;
}
public static short getValueNoInstance(final FOContext context,
@@ -144,7 +144,7 @@
if (parent != null) {
return parent.traitFontWeight(context);
}
- return Font.FONT_WEIGHT_NORMAL;
+ return Font.Weight.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-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -920,9 +920,9 @@
if (gFont.isItalic()) {
fontStyle = org.axsl.fontR.Font.Style.ITALIC;
}
- int fontWeight = org.axsl.fontR.Font.FONT_WEIGHT_NORMAL;
+ int fontWeight = org.axsl.fontR.Font.Weight.NORMAL;
if (gFont.isBold()) {
- fontWeight = org.axsl.fontR.Font.FONT_WEIGHT_BOLD;
+ fontWeight = org.axsl.fontR.Font.Weight.BOLD;
}
try {
final FontConsumer fontConsumer =
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-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -291,9 +291,9 @@
if (italic) {
style = Font.Style.ITALIC;
}
- int weight = org.axsl.fontR.Font.FONT_WEIGHT_NORMAL;
+ int weight = org.axsl.fontR.Font.Weight.NORMAL;
if (bold) {
- weight = org.axsl.fontR.Font.FONT_WEIGHT_BOLD;
+ weight = org.axsl.fontR.Font.Weight.BOLD;
}
final List gvtFonts = (List) aci.getAttribute(
GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2007-01-30 03:49:01 UTC (rev 8547)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2007-01-30 04:16:00 UTC (rev 8548)
@@ -472,7 +472,7 @@
italic = true;
}
boolean bold = false;
- if (title.traitFontWeight() >= Font.FONT_WEIGHT_BOLD) {
+ if (title.traitFontWeight() >= Font.Weight.BOLD) {
bold = true;
}
PDFOutlineItem pdfOutline = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|