diff options
| -rw-r--r-- | src/java/org/apache/fop/render/ps/NativeTextHandler.java | 14 | ||||
| -rw-r--r-- | status.xml | 3 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/java/org/apache/fop/render/ps/NativeTextHandler.java b/src/java/org/apache/fop/render/ps/NativeTextHandler.java index e1171b3e1..a31d828b1 100644 --- a/src/java/org/apache/fop/render/ps/NativeTextHandler.java +++ b/src/java/org/apache/fop/render/ps/NativeTextHandler.java @@ -160,19 +160,7 @@ public class NativeTextHandler implements PSTextHandler { } private Font createFont(java.awt.Font f) { - String fontFamily = f.getFamily(); - if (fontFamily.equals("sanserif")) { - fontFamily = "sans-serif"; - } - int fontSize = 1000 * f.getSize(); - String style = f.isItalic() ? "italic" : "normal"; - int weight = f.isBold() ? Font.WEIGHT_BOLD : Font.WEIGHT_NORMAL; - - FontTriplet triplet = fontInfo.findAdjustWeight(fontFamily, style, weight); - if (triplet == null) { - triplet = fontInfo.findAdjustWeight("sans-serif", style, weight); - } - return fontInfo.getFontInstance(triplet, fontSize); + return fontInfo.getFontInstanceForAWTFont(f); } private void establishCurrentFont() throws IOException { diff --git a/status.xml b/status.xml index 28fef4011..27a82c2a0 100644 --- a/status.xml +++ b/status.xml @@ -62,6 +62,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="Code" dev="GA" type="fix" fixes-bug="49302" due-to="Julien Aymé"> + Eliminate duplicate code. + </action> <action context="Code" dev="GA" type="fix" fixes-bug="49350" due-to="Julien Aymé"> Correct coding error in AFPResourceLevel#equals. </action> |