g***@apache.org
2014-09-26 09:55:40 UTC
Author: gadams
Date: Fri Sep 26 09:55:40 2014
New Revision: 1627733
URL: http://svn.apache.org/r1627733
Log:
FOP-2391: ensure derived font triplet is used
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java?rev=1627733&r1=1627732&r2=1627733&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java Fri Sep 26 09:55:40 2014
@@ -129,11 +129,11 @@ public class FOPGVTFont implements GVTFo
}
public String getFontKey() {
- return ((FOPGVTFontFamily) fontFamily).getFontKey();
+ return font.getFontName();
}
public FontTriplet getFontTriplet() {
- return ((FOPGVTFontFamily) fontFamily).getFontTriplet();
+ return font.getFontTriplet();
}
public String getFamilyName() {
Date: Fri Sep 26 09:55:40 2014
New Revision: 1627733
URL: http://svn.apache.org/r1627733
Log:
FOP-2391: ensure derived font triplet is used
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java?rev=1627733&r1=1627732&r2=1627733&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/font/FOPGVTFont.java Fri Sep 26 09:55:40 2014
@@ -129,11 +129,11 @@ public class FOPGVTFont implements GVTFo
}
public String getFontKey() {
- return ((FOPGVTFontFamily) fontFamily).getFontKey();
+ return font.getFontName();
}
public FontTriplet getFontTriplet() {
- return ((FOPGVTFontFamily) fontFamily).getFontTriplet();
+ return font.getFontTriplet();
}
public String getFamilyName() {