From: Jeremias Maerki <jeremias@apache.org>
Date: Thu, 5 May 2011 15:38:17 +0000 (+0000)
Subject: Bugzilla #50899:
X-Git-Tag: fop-1_1rc1old~216
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7aed9feb97b764ff13d065b66854b897b18ec881;p=xmlgraphics-fop.git

Bugzilla #50899:
Fixed mapping of font weights between CSS values and TextAttribute.WEIGHT_*.
Submitted by: Glenn Adams <glenn.at.skynav.com>

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1099845 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/fop/svg/ACIUtils.java b/src/java/org/apache/fop/svg/ACIUtils.java
index 995908116..92dd3f16f 100644
--- a/src/java/org/apache/fop/svg/ACIUtils.java
+++ b/src/java/org/apache/fop/svg/ACIUtils.java
@@ -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;
         }
diff --git a/status.xml b/status.xml
index 4e671c6a0..ea011a164 100644
--- a/status.xml
+++ b/status.xml
@@ -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>