Author: jeremias
Date: Mon Feb 16 08:25:25 2009
New Revision: 744856
URL: http://svn.apache.org/viewvc?rev=744856&view=rev
Log:
Added an additional font fallback to PrintRenderer to avoid some problems when
processing an intermediate file generated for a different output format than
the current one.
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/PrintRenderer.java
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/PrintRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/PrintRenderer.java?rev=744856&r1=744855&r2=744856&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/PrintRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/PrintRenderer.java
Mon Feb 16 08:25:25 2009
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.Map;
+import org.w3c.dom.Document;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.Area;
import org.apache.fop.area.Trait;
@@ -35,7 +37,6 @@
import org.apache.fop.fonts.FontResolver;
import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.fonts.base14.Base14FontCollection;
-import org.w3c.dom.Document;
/** Abstract base class of "Print" type renderers. */
public abstract class PrintRenderer extends AbstractRenderer {
@@ -93,7 +94,13 @@
*/
protected String getInternalFontNameForArea(Area area) {
FontTriplet triplet = (FontTriplet)area.getTrait(Trait.FONT);
- return fontInfo.getInternalFontKey(triplet);
+ String key = fontInfo.getInternalFontKey(triplet);
+ if (key == null) {
+ //Find a default fallback font as last resort
+ triplet = new FontTriplet("any", Font.STYLE_NORMAL,
Font.WEIGHT_NORMAL);
+ key = fontInfo.getInternalFontKey(triplet);
+ }
+ return key;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
