You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by bd...@apache.org on 2006/09/27 17:32:23 UTC
svn commit: r450479 [4/4] - in /xmlgraphics/fop/branches/foray-font: ./
axsl-temp-stuff/ conf/ lib/ src/java/org/apache/fop/apps/
src/java/org/apache/fop/area/ src/java/org/apache/fop/area/inline/
src/java/org/apache/fop/cli/ src/java/org/apache/fop/fo...
Modified: xmlgraphics/fop/branches/foray-font/src/java/org/apache/fop/svg/PDFTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/foray-font/src/java/org/apache/fop/svg/PDFTranscoder.java?view=diff&rev=450479&r1=450478&r2=450479
==============================================================================
--- xmlgraphics/fop/branches/foray-font/src/java/org/apache/fop/svg/PDFTranscoder.java (original)
+++ xmlgraphics/fop/branches/foray-font/src/java/org/apache/fop/svg/PDFTranscoder.java Wed Sep 27 08:32:21 2006
@@ -83,7 +83,7 @@
* Constructs a new <tt>ImageTranscoder</tt>.
*/
public PDFTranscoder() {
- super();
+ super(false);
this.handler = new FOPErrorHandler();
}
@@ -119,7 +119,7 @@
TranscoderOutput output)
throws TranscoderException {
- graphics = new PDFDocumentGraphics2D();
+ graphics = new PDFDocumentGraphics2D(getFontMap());
try {
if (this.cfg != null) {
@@ -180,7 +180,7 @@
/** @see org.apache.batik.transcoder.SVGAbstractTranscoder#createBridgeContext() */
protected BridgeContext createBridgeContext() {
- BridgeContext ctx = new PDFBridgeContext(userAgent, graphics.getFontInfo());
+ BridgeContext ctx = new PDFBridgeContext(userAgent, graphics.getFontConsumer());
return ctx;
}
Modified: xmlgraphics/fop/branches/foray-font/src/java/org/apache/fop/traits/SpaceVal.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/foray-font/src/java/org/apache/fop/traits/SpaceVal.java?view=diff&rev=450479&r1=450478&r2=450479
==============================================================================
--- xmlgraphics/fop/branches/foray-font/src/java/org/apache/fop/traits/SpaceVal.java (original)
+++ xmlgraphics/fop/branches/foray-font/src/java/org/apache/fop/traits/SpaceVal.java Wed Sep 27 08:32:21 2006
@@ -23,7 +23,9 @@
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.properties.SpaceProperty;
-import org.apache.fop.fonts.Font;
+
+import org.axsl.fontR.Font;
+import org.axsl.fontR.FontConsumer;
/**
* Store a single Space property value in simplified form, with all
@@ -72,13 +74,15 @@
this.iPrecedence = iPrecedence;
}
- static public SpaceVal makeWordSpacing(Property wordSpacing,
- SpaceVal letterSpacing,
- Font fs) {
+ public static SpaceVal makeWordSpacing(Property wordSpacing,
+ SpaceVal letterSpacing,
+ Font fs,
+ FontConsumer fontConsumer,
+ int fontSize) {
if (wordSpacing.getEnum() == Constants.EN_NORMAL) {
// give word spaces the possibility to shrink by a third,
// and stretch by a half;
- int spaceCharIPD = fs.getCharWidth(' ');
+ int spaceCharIPD = fs.width(' ', fontSize);
MinOptMax space = new MinOptMax(-spaceCharIPD / 3, 0, spaceCharIPD / 2);
//TODO Adding 2 letter spaces here is not 100% correct. Spaces don't have letter spacing
return new SpaceVal(
@@ -90,7 +94,7 @@
}
}
- static public SpaceVal makeLetterSpacing(Property letterSpacing) {
+ public static SpaceVal makeLetterSpacing(Property letterSpacing) {
if (letterSpacing.getEnum() == Constants.EN_NORMAL) {
// letter spaces are set to zero (or use different values?)
return new SpaceVal(new MinOptMax(0), true, true, 0);
Modified: xmlgraphics/fop/branches/foray-font/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/foray-font/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java?view=diff&rev=450479&r1=450478&r2=450479
==============================================================================
--- xmlgraphics/fop/branches/foray-font/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java (original)
+++ xmlgraphics/fop/branches/foray-font/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java Wed Sep 27 08:32:21 2006
@@ -154,6 +154,9 @@
//Setup FOP for area tree rendering
FOUserAgent ua = effFactory.newFOUserAgent();
ua.setBaseURL(testFile.getParentFile().toURL().toString());
+ File fontCfgFile = new File("conf/fonts.xconf");
+// File fontCfgFile = new File("../Tests/Config/axsl-font-conf.xml");
+ ua.setFontCfgURL(fontCfgFile.toURL());
XMLRenderer atrenderer = new XMLRenderer();
atrenderer.setUserAgent(ua);
atrenderer.setContentHandler(athandler);
Modified: xmlgraphics/fop/branches/foray-font/test/java/org/apache/fop/threading/FOProcessorImpl.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/foray-font/test/java/org/apache/fop/threading/FOProcessorImpl.java?view=diff&rev=450479&r1=450478&r2=450479
==============================================================================
--- xmlgraphics/fop/branches/foray-font/test/java/org/apache/fop/threading/FOProcessorImpl.java (original)
+++ xmlgraphics/fop/branches/foray-font/test/java/org/apache/fop/threading/FOProcessorImpl.java Wed Sep 27 08:32:21 2006
@@ -19,6 +19,7 @@
package org.apache.fop.threading;
+import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
@@ -107,4 +108,4 @@
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org