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 je...@apache.org on 2006/03/20 08:32:25 UTC
svn commit: r387161 - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps:
AbstractFontReader.java PFMReader.java TTFReader.java
Author: jeremias
Date: Sun Mar 19 23:32:22 2006
New Revision: 387161
URL: http://svn.apache.org/viewcvs?rev=387161&view=rev
Log:
Bugzilla #39030:
Output filenames with a space resulted in "%20" in the generated file. Looks like a bug in Xalan-J.
We now open the OutputStream ourselves. The two practically identical write methods pulled up into the abstract base class.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/TTFReader.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java?rev=387161&r1=387160&r2=387161&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java Sun Mar 19 23:32:22 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +18,16 @@
package org.apache.fop.fonts.apps;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
import java.util.List;
import java.util.Map;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.util.CommandLineLogger;
@@ -99,6 +106,44 @@
setLogLevel("error");
} else {
setLogLevel("info");
+ }
+ }
+
+ /**
+ * Writes the generated DOM Document to a file.
+ *
+ * @param doc The DOM Document to save.
+ * @param target The target filename for the XML file.
+ * @throws TransformerException if an error occurs during serialization
+ */
+ public void writeFontXML(org.w3c.dom.Document doc, String target) throws TransformerException {
+ writeFontXML(doc, new File(target));
+ }
+
+ /**
+ * Writes the generated DOM Document to a file.
+ *
+ * @param doc The DOM Document to save.
+ * @param target The target file for the XML file.
+ * @throws TransformerException if an error occurs during serialization
+ */
+ public void writeFontXML(org.w3c.dom.Document doc, File target) throws TransformerException {
+ log.info("Writing xml font file " + target + "...");
+
+ try {
+ OutputStream out = new java.io.FileOutputStream(target);
+ out = new java.io.BufferedOutputStream(out);
+ try {
+ TransformerFactory factory = TransformerFactory.newInstance();
+ Transformer transformer = factory.newTransformer();
+ transformer.transform(
+ new javax.xml.transform.dom.DOMSource(doc),
+ new javax.xml.transform.stream.StreamResult(out));
+ } finally {
+ out.close();
+ }
+ } catch (IOException ioe) {
+ throw new TransformerException("Error writing the output file", ioe);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java?rev=387161&r1=387160&r2=387161&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java Sun Mar 19 23:32:22 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,16 +18,12 @@
package org.apache.fop.fonts.apps;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;
import java.util.Map;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.Version;
@@ -187,25 +183,6 @@
+ " has a width of " + pfm.getCharWidth(pfm.getFirstChar()));
log.info("");
}
- }
-
- /**
- * Writes the generated DOM Document to a file.
- *
- * @param doc The DOM Document to save.
- * @param target The target filename for the XML file.
- * @throws TransformerException if an error occurs during serialization
- */
- public void writeFontXML(org.w3c.dom.Document doc, String target)
- throws TransformerException {
- log.info("Writing xml font file " + target + "...");
- log.info("");
-
- TransformerFactory factory = TransformerFactory.newInstance();
- Transformer transformer = factory.newTransformer();
- transformer.transform(
- new javax.xml.transform.dom.DOMSource(doc),
- new javax.xml.transform.stream.StreamResult(new File(target)));
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/TTFReader.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/TTFReader.java?rev=387161&r1=387160&r2=387161&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/TTFReader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/TTFReader.java Sun Mar 19 23:32:22 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,15 +18,11 @@
package org.apache.fop.fonts.apps;
-import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.Version;
@@ -207,24 +203,6 @@
return ttfFile;
}
-
- /**
- * Writes the generated DOM Document to a file.
- *
- * @param doc The DOM Document to save.
- * @param target The target filename for the XML file.
- * @throws TransformerException if an error occurs during serialization
- */
- public void writeFontXML(org.w3c.dom.Document doc, String target)
- throws TransformerException {
- log.info("Writing xml font file " + target + "...");
-
- TransformerFactory factory = TransformerFactory.newInstance();
- Transformer transformer = factory.newTransformer();
- transformer.transform(
- new javax.xml.transform.dom.DOMSource(doc),
- new javax.xml.transform.stream.StreamResult(new File(target)));
- }
/**
* Generates the font metrics file from the TTF/TTC file.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org