Author: jeremias
Date: Thu May 5 15:38:17 2011
New Revision: 1099845
URL: http://svn.apache.org/viewvc?rev=1099845&view=rev
Log:
Bugzilla #50899:
Fixed mapping of font weights between CSS values and TextAttribute.WEIGHT_*.
Submitted by: Glenn Adams <glenn.at.skynav.com>
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/ACIUtils.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/ACIUtils.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/ACIUtils.java?rev=1099845&r1=1099844&r2=1099845&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/ACIUtils.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/ACIUtils.java Thu May 5
15:38:17 2011
@@ -152,12 +152,14 @@ public final class ACIUtils {
return 400;
} else if (weight <= TextAttribute.WEIGHT_SEMIBOLD.floatValue()) {
return 500;
- } else if (weight <= TextAttribute.WEIGHT_BOLD.floatValue()) {
+ } else if (weight < TextAttribute.WEIGHT_BOLD.floatValue()) {
return 600;
- } else if (weight <= TextAttribute.WEIGHT_HEAVY.floatValue()) {
+ } else if (weight == TextAttribute.WEIGHT_BOLD.floatValue()) {
return 700;
- } else if (weight <= TextAttribute.WEIGHT_EXTRABOLD.floatValue()) {
+ } else if (weight <= TextAttribute.WEIGHT_HEAVY.floatValue()) {
return 800;
+ } else if (weight <= TextAttribute.WEIGHT_EXTRABOLD.floatValue()) {
+ return 900;
} else {
return 900;
}
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1099845&r1=1099844&r2=1099845&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Thu May 5 15:38:17 2011
@@ -59,6 +59,9 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="JM" type="fix" fixes-bug="50899"
due-to="Glenn Adams">
+ Fixed mapping of font weights between CSS values and
TextAttribute.WEIGHT_*.
+ </action>
<action context="Renderers" dev="JM" type="fix">
AFP GOCA: fonts were not embedded from within AFPGraphics2D.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
