From fd8186e127fe65718f048d741398c77396cd4499 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Wed, 10 Sep 2008 10:52:45 +0000 Subject: [PATCH] Bugzilla #45734: Fix for PFMReader after bug #43089 (r567078) changed the behavior of PFMFile. Fixes baseline problems when Type 1 fonts are used in conjunction with XML font metric files. Submitted by: J. Frantzius git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@693781 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fonts/apps/PFMReader.java | 8 +++++--- status.xml | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/fop/fonts/apps/PFMReader.java b/src/java/org/apache/fop/fonts/apps/PFMReader.java index 18b40993d..90dd1fd28 100644 --- a/src/java/org/apache/fop/fonts/apps/PFMReader.java +++ b/src/java/org/apache/fop/fonts/apps/PFMReader.java @@ -26,12 +26,14 @@ import java.util.Map; import javax.xml.parsers.DocumentBuilderFactory; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + import org.apache.commons.logging.LogFactory; + import org.apache.fop.Version; import org.apache.fop.fonts.type1.PFMFile; import org.apache.fop.util.CommandLineLogger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; /** * A tool which reads PFM files from Adobe Type 1 fonts and creates @@ -256,7 +258,7 @@ public class PFMReader extends AbstractFontReader { el = doc.createElement("descender"); root.appendChild(el); - value = new Integer(-pfm.getLowerCaseDescent()); + value = new Integer(pfm.getLowerCaseDescent()); el.appendChild(doc.createTextNode(value.toString())); Element bbox = doc.createElement("bbox"); diff --git a/status.xml b/status.xml index ea07f1d20..a342197bd 100644 --- a/status.xml +++ b/status.xml @@ -53,6 +53,10 @@ + + Fix for PFMReader after bug #43089 changed the behavior of PFMFile. Fixes baseline + problems when Type 1 fonts are used in conjunction with XML font metric files. + Fix for table handling in RTF output, so the output works with OpenOffice and AbiWord, too. -- 2.39.5