From: Jeremias Maerki <jeremias@apache.org>
Date: Sat, 15 Mar 2003 16:49:58 +0000 (+0000)
Subject: Fix font lookup when font was found through weight-adjust.
X-Git-Tag: Alt-Design-integration-base~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=706b6f1d61ba035f05be3df46f54da2dd420f6c3;p=xmlgraphics-fop.git

Fix font lookup when font was found through weight-adjust.


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

diff --git a/src/java/org/apache/fop/layout/FontInfo.java b/src/java/org/apache/fop/layout/FontInfo.java
index dcde21770..6560fab97 100644
--- a/src/java/org/apache/fop/layout/FontInfo.java
+++ b/src/java/org/apache/fop/layout/FontInfo.java
@@ -164,7 +164,9 @@ public class FontInfo {
             }
 
             // then use default
-            f = (String)triplets.get(DEFAULT_FONT);
+            if (f == null) {
+                f = (String)triplets.get(DEFAULT_FONT);
+            }
 
         }