You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2009/05/03 17:26:31 UTC
svn commit: r771064 - in /incubator/pdfbox/trunk: ./ external/
src/main/java/org/apache/pdfbox/encoding/
src/main/java/org/apache/pdfbox/encoding/conversion/
src/main/java/org/apache/pdfbox/pdmodel/common/
src/main/java/org/apache/pdfbox/pdmodel/font/
Author: lehmi
Date: Sun May 3 15:26:27 2009
New Revision: 771064
URL: http://svn.apache.org/viewvc?rev=771064&view=rev
Log:
PDFBOX-452: changed fontbox from version 0.2.0 to the first apache-incubation version 0.8.0
Added:
incubator/pdfbox/trunk/external/fontbox-0.8.0-incubating.jar (with props)
Removed:
incubator/pdfbox/trunk/external/FontBox-0.2.0-dev.jar
Modified:
incubator/pdfbox/trunk/build.xml
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/CJKConverter.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/EncodingConverter.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/common/PDRectangle.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/Type3StreamParser.java
Modified: incubator/pdfbox/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/build.xml?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/build.xml (original)
+++ incubator/pdfbox/trunk/build.xml Sun May 3 15:26:27 2009
@@ -44,7 +44,7 @@
<property name="ant.jar" value="${jar.dir}/ant.jar" />
- <property name="fontbox.name" value="FontBox-0.2.0-dev" />
+ <property name="fontbox.name" value="fontbox-0.8.0-incubating" />
<property name="fontbox.jar" value="${jar.dir}/${fontbox.name}.jar" />
<property name="jempbox.name" value="jempbox-0.8.0-incubating" />
@@ -118,6 +118,8 @@
<target name="testextract" depends="clean,compile" description="Test text extraction">
<junit printsummary="off" fork="on" dir=".">
+ <jvmarg value="-Xmx1024M"/>
+ <jvmarg value="-Xms512M"/>
<sysproperty key="org.apache.pdfbox.util.TextStripper.file" value="${file}"/>
<classpath>
<pathelement path="${junit.jar}" />
Added: incubator/pdfbox/trunk/external/fontbox-0.8.0-incubating.jar
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/external/fontbox-0.8.0-incubating.jar?rev=771064&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pdfbox/trunk/external/fontbox-0.8.0-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java Sun May 3 15:26:27 2009
@@ -18,8 +18,8 @@
import java.util.Iterator;
-import org.fontbox.afm.CharMetric;
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.CharMetric;
+import org.apache.fontbox.afm.FontMetric;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/CJKConverter.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/CJKConverter.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/CJKConverter.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/CJKConverter.java Sun May 3 15:26:27 2009
@@ -17,7 +17,7 @@
package org.apache.pdfbox.encoding.conversion;
-import org.fontbox.cmap.CMap;
+import org.apache.fontbox.cmap.CMap;
import java.io.UnsupportedEncodingException;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/EncodingConverter.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/EncodingConverter.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/EncodingConverter.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/encoding/conversion/EncodingConverter.java Sun May 3 15:26:27 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pdfbox.encoding.conversion;
-import org.fontbox.cmap.CMap;
+import org.apache.fontbox.cmap.CMap;
/**
* EncodingConverter converts string or characters in one encoding, which is specified in PDF
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/common/PDRectangle.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/common/PDRectangle.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/common/PDRectangle.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/common/PDRectangle.java Sun May 3 15:26:27 2009
@@ -21,7 +21,7 @@
import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSNumber;
-import org.fontbox.util.BoundingBox;
+import org.apache.fontbox.util.BoundingBox;
import java.awt.Dimension;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Sun May 3 15:26:27 2009
@@ -16,13 +16,10 @@
*/
package org.apache.pdfbox.pdmodel.font;
-import org.fontbox.afm.AFMParser;
-
-import org.fontbox.afm.FontMetric;
-
-import org.fontbox.cmap.CMapParser;
-
-import org.fontbox.cmap.CMap;
+import org.apache.fontbox.afm.AFMParser;
+import org.apache.fontbox.afm.FontMetric;
+import org.apache.fontbox.cmap.CMapParser;
+import org.apache.fontbox.cmap.CMap;
import org.apache.pdfbox.encoding.AFMEncoding;
import org.apache.pdfbox.encoding.DictionaryEncoding;
@@ -540,9 +537,9 @@
}
}
/**
- * Si la clé /Encoding existe dans le dictionnaire fonte il y a deux possibilités :
- * 1er cas : elle est associé à une reference contenant un dictionnaire de type encoding.
- * Ce dictionnaire PDF est représenté par un DictionaryEncoding.
+ * Si la cl� /Encoding existe dans le dictionnaire fonte il y a deux possibilit�s :
+ * 1er cas : elle est associ� � une reference contenant un dictionnaire de type encoding.
+ * Ce dictionnaire PDF est repr�sent� par un DictionaryEncoding.
* If the /Encoding Key does exist in the font dictionary, there are two cases :
* case one : The value associated with /Encoding is a reference to a dictionary.
* This dictionary is represented by an instance of DictionaryEncoding class
@@ -555,7 +552,7 @@
//file
COSName baseEncodingName = (COSName) encodingDic.getDictionaryObject(
COSName.BASE_ENCODING);
- //on ajoute une entrée /BaseEncoding dans /Encoding uniquement si elle en est absente
+ //on ajoute une entr�e /BaseEncoding dans /Encoding uniquement si elle en est absente
//if not find in Encoding dictinary target, we try to find it from else where
if( baseEncodingName == null)
{
@@ -729,8 +726,8 @@
COSName retvalue = null;
//recuperer le programme de fonte dans son stream qui doit se trouver
- //dans le flux référencé par à la clé FileFont lui même situé dans
- //le dictionnaire associé à /FontDescriptor du dictionnaire de type /Font courrant
+ //dans le flux r�f�renc� par � la cl� FileFont lui m�me situ� dans
+ //le dictionnaire associ� � /FontDescriptor du dictionnaire de type /Font courrant
//get the font program in the stream which should be located in
//the /FileFont Stream object himself in the /FontDescriptior of the current
//font dictionary
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java Sun May 3 15:26:27 2009
@@ -18,11 +18,11 @@
import java.io.IOException;
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.FontMetric;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.fontbox.util.BoundingBox;
+import org.apache.fontbox.util.BoundingBox;
/**
* This class represents the font descriptor when the font information
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java Sun May 3 15:26:27 2009
@@ -23,7 +23,7 @@
import java.util.HashMap;
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.FontMetric;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Sun May 3 15:26:27 2009
@@ -16,19 +16,19 @@
*/
package org.apache.pdfbox.pdmodel.font;
-import org.fontbox.ttf.CMAPEncodingEntry;
-import org.fontbox.ttf.CMAPTable;
-import org.fontbox.ttf.GlyphData;
-import org.fontbox.ttf.GlyphTable;
-import org.fontbox.ttf.HeaderTable;
-import org.fontbox.ttf.HorizontalHeaderTable;
-import org.fontbox.ttf.HorizontalMetricsTable;
-import org.fontbox.ttf.NamingTable;
-import org.fontbox.ttf.NameRecord;
-import org.fontbox.ttf.OS2WindowsMetricsTable;
-import org.fontbox.ttf.PostScriptTable;
-import org.fontbox.ttf.TTFParser;
-import org.fontbox.ttf.TrueTypeFont;
+import org.apache.fontbox.ttf.CMAPEncodingEntry;
+import org.apache.fontbox.ttf.CMAPTable;
+import org.apache.fontbox.ttf.GlyphData;
+import org.apache.fontbox.ttf.GlyphTable;
+import org.apache.fontbox.ttf.HeaderTable;
+import org.apache.fontbox.ttf.HorizontalHeaderTable;
+import org.apache.fontbox.ttf.HorizontalMetricsTable;
+import org.apache.fontbox.ttf.NamingTable;
+import org.apache.fontbox.ttf.NameRecord;
+import org.apache.fontbox.ttf.OS2WindowsMetricsTable;
+import org.apache.fontbox.ttf.PostScriptTable;
+import org.apache.fontbox.ttf.TTFParser;
+import org.apache.fontbox.ttf.TrueTypeFont;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java Sun May 3 15:26:27 2009
@@ -25,11 +25,11 @@
import java.util.Iterator;
import java.util.List;
-import org.fontbox.afm.AFMParser;
-import org.fontbox.afm.CharMetric;
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.AFMParser;
+import org.apache.fontbox.afm.CharMetric;
+import org.apache.fontbox.afm.FontMetric;
-import org.fontbox.pfb.PfbParser;
+import org.apache.fontbox.pfb.PfbParser;
import org.apache.pdfbox.encoding.*;
import org.apache.pdfbox.pdmodel.PDDocument;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/Type3StreamParser.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/Type3StreamParser.java?rev=771064&r1=771063&r2=771064&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/Type3StreamParser.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/Type3StreamParser.java Sun May 3 15:26:27 2009
@@ -22,7 +22,7 @@
import java.util.List;
-import org.fontbox.util.BoundingBox;
+import org.apache.fontbox.util.BoundingBox;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.cos.COSStream;