Author: jeremias
Date: Fri Sep 10 11:53:28 2010
New Revision: 995762
URL: http://svn.apache.org/viewvc?rev=995762&view=rev
Log:
Moving the AFP parser from XGC to FOP for now.
Added:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/ (props changed)
- copied from r995761,
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/afp/apps/
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/ (props changed)
- copied from r995761,
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/afp/parser/
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/MODCAParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/UnparsedStructuredField.java
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 10 11:53:28 2010
@@ -0,0 +1 @@
+/xmlgraphics/commons/branches/commons-1_4/src/java/org/apache/xmlgraphics/afp/apps:950384-962801
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java?rev=995762&r1=995761&r2=995762&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps/FontPatternExtractor.java
Fri Sep 10 11:53:28 2010
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.xmlgraphics.afp.apps;
+package org.apache.fop.afp.apps;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
@@ -31,15 +31,15 @@ import org.apache.commons.io.HexDump;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.xmlgraphics.afp.parser.MODCAParser;
-import org.apache.xmlgraphics.afp.parser.UnparsedStructuredField;
+import org.apache.fop.afp.parser.MODCAParser;
+import org.apache.fop.afp.parser.UnparsedStructuredField;
/**
* This class represents a tool for extracting the Type 1 PFB file from an AFP
outline font.
*/
public class FontPatternExtractor {
- PrintStream printStream = System.out;
+ private PrintStream printStream = System.out;
/**
* Extracts the Type1 PFB file from the given AFP outline font.
@@ -63,7 +63,7 @@ public class FontPatternExtractor {
ByteArrayInputStream bin = new
ByteArrayInputStream(baout.toByteArray());
DataInputStream din = new DataInputStream(bin);
- long len = din.readInt() & 0xFFFFFFFFl;
+ long len = din.readInt() & 0xFFFFFFFFL;
println("Length: " + len);
din.skip(4); //checksum
int tidLen = din.readUnsignedShort() - 2;
@@ -117,6 +117,10 @@ public class FontPatternExtractor {
return count;
}
+ /**
+ * Main method
+ * @param args the command-line arguments
+ */
public static void main(String[] args) {
try {
FontPatternExtractor app = new FontPatternExtractor();
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 10 11:53:28 2010
@@ -0,0 +1 @@
+/xmlgraphics/commons/branches/commons-1_4/src/java/org/apache/xmlgraphics/afp/parser:950384-962801
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/MODCAParser.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/MODCAParser.java?rev=995762&r1=995761&r2=995762&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/MODCAParser.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/MODCAParser.java
Fri Sep 10 11:53:28 2010
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.xmlgraphics.afp.parser;
+package org.apache.fop.afp.parser;
import java.io.DataInputStream;
import java.io.EOFException;
@@ -55,7 +55,7 @@ public class MODCAParser {
* <p>
* No structure validation of the MO:DCA file is performed.
* @return a new unparsed structured field (or null when parsing is
finished).
- * @throws IOException
+ * @throws IOException if an I/O error occurs
*/
public UnparsedStructuredField readNextStructuredField() throws
IOException {
din.mark(1);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/UnparsedStructuredField.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/UnparsedStructuredField.java?rev=995762&r1=995761&r2=995762&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/UnparsedStructuredField.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser/UnparsedStructuredField.java
Fri Sep 10 11:53:28 2010
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.xmlgraphics.afp.parser;
+package org.apache.fop.afp.parser;
import java.io.DataInputStream;
import java.io.EOFException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
