xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r679326 [21/33] - in /xmlgraphics/fop/trunk: examples/embedding/java/embedding/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ examples/embedding/java/embed...
Date Thu, 24 Jul 2008 09:37:16 GMT
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java
@@ -37,7 +37,7 @@
  * document in another place.
  */
 public class PDFImageXObject extends PDFXObject {
-    
+
     private PDFImage pdfimage;
 
     /**
@@ -63,7 +63,7 @@
      */
     protected int output(OutputStream stream) throws IOException {
         int length = super.output(stream);
-        
+
         // let it gc
         // this object is retained as a reference to inserting
         // the same image but the image data is no longer needed
@@ -80,7 +80,7 @@
             populateDictionaryFromImage();
         }
     }
-    
+
     private void populateDictionaryFromPS() {
         getDocumentSafely().getProfile().verifyPSXObjectsAllowed();
         put("Subtype", new PDFName("PS"));
@@ -139,7 +139,7 @@
         //Important: do this at the end so previous values can be overwritten.
         pdfimage.populateXObjectDictionary(this);
     }
-    
+
     /** {@inheritDoc} */
     protected void outputRawStreamData(OutputStream out) throws IOException {
         pdfimage.outputContents(out);
@@ -157,7 +157,7 @@
             getFilterList().ensureFilterInPlace(pdfFilter);
         }
     }
-    
+
     /**
      * This sets up the default filters for XObjects. It uses the PDFImage
      * instance to determine what default filters to apply.
@@ -166,11 +166,11 @@
     protected void setupFilterList() {
         if (!getFilterList().isInitialized()) {
             getFilterList().addDefaultFilters(
-                getDocumentSafely().getFilterMap(), 
+                getDocumentSafely().getFilterMap(),
                 pdfimage.getFilterHint());
         }
         super.setupFilterList();
     }
-    
+
 
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.util.Date;
@@ -50,7 +50,7 @@
     public String getProducer() {
         return this.producer;
     }
-    
+
     /**
      * set the producer string
      *
@@ -64,7 +64,7 @@
     public String getCreator() {
         return this.creator;
     }
-    
+
     /**
      * set the creator string
      *
@@ -92,7 +92,7 @@
     public String getAuthor() {
         return this.author;
     }
-    
+
     /**
      * set the author string
      *
@@ -106,7 +106,7 @@
     public String getSubject() {
         return this.subject;
     }
-    
+
     /**
      * set the subject string
      *
@@ -120,7 +120,7 @@
     public String getKeywords() {
         return this.keywords;
     }
-    
+
     /**
      * set the keywords string
      *
@@ -162,7 +162,7 @@
      * {@inheritDoc}
      */
     public byte[] toPDF() {
-        PDFProfile profile = getDocumentSafely().getProfile(); 
+        PDFProfile profile = getDocumentSafely().getProfile();
         ByteArrayOutputStream bout = new ByteArrayOutputStream(128);
         try {
             bout.write(encode(getObjectID()));
@@ -189,17 +189,17 @@
                 bout.write(encodeText(this.keywords));
                 bout.write(encode("\n"));
             }
-    
+
             if (creator != null) {
                 bout.write(encode("/Creator "));
                 bout.write(encodeText(this.creator));
                 bout.write(encode("\n"));
             }
-    
+
             bout.write(encode("/Producer "));
             bout.write(encodeText(this.producer));
             bout.write(encode("\n"));
-    
+
             // creation date in form (D:YYYYMMDDHHmmSSOHH'mm')
             if (creationDate == null) {
                 creationDate = new Date();
@@ -207,7 +207,7 @@
             bout.write(encode("/CreationDate "));
             bout.write(encodeString(formatDateTime(creationDate)));
             bout.write(encode("\n"));
-            
+
             if (profile.isModDateRequired() && this.modDate == null) {
                 this.modDate = this.creationDate;
             }
@@ -224,7 +224,7 @@
             if (profile.isTrappedEntryRequired()) {
                 bout.write(encode("/Trapped /False\n"));
             }
-            
+
             bout.write(encode(">>\nendobj\n"));
         } catch (IOException ioe) {
             log.error("Ignored I/O exception", ioe);

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInternalLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInternalLink.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInternalLink.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInternalLink.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -43,7 +43,7 @@
  * @since PDF 1.4
  */
 public class PDFMetadata extends PDFStream {
-    
+
     private Metadata xmpMetadata;
     private boolean readOnly = true;
 
@@ -62,7 +62,7 @@
     protected void setupFilterList() {
         if (!getFilterList().isInitialized()) {
             getFilterList().addDefaultFilters(
-                getDocumentSafely().getFilterMap(), 
+                getDocumentSafely().getFilterMap(),
                 PDFFilterList.METADATA_FILTER);
         }
         super.setupFilterList();
@@ -74,7 +74,7 @@
     public Metadata getMetadata() {
         return this.xmpMetadata;
     }
-    
+
     /**
      * overload the base object method so we don't have to copy
      * byte arrays around so much
@@ -86,24 +86,24 @@
         this.xmpMetadata = null; //Release DOM when it's not used anymore
         return length;
     }
-    
+
     /** {@inheritDoc} */
     protected void outputRawStreamData(OutputStream out) throws IOException {
         try {
             XMPSerializer.writeXMPPacket(xmpMetadata, out, this.readOnly);
         } catch (TransformerConfigurationException tce) {
-            throw new IOException("Error setting up Transformer for XMP stream serialization: " 
+            throw new IOException("Error setting up Transformer for XMP stream serialization: "
                     + tce.getMessage());
         } catch (SAXException saxe) {
-            throw new IOException("Error while serializing XMP stream: " 
+            throw new IOException("Error while serializing XMP stream: "
                     + saxe.getMessage());
         }
     }
-    
+
     /** {@inheritDoc} */
     protected void populateStreamDict(Object lengthEntry) {
         final String filterEntry = getFilterList().buildFilterDictEntries();
-        if (getDocumentSafely().getProfile().getPDFAMode().isPDFA1LevelB() 
+        if (getDocumentSafely().getProfile().getPDFAMode().isPDFA1LevelB()
                 && filterEntry != null && filterEntry.length() > 0) {
             throw new PDFConformanceException(
                     "The Filter key is prohibited when PDF/A-1 is active");
@@ -112,7 +112,7 @@
         put("Subtype", new PDFName("XML"));
         super.populateStreamDict(lengthEntry);
     }
-    
+
     /**
      * Creates an XMP document based on the settings on the PDF Document.
      * @param pdfDoc the PDF Document
@@ -120,7 +120,7 @@
      */
     public static Metadata createXMPFromPDFDocument(PDFDocument pdfDoc) {
         Metadata meta = new Metadata();
-        
+
         PDFInfo info = pdfDoc.getInfo();
         PDFRoot root = pdfDoc.getRoot();
 
@@ -129,7 +129,7 @@
             Date d = new Date();
             info.setCreationDate(d);
         }
-        
+
         //Important: Acrobat 7's preflight check for PDF/A-1b wants the creation date in the Info
         //object and in the XMP metadata to have the same timezone or else it shows a validation
         //error even if the times are essentially equal.
@@ -153,7 +153,7 @@
         dc.addDate(info.getCreationDate());
 
         //PDF/A identification
-        PDFAMode pdfaMode = pdfDoc.getProfile().getPDFAMode(); 
+        PDFAMode pdfaMode = pdfDoc.getProfile().getPDFAMode();
         if (pdfaMode.isPDFA1LevelB()) {
             PDFAAdapter pdfa = PDFAXMPSchema.getAdapter(meta);
             pdfa.setPart(1);
@@ -163,7 +163,7 @@
                 pdfa.setConformance("B"); //PDF/A-1b
             }
         }
-        
+
         //XMP Basic Schema
         XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(meta);
         xmpBasic.setCreateDate(info.getCreationDate());
@@ -186,8 +186,8 @@
             adobePDF.setProducer(info.getProducer());
         }
         adobePDF.setPDFVersion(pdfDoc.getPDFVersionString());
-        
-        
+
+
         return meta;
     }
 
@@ -206,14 +206,14 @@
         } else {
             info.setAuthor(null);
         }
-        
+
         //dc:description["x-default"] maps to Subject as per ISO-19005-1:2005/Cor.1:2007
         info.setSubject(dc.getDescription());
-        
+
         AdobePDFAdapter pdf = AdobePDFSchema.getAdapter(meta);
         info.setKeywords(pdf.getKeywords());
         info.setProducer(pdf.getProducer());
-        
+
         XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(meta);
         info.setCreator(xmpBasic.getCreatorTool());
         Date d;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFName.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFName.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFName.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFName.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -29,9 +29,9 @@
  * Class representing a PDF name object.
  */
 public class PDFName extends PDFObject {
-    
+
     private String name;
-    
+
     /**
      * Creates a new PDF name object.
      * @param name the name value
@@ -58,8 +58,8 @@
         }
         return sb.toString();
     }
-    
-    private static final char[] DIGITS 
+
+    private static final char[] DIGITS
         = {'0', '1', '2', '3', '4', '5', '6', '7',
            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
@@ -71,7 +71,7 @@
         sb.append(DIGITS[ch >>> 4 & 0x0F]);
         sb.append(DIGITS[ch & 0x0F]);
     }
-    
+
     /** {@inheritDoc} */
     public String toString() {
         return this.name;
@@ -86,15 +86,15 @@
         }
 
         writer.write(toString());
-        
+
         if (hasObjectNumber()) {
             writer.write("\nendobj\n");
         }
-        
+
         writer.flush();
         return cout.getCount();
     }
-    
+
     /** {@inheritDoc} */
     public void outputInline(OutputStream out, Writer writer) throws IOException {
         if (hasObjectNumber()) {
@@ -103,5 +103,5 @@
             writer.write(toString());
         }
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNameTreeNode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNameTreeNode.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNameTreeNode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNameTreeNode.java Thu Jul 24 02:35:34 2008
@@ -43,7 +43,7 @@
     public void setKids(PDFArray kids) {
         put(KIDS, kids);
     }
-    
+
     /**
      * Returns the Kids array.
      * @return the Kids array
@@ -51,7 +51,7 @@
     public PDFArray getKids() {
         return (PDFArray)get(KIDS);
     }
-    
+
     /**
      * Sets the Names array.
      * @param names the Names array
@@ -59,7 +59,7 @@
     public void setNames(PDFArray names) {
         put(NAMES, names);
     }
-    
+
     /**
      * Returns the Names array.
      * @return the Names array
@@ -67,7 +67,7 @@
     public PDFArray getNames() {
         return (PDFArray)get(NAMES);
     }
-    
+
     /**
      * Sets the lower limit value of the Limits array.
      * @param key the lower limit value
@@ -116,6 +116,6 @@
         }
         return limits;
     }
-    
+
 }
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNames.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNames.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNames.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNames.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,14 +16,14 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**
  * Class representing a PDF Names object
  */
 public class PDFNames extends PDFDictionary {
-    
+
     /**
      * Create the Names object
      */
@@ -39,7 +39,7 @@
     public PDFDests getDests() {
         return (PDFDests)get("Dests");
     }
-    
+
     /**
      * Set the Dests object
      * @param dests the Dests object
@@ -47,5 +47,5 @@
     public void setDests(PDFDests dests) {
         put("Dests", dests);
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNull.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNull.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNull.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNull.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -27,10 +27,10 @@
  * Class representing a PDF name object.
  */
 public final class PDFNull implements PDFWritable {
-    
+
     /** Instance for the "null" object. */
     public static final PDFNull INSTANCE = new PDFNull();
-    
+
     /**
      * Creates a new PDF name object.
      * @param name the name value
@@ -42,10 +42,10 @@
     public String toString() {
         return "null";
     }
-    
+
     /** {@inheritDoc} */
     public void outputInline(OutputStream out, Writer writer) throws IOException {
         writer.write(toString());
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumber.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumber.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumber.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.text.DecimalFormat;
@@ -24,7 +24,7 @@
 import java.util.Locale;
 
 /**
- * This class represents a simple number object. It also contains contains some 
+ * This class represents a simple number object. It also contains contains some
  * utility methods for outputing numbers to PDF.
  */
 public class PDFNumber extends PDFObject {
@@ -38,7 +38,7 @@
     public Number getNumber() {
         return this.number;
     }
-    
+
     /**
      * Sets the number.
      * @param number the number
@@ -69,9 +69,9 @@
 
     // Static cache. Possible concurrency implications. See comment in doubleOut(double, int).
     private static DecimalFormat[] decimalFormatCache = new DecimalFormat[17];
-    
+
     private static final String BASE_FORMAT = "0.################";
-    
+
     /**
      * Output a double value to a string suitable for PDF.
      * In this method it is possible to set the maximum
@@ -83,7 +83,7 @@
      */
     public static String doubleOut(double doubleDown, int dec) {
         if (dec < 0 || dec >= decimalFormatCache.length) {
-            throw new IllegalArgumentException("Parameter dec must be between 1 and " 
+            throw new IllegalArgumentException("Parameter dec must be between 1 and "
                     + (decimalFormatCache.length + 1));
         }
         if (decimalFormatCache[dec] == null) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumberTreeNode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumberTreeNode.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumberTreeNode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumberTreeNode.java Thu Jul 24 02:35:34 2008
@@ -43,7 +43,7 @@
     public void setKids(PDFArray kids) {
         put(KIDS, kids);
     }
-    
+
     /**
      * Returns the Kids array.
      * @return the Kids array
@@ -51,7 +51,7 @@
     public PDFArray getKids() {
         return (PDFArray)get(KIDS);
     }
-    
+
     /**
      * Sets the Nums array.
      * @param nums the Nums array
@@ -59,7 +59,7 @@
     public void setNums(PDFNumsArray nums) {
         put(NUMS, nums);
     }
-    
+
     /**
      * Returns the Nums array.
      * @return the Nums array
@@ -67,7 +67,7 @@
     public PDFNumsArray getNums() {
         return (PDFNumsArray)get(NUMS);
     }
-    
+
     /**
      * Sets the lower limit value of the Limits array.
      * @param key the lower limit value
@@ -116,6 +116,6 @@
         }
         return limits;
     }
-    
+
 }
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumsArray.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumsArray.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumsArray.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumsArray.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -32,7 +32,7 @@
  * Class representing an "Nums" array object (for Number Trees).
  */
 public class PDFNumsArray extends PDFObject {
-    
+
     /** Sorted Map holding the values of this array. */
     protected SortedMap map = new java.util.TreeMap();
 
@@ -51,7 +51,7 @@
     public int length() {
         return this.map.size();
     }
-    
+
     /**
      * Sets an entry.
      * @param key the key of the value to set
@@ -60,7 +60,7 @@
     public void put(int key, Object obj) {
         this.map.put(new Integer(key), obj);
     }
-    
+
     /**
      * Gets an entry.
      * @param key the key of requested value
@@ -69,7 +69,7 @@
     public Object get(int key) {
         return this.map.get(new Integer(key));
     }
-    
+
     /** {@inheritDoc} */
     protected int output(OutputStream stream) throws IOException {
         CountingOutputStream cout = new CountingOutputStream(stream);
@@ -77,7 +77,7 @@
         if (hasObjectNumber()) {
             writer.write(getObjectID());
         }
-        
+
         writer.write('[');
         boolean first = true;
         Iterator iter = this.map.entrySet().iterator();
@@ -92,13 +92,13 @@
             formatObject(entry.getValue(), cout, writer);
         }
         writer.write(']');
-        
+
         if (hasObjectNumber()) {
             writer.write("\nendobj\n");
         }
-        
+
         writer.flush();
         return cout.getCount();
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java
@@ -61,7 +61,7 @@
 
     /** the parent PDFObject (may be null and may not always be set, needed for encryption) */
     private PDFObject parent;
-    
+
     /**
      * Returns the object's number.
      * @return the PDF Object number
@@ -72,14 +72,14 @@
         }
         return this.objnum;
     }
-    
+
     /**
      * Default constructor.
      */
     public PDFObject() {
         //nop
     }
-    
+
     /**
      * Constructor for direct objects.
      * @param parent the containing PDFObject instance
@@ -87,9 +87,9 @@
     public PDFObject(PDFObject parent) {
         setParent(parent);
     }
-    
+
     /**
-     * Indicates whether this PDFObject has already been assigned an 
+     * Indicates whether this PDFObject has already been assigned an
      * object number.
      * @return True if it has an object number
      */
@@ -164,7 +164,7 @@
     public PDFObject getParent() {
         return this.parent;
     }
-    
+
     /**
      * Sets the direct parent object.
      * @param parent the direct parent
@@ -201,7 +201,7 @@
     public PDFReference makeReference() {
         return new PDFReference(this);
     }
-    
+
     /**
      * Write the PDF represention of this object
      *
@@ -224,7 +224,7 @@
             output(out);
         }
     }
-    
+
     /**
      * Encodes the object as a byte array for output to a PDF file.
      *
@@ -233,12 +233,12 @@
     protected byte[] toPDF() {
         return encode(toPDFString());
     }
-    
-    
+
+
     /**
      * This method returns a String representation of the PDF object. The result
-     * is normally converted/encoded to a byte array by toPDF(). Only use 
-     * this method to implement the serialization if the object can be fully 
+     * is normally converted/encoded to a byte array by toPDF(). Only use
+     * this method to implement the serialization if the object can be fully
      * represented as text. If the PDF representation of the object contains
      * binary content use toPDF() or output(OutputStream) instead. This applies
      * to any object potentially containing a string object because string object
@@ -249,7 +249,7 @@
         throw new UnsupportedOperationException("Not implemented. "
                     + "Use output(OutputStream) instead.");
     }
-    
+
     /**
      * Converts text to a byte array for writing to a PDF file.
      * @param text text to convert/encode
@@ -258,7 +258,7 @@
     public static final byte[] encode(String text) {
         return PDFDocument.encode(text);
     }
-    
+
     /**
      * Encodes a Text String (3.8.1 in PDF 1.4 specs)
      * @param text the text to encode
@@ -273,7 +273,7 @@
             return encode(PDFText.escapeText(text, false));
         }
     }
-    
+
     /**
      * Encodes a String (3.2.3 in PDF 1.4 specs)
      * @param string the string to encode
@@ -282,7 +282,7 @@
     protected byte[] encodeString(String string) {
         return encodeText(string);
     }
-    
+
     /**
      * Encodes binary data as hexadecimal string object.
      * @param data the binary data
@@ -299,7 +299,7 @@
         out.write(encoded);
         out.write('>');
     }
-    
+
     /**
      * Formats an object for serialization to PDF.
      * @param obj the object
@@ -329,7 +329,7 @@
             out.write(encodeText(obj.toString()));
         }
     }
-    
+
     /** Formatting pattern for PDF date */
     protected static final SimpleDateFormat DATE_FORMAT;
 
@@ -337,9 +337,9 @@
         DATE_FORMAT = new SimpleDateFormat("'D:'yyyyMMddHHmmss", Locale.ENGLISH);
         DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
     }
-    
+
     /**
-     * Formats a date/time according to the PDF specification 
+     * Formats a date/time according to the PDF specification
      * (D:YYYYMMDDHHmmSSOHH'mm').
      * @param time date/time value to format
      * @param tz the time zone
@@ -348,17 +348,17 @@
     protected String formatDateTime(Date time, TimeZone tz) {
         Calendar cal = Calendar.getInstance(tz, Locale.ENGLISH);
         cal.setTime(time);
-        
+
         int offset = cal.get(Calendar.ZONE_OFFSET);
         offset += cal.get(Calendar.DST_OFFSET);
-        
+
         //DateFormat is operating on GMT so adjust for time zone offset
         Date dt1 = new Date(time.getTime() + offset);
         StringBuffer sb = new StringBuffer();
         sb.append(DATE_FORMAT.format(dt1));
-        
+
         offset /= (1000 * 60); //Convert to minutes
-        
+
         if (offset == 0) {
             sb.append('Z');
         } else {
@@ -392,5 +392,5 @@
     protected String formatDateTime(Date time) {
         return formatDateTime(time, TimeZone.getDefault());
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.ByteArrayOutputStream;
@@ -50,10 +50,10 @@
     private PDFOutline last;
 
     private int count;
-    
+
     // whether to show this outline item's child outline items
     private boolean openItem = false;
-    
+
     /**
      * title to display for the bookmark entry
      */
@@ -158,7 +158,7 @@
                     bout.write(encode(" /Last " + last.referencePDF() + "\n"));
                 }
                 if (count > 0) {
-                    bout.write(encode(" /Count " + (openItem ? "" : "-") 
+                    bout.write(encode(" /Count " + (openItem ? "" : "-")
                         + count + "\n"));
                 }
                 if (actionRef != null) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutputIntent.java Thu Jul 24 02:35:34 2008
@@ -33,14 +33,14 @@
     public static final String GTS_PDFX = "GTS_PDFX";
     /** Subtype for PDF/A-1 output intents */
     public static final String GTS_PDFA1 = "GTS_PDFA1";
-    
+
     private String subtype; //S in the PDF spec
     private String outputCondition;
     private String outputConditionIdentifier;
     private String registryName;
     private String info;
     private PDFICCStream destOutputProfile;
-    
+
 
     /** @return the output intent subtype. */
     public String getSubtype() {
@@ -119,7 +119,7 @@
 
     /**
      * Sets the destination ICC profile.
-     * @param destOutputProfile An ICC profile stream defining the transformation from the PDF 
+     * @param destOutputProfile An ICC profile stream defining the transformation from the PDF
      *                          document's source colors to output device colorants.
      */
     public void setDestOutputProfile(PDFICCStream destOutputProfile) {
@@ -137,33 +137,33 @@
             bout.write(encode("/S /"));
             bout.write(encode(this.subtype));
             bout.write(encode("\n"));
-            
+
             if (outputCondition != null) {
                 bout.write(encode("/OutputCondition "));
                 bout.write(encodeText(this.outputCondition));
                 bout.write(encode("\n"));
             }
-            
+
             bout.write(encode("/OutputConditionIdentifier "));
             bout.write(encodeText(this.outputConditionIdentifier));
             bout.write(encode("\n"));
-            
+
             if (registryName != null) {
                 bout.write(encode("/RegistryName "));
                 bout.write(encodeText(this.registryName));
                 bout.write(encode("\n"));
             }
-    
+
             if (info != null) {
                 bout.write(encode("/Info "));
                 bout.write(encodeText(this.info));
                 bout.write(encode("\n"));
             }
-    
+
             if (destOutputProfile != null) {
                 bout.write(encode("/DestOutputProfile " + destOutputProfile.referencePDF() + "\n"));
             }
-    
+
             bout.write(encode(">>\nendobj\n"));
         } catch (IOException ioe) {
             log.error("Ignored I/O exception", ioe);
@@ -171,5 +171,5 @@
         return bout.toByteArray();
     }
 
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.awt.geom.Rectangle2D;
@@ -33,7 +33,7 @@
 
     /** the page index (zero-based) */
     protected int pageIndex;
-    
+
     /**
      * Create a /Page object
      *
@@ -75,12 +75,12 @@
         setBleedBox(box); //Recommended by PDF/X
         setTrimBox(box); //Needed for PDF/X
     }
-    
+
     private PDFArray toPDFArray(Rectangle2D box) {
         return new PDFArray(this, new double[] {
                 box.getX(), box.getY(), box.getMaxX(), box.getMaxY()});
     }
-    
+
     /**
      * Sets the "MediaBox" entry
      * @param box the media rectangle
@@ -88,7 +88,7 @@
     public void setMediaBox(Rectangle2D box) {
         put("MediaBox", toPDFArray(box));
     }
-    
+
     /**
      * Sets the "TrimBox" entry
      * @param box the trim rectangle
@@ -96,7 +96,7 @@
     public void setTrimBox(Rectangle2D box) {
         put("TrimBox", toPDFArray(box));
     }
-    
+
     /**
      * Sets the "BleedBox" entry
      * @param box the bleed rectangle
@@ -104,7 +104,7 @@
     public void setBleedBox(Rectangle2D box) {
         put("BleedBox", toPDFArray(box));
     }
-    
+
     /**
      * set this page contents
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPageLabels.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPageLabels.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPageLabels.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPageLabels.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,14 +16,14 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**
  * Class representing a PDF /PageLabels dictionary.
  */
 public class PDFPageLabels extends PDFNumberTreeNode {
-    
+
     /**
      * Create the /PageLabels dictionary
      */
@@ -44,5 +44,5 @@
         }
         return nums;
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java
@@ -67,7 +67,7 @@
         page.setParent(this);
         this.incrementCount();
     }
-    
+
     /**
      * Use this method to notify the PDFPages object that a child page
      * @param page the child page
@@ -79,7 +79,7 @@
                 this.kids.add(null);
             }
             if (this.kids.get(idx) != null) {
-                throw new IllegalStateException("A page already exists at index " 
+                throw new IllegalStateException("A page already exists at index "
                         + idx + " (zero-based).");
             }
             this.kids.set(idx, page.referencePDF());

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPathPaint.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPathPaint.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPathPaint.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPathPaint.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java
@@ -118,8 +118,8 @@
      * @param thePatternDataStream The stream of pattern data to be tiled.
      */
     public PDFPattern(PDFResources theResources, int thePatternType,    // 1
-                      int thePaintType, int theTilingType, List theBBox, 
-                      double theXStep, double theYStep, 
+                      int thePaintType, int theTilingType, List theBBox,
+                      double theXStep, double theYStep,
                       List theMatrix, List theXUID,
                       StringBuffer thePatternDataStream) {
         super();
@@ -272,9 +272,9 @@
                 pdfStream.setDocument(getDocumentSafely());
                 pdfStream.add(this.patternDataStream.toString());
                 pdfStream.getFilterList().addDefaultFilters(
-                        getDocument().getFilterMap(), 
+                        getDocument().getFilterMap(),
                         PDFFilterList.CONTENT_FILTER);
-                encodedStream = pdfStream.encodeStream();        
+                encodedStream = pdfStream.encodeStream();
                 p.append(pdfStream.getFilterList().buildFilterDictEntries());
                 p.append("/Length " + (encodedStream.getSize() + 1)
                          + " \n");

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFProfile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFProfile.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFProfile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFProfile.java Thu Jul 24 02:35:34 2008
@@ -26,25 +26,25 @@
  * the libarary and its users to enable the generation of PDFs conforming to the enabled PDF
  * profiles.
  * <p>
- * Some profile from PDF/X and PDF/A can be active simultaneously (example: PDF/A-1 and 
+ * Some profile from PDF/X and PDF/A can be active simultaneously (example: PDF/A-1 and
  * PDF/X-3:2003).
  */
 public class PDFProfile {
 
     /**
-     * Indicates the PDF/A mode currently active. Defaults to "no restrictions", i.e. 
+     * Indicates the PDF/A mode currently active. Defaults to "no restrictions", i.e.
      * PDF/A not active.
      */
     protected PDFAMode pdfAMode = PDFAMode.DISABLED;
-    
+
     /**
-     * Indicates the PDF/X mode currently active. Defaults to "no restrictions", i.e. 
+     * Indicates the PDF/X mode currently active. Defaults to "no restrictions", i.e.
      * PDF/X not active.
      */
     protected PDFXMode pdfXMode = PDFXMode.DISABLED;
-    
+
     private PDFDocument doc;
-    
+
     /**
      * Main constructor
      * @param doc the PDF document
@@ -52,7 +52,7 @@
     public PDFProfile(PDFDocument doc) {
         this.doc = doc;
     }
-    
+
     /**
      * Validates if the requested profile combination is compatible.
      */
@@ -69,22 +69,22 @@
             }
         }
     }
-    
+
     /** @return the PDFDocument this profile is attached to */
     public PDFDocument getDocument() {
         return this.doc;
     }
-    
+
     /** @return the PDF/A mode */
     public PDFAMode getPDFAMode() {
         return this.pdfAMode;
     }
-    
+
     /** @return true if any PDF/A mode is active */
     public boolean isPDFAActive() {
         return getPDFAMode() != PDFAMode.DISABLED;
     }
-    
+
     /**
      * Sets the PDF/A mode
      * @param mode the PDF/A mode
@@ -96,17 +96,17 @@
         this.pdfAMode = mode;
         validateProfileCombination();
     }
-    
+
     /** @return the PDF/X mode */
     public PDFXMode getPDFXMode() {
         return this.pdfXMode;
     }
-    
+
     /** @return true if any PDF/X mode is active */
     public boolean isPDFXActive() {
         return getPDFXMode() != PDFXMode.DISABLED;
     }
-    
+
     /**
      * Sets the PDF/X mode
      * @param mode the PDF/X mode
@@ -133,13 +133,13 @@
         }
         return sb.toString();
     }
-    
+
     //---------=== Info and validation methods ===---------
-    
+
     private String format(String pattern, Object arg) {
         return MessageFormat.format(pattern, new Object[] {arg});
     }
-    
+
     /** Checks if encryption is allowed. */
     public void verifyEncryptionAllowed() {
         final String err = "{0} doesn't allow encrypted PDFs";
@@ -170,11 +170,11 @@
     public void verifyTransparencyAllowed(String context) {
         final String err = "{0} does not allow the use of transparency. ({1})";
         if (isPDFAActive()) {
-            throw new PDFConformanceException(MessageFormat.format(err, 
+            throw new PDFConformanceException(MessageFormat.format(err,
                     new Object[] {getPDFAMode(), context}));
         }
         if (isPDFXActive()) {
-            throw new PDFConformanceException(MessageFormat.format(err, 
+            throw new PDFConformanceException(MessageFormat.format(err,
                     new Object[] {getPDFXMode(), context}));
         }
     }
@@ -182,16 +182,16 @@
     /** Checks if the right PDF version is set. */
     public void verifyPDFVersion() {
         final String err = "PDF version must be 1.4 for {0}";
-        if (getPDFAMode().isPDFA1LevelB() 
+        if (getPDFAMode().isPDFA1LevelB()
                 && getDocument().getPDFVersion() != PDFDocument.PDF_VERSION_1_4) {
             throw new PDFConformanceException(format(err, getPDFAMode()));
         }
-        if (getPDFXMode() == PDFXMode.PDFX_3_2003 
+        if (getPDFXMode() == PDFXMode.PDFX_3_2003
                 && getDocument().getPDFVersion() != PDFDocument.PDF_VERSION_1_4) {
             throw new PDFConformanceException(format(err, getPDFXMode()));
         }
     }
-    
+
     /** @return true if the ID entry must be present in the trailer. */
     public boolean isIDEntryRequired() {
         return isPDFAActive() || isPDFXActive();
@@ -224,7 +224,7 @@
     public boolean isAnnotationAllowed() {
         return !isPDFXActive();
     }
-    
+
     /** Checks if annotations are allowed. */
     public void verifyAnnotAllowed() {
         if (!isAnnotationAllowed()) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRectangle.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -32,11 +32,11 @@
  * PDF file.
  */
 public class PDFReference implements PDFWritable {
-    
+
     private String indirectReference;
-    
+
     private Reference objReference;
-    
+
     /**
      * Creates a new PDF reference.
      * @param obj the object to be referenced
@@ -45,7 +45,7 @@
         this.indirectReference = obj.referencePDF();
         this.objReference = new SoftReference(obj);
     }
-    
+
     /**
      * Creates a new PDF reference, but without a reference to the original object.
      * @param ref an object reference
@@ -72,15 +72,15 @@
             return null;
         }
     }
-    
+
     /** {@inheritDoc} */
     public String toString() {
         return this.indirectReference;
     }
-    
+
     /** {@inheritDoc} */
     public void outputInline(OutputStream out, Writer writer) throws IOException {
         writer.write(toString());
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResourceContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResourceContext.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResourceContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResourceContext.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.util.HashMap;
@@ -67,10 +67,10 @@
 
     /** Map of color spaces (key: color space name) */
     protected Map colorSpaces = new HashMap();
-    
+
     /** Map of ICC color spaces (key: ICC profile description) */
     protected Map iccColorSpaces = new HashMap();
-    
+
     /**
      * create a /Resources object.
      *
@@ -93,7 +93,7 @@
 
     /**
      * Add the fonts in the font info to this PDF document's Font Resources.
-     * 
+     *
      * @param doc PDF document to add fonts to
      * @param fontInfo font info object to get font information from
      */
@@ -103,7 +103,7 @@
         while (e.hasNext()) {
             String f = (String)e.next();
             Typeface font = (Typeface)usedFonts.get(f);
-            
+
             //Check if the font actually had any mapping operations. If not, it is an indication
             //that it has never actually been used and therefore doesn't have to be embedded.
             if (font.hadMappingOperations()) {
@@ -159,7 +159,7 @@
 
     /**
      * Add a ColorSpace dictionary to the resources.
-     * @param colorSpace the color space 
+     * @param colorSpace the color space
      */
     public void addColorSpace(PDFICCBasedColorSpace colorSpace) {
         this.colorSpaces.put(colorSpace.getName(), colorSpace);

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**
@@ -50,7 +50,7 @@
         new PDFName("UseThumbs"),
         new PDFName("FullScreen"),
     };
-    
+
     /**
      * create a Root (/Catalog) object. NOTE: The PDFRoot
      * object must be created before the PDF document is
@@ -94,7 +94,7 @@
             return PAGEMODE_USENONE;
         }
     }
-    
+
     /**
      * add a /Page object to the root /Pages object
      *
@@ -123,7 +123,7 @@
         PDFReference ref = (PDFReference)get("Pages");
         return (ref != null ? (PDFPages)ref.getObject() : null);
     }
-    
+
     /**
      * Sets the /PageLabels object.
      * @param pageLabels the /PageLabels object
@@ -131,7 +131,7 @@
     public void setPageLabels(PDFPageLabels pageLabels) {
         put("PageLabels", pageLabels.makeReference());
     }
-    
+
     /**
      * Returns the /PageLabels object.
      * @return the /PageLabels object if set, null otherwise.
@@ -141,7 +141,7 @@
         PDFReference ref = (PDFReference)get("PageLabels");
         return (ref != null ? (PDFPageLabels)ref.getObject() : null);
     }
-    
+
     /**
      * Set the root outline for the PDF document.
      *
@@ -149,7 +149,7 @@
      */
     public void setRootOutline(PDFOutline out) {
         put("Outlines", out.makeReference());
-        
+
         //Set /PageMode to /UseOutlines by default if no other mode has been set
         PDFName mode = (PDFName)get("PageMode");
         if (mode == null) {
@@ -166,7 +166,7 @@
         PDFReference ref = (PDFReference)get("Outlines");
         return (ref != null ? (PDFOutline)ref.getObject() : null);
     }
-    
+
     /**
      * Set the /Names object.
      * @param names the Names object
@@ -175,7 +175,7 @@
     public void setNames(PDFNames names) {
         put("Names", names.makeReference());
     }
-    
+
     /**
      * Returns the /Names object.
      * @return the Names object if set, null otherwise.
@@ -185,7 +185,7 @@
         PDFReference ref = (PDFReference)get("Names");
         return (ref != null ? (PDFNames)ref.getObject() : null);
     }
-    
+
     /**
      * Set the optional Metadata object.
      * @param meta the Metadata object
@@ -196,7 +196,7 @@
             put("Metadata", meta.makeReference());
         }
     }
-    
+
     /**
      * Returns the /Metadata object
      * @return the /Metadata object if set, null otherwise.
@@ -215,7 +215,7 @@
     public PDFArray getOutputIntents() {
         return (PDFArray)get("OutputIntents");
     }
-    
+
     /**
      * Adds an OutputIntent to the PDF
      * @param outputIntent the OutputIntent dictionary
@@ -223,7 +223,7 @@
      */
     public void addOutputIntent(PDFOutputIntent outputIntent) {
         if (getDocumentSafely().getPDFVersion() >= PDFDocument.PDF_VERSION_1_4) {
-            PDFArray outputIntents = getOutputIntents(); 
+            PDFArray outputIntents = getOutputIntents();
             if (outputIntents == null) {
                 outputIntents = new PDFArray(this);
                 put("OutputIntents", outputIntents);
@@ -231,7 +231,7 @@
             outputIntents.add(outputIntent);
         }
     }
-    
+
     /**
      * Returns the language identifier of the document.
      * @return the language identifier of the document (or null if not set or undefined)
@@ -240,7 +240,7 @@
     public String getLanguage() {
         return (String)get("Lang");
     }
-    
+
     /**
      * Sets the language identifier of the document.
      * @param lang the language identifier of the document.
@@ -251,5 +251,5 @@
         }
         put("Lang", lang);
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java...
@@ -338,7 +338,7 @@
         int vectorSize;
         int tempInt;
         StringBuffer p = new StringBuffer(128);
-        p.append(getObjectID() 
+        p.append(getObjectID()
             + "<< \n/ShadingType " + this.shadingType + " \n");
         if (this.colorSpace != null) {
             p.append("/ColorSpace /"

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFState.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFState.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.Serializable;
@@ -50,7 +50,7 @@
 public class PDFState {
 
     private Data data = new Data();
-    
+
     private List stateStack = new java.util.ArrayList();
 
     /**
@@ -82,7 +82,7 @@
     public Data getData() {
         return data;
     }
-    
+
     /**
      * Pop the state from the stack and set current values to popped state.
      * This should be called when a Q operator is used so
@@ -154,7 +154,7 @@
             return false;
         }
     }
-    
+
     /**
      * Set the current color.
      * Check if the new color is a change and then set the current color.
@@ -272,7 +272,7 @@
     public void setTransform(AffineTransform tf) {
         concatenate(tf);
     }
-    
+
     /**
      * Concatenates the given AffineTransform to the current one.
      * @param tf the transform to concatenate to the current level transform
@@ -343,9 +343,9 @@
 
         return newstate;
     }
-    
+
     public class Data implements Cloneable, Serializable {
-        
+
         public Color color = Color.black;
         public Color backcolor = Color.black;
         public Paint paint = null;
@@ -363,7 +363,7 @@
         public Shape clip = null;
         public PDFGState gstate = null;
 
-        
+
         /** {@inheritDoc} */
         public Object clone() throws CloneNotSupportedException {
             Data obj = new Data();
@@ -385,7 +385,7 @@
             obj.gstate = this.gstate;
             return obj;
         }
-        
+
         /**
          * Get the current Transform.
          */
@@ -407,7 +407,7 @@
         public void concatenate(AffineTransform at) {
             transform.concatenate(at);
         }
-        
+
         /** {@inheritDoc} */
         public String toString() {
             return super.toString() + ", " + this.transform;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -32,14 +32,14 @@
  * length.
  */
 public class PDFStream extends AbstractPDFStream {
-    
+
     /**
      * The stream of PDF commands
      */
     protected StreamCache data;
 
     private transient Writer streamWriter;
-    
+
     /**
      * Create an empty stream object
      */
@@ -70,11 +70,11 @@
             ex.printStackTrace();
         }
     }
-    
+
     private void flush() throws IOException {
         this.streamWriter.flush();
     }
-    
+
     /**
      * Returns a Writer that writes to the OutputStream of the buffer.
      * @return the Writer
@@ -95,7 +95,7 @@
         }
         return this.data.getOutputStream();
     }
-    
+
     /**
      * Used to set the contents of the PDF stream.
      * @param data the contents as a byte array
@@ -138,7 +138,7 @@
      */
     protected int output(OutputStream stream) throws IOException {
         final int len = super.output(stream);
-        
+
         //Now that the data has been written, it can be discarded.
         this.data = null;
         return len;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFT1Stream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFT1Stream.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFT1Stream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFT1Stream.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java
@@ -29,7 +29,7 @@
  * Special PDFStream for embedding Type 1 fonts.
  */
 public class PDFT1Stream extends AbstractPDFStream {
-    
+
     private PFBData pfb;
 
     /**
@@ -76,9 +76,9 @@
     protected void outputRawStreamData(OutputStream out) throws IOException {
         this.pfb.outputAllParts(out);
     }
-    
+
     /**
-     * Used to set the PFBData object that represents the embeddable Type 1 
+     * Used to set the PFBData object that represents the embeddable Type 1
      * font.
      * @param pfb The PFB file
      * @throws IOException in case of an I/O problem

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTTFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTTFStream.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTTFStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTTFStream.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -25,7 +25,7 @@
  * Special PDFStream for embeddable TrueType fonts.
  */
 public class PDFTTFStream extends PDFStream {
-    
+
     private int origLength;
 
     /**
@@ -58,7 +58,7 @@
         put("Length1", origLength);
         super.populateStreamDict(lengthEntry);
     }
-    
+
     /**
      * Sets the TrueType font data.
      * @param data the font payload

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.ByteArrayOutputStream;
@@ -24,15 +24,15 @@
 import org.apache.avalon.framework.CascadingRuntimeException;
 
 /**
- * This class represents a simple number object. It also contains contains some 
+ * This class represents a simple number object. It also contains contains some
  * utility methods for outputting numbers to PDF.
  */
 public class PDFText extends PDFObject {
 
-    private static final char[] DIGITS 
+    private static final char[] DIGITS
                                = {'0', '1', '2', '3', '4', '5', '6', '7',
                                   '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-                                  
+
     private String text;
 
     /**
@@ -42,7 +42,7 @@
     public String getText() {
         return this.text;
     }
-    
+
     /**
      * Sets the text.
      * @param text the text
@@ -97,7 +97,7 @@
                     }
                 }
             }
-            
+
             if (hexMode) {
                 final byte[] uniBytes;
                 try {
@@ -114,7 +114,7 @@
                 if (unicode) {
                     // byte order marker (0xfeff)
                     result.append("\\376\\377");
-                    
+
                     for (int i = 0; i < l; i++) {
                         final char ch = text.charAt(i);
                         final int high = (ch & 0xff00) >>> 8;
@@ -162,7 +162,7 @@
         }
         return sb.toString();
     }
-    
+
     /**
      * Converts a byte array to a Hexadecimal String (3.2.3 in PDF 1.4 specs)
      * @param data the data to encode
@@ -171,7 +171,7 @@
     public static final String toHex(byte[] data) {
         return toHex(data, true);
     }
-    
+
     /**
      * Converts a String to UTF-16 (big endian).
      * @param text text to convert
@@ -206,7 +206,7 @@
         }
         return buf.toString();
     }
-    
+
     /**
      * Escaped a String as described in section 4.4 in the PDF 1.3 specs.
      * @param s String to escape

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,9 +27,9 @@
  */
 public abstract class PDFTextUtil {
 
-    /** The number of decimal places. */ 
+    /** The number of decimal places. */
     private static final int DEC = 8;
-    
+
     /** PDF text rendering mode: Fill text */
     public static final int TR_FILL = 0;
     /** PDF text rendering mode: Stroke text */
@@ -46,30 +46,30 @@
     public static final int TR_FILL_STROKE_CLIP = 6;
     /** PDF text rendering mode: Add text to path for clipping */
     public static final int TR_CLIP = 7;
-    
+
     private boolean inTextObject = false;
     private String startText;
     private String endText;
     private boolean useMultiByte;
     private StringBuffer bufTJ;
     private int textRenderingMode = TR_FILL;
-    
+
     private String currentFontName;
     private double currentFontSize;
-    
+
     /**
      * Main constructor.
      */
     public PDFTextUtil() {
         //nop
     }
-    
+
     /**
      * Writes PDF code.
      * @param code the PDF code to write
      */
     protected abstract void write(String code);
-    
+
     private void writeAffineTransform(AffineTransform at, StringBuffer sb) {
         double[] lt = new double[6];
         at.getMatrix(lt);
@@ -100,13 +100,13 @@
             sb.append(PDFText.toUnicodeHex(ch));
         }
     }
-    
+
     private void checkInTextObject() {
         if (!inTextObject) {
             throw new IllegalStateException("Not in text object");
         }
     }
-    
+
     /**
      * Indicates whether we are in a text object or not.
      * @return true if we are in a text object
@@ -114,7 +114,7 @@
     public boolean isInTextObject() {
         return inTextObject;
     }
-    
+
     /**
      * Called when a new text object should be started. Be sure to call setFont() before
      * issuing any text painting commands.
@@ -126,7 +126,7 @@
         write("BT\n");
         this.inTextObject = true;
     }
-    
+
     /**
      * Called when a text object should be ended.
      */
@@ -136,7 +136,7 @@
         this.inTextObject = false;
         initValues();
     }
-    
+
     /**
      * Resets the state fields.
      */
@@ -145,14 +145,14 @@
         this.currentFontSize = 0.0;
         this.textRenderingMode = TR_FILL;
     }
-    
+
     /**
      * Creates a "q" command, pushing a copy of the entire graphics state onto the stack.
      */
     public void saveGraphicsState() {
         write("q\n");
     }
-    
+
     /**
      * Creates a "Q" command, restoring the entire graphics state to its former value by popping
      * it from the stack.
@@ -160,7 +160,7 @@
     public void restoreGraphicsState() {
         write("Q\n");
     }
-    
+
     /**
      * Creates a "cm" command.
      * @param at the transformation matrix
@@ -174,7 +174,7 @@
             write(sb.toString());
         }
     }
-    
+
     /**
      * Writes a "Tf" command, setting a new current font.
      * @param fontName the name of the font to select
@@ -183,7 +183,7 @@
     public void writeTf(String fontName, double fontSize) {
         checkInTextObject();
         write("/" + fontName + " " + PDFNumber.doubleOut(fontSize) + " Tf\n");
-        
+
         this.startText = useMultiByte ? "<" : "(";
         this.endText = useMultiByte ? ">" : ")";
     }
@@ -220,7 +220,7 @@
             write(this.textRenderingMode + " Tr\n");
         }
     }
-    
+
     /**
      * Sets the text rendering mode.
      * @param fill true if the text should be filled
@@ -239,7 +239,7 @@
         }
         setTextRenderingMode(mode);
     }
-    
+
     /**
      * Writes a "Tm" command, setting a new text transformation matrix.
      * @param localTransform the new text transformation matrix

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -61,9 +61,9 @@
     protected CMapBuilder createCMapBuilder(Writer writer) {
         return new ToUnicodeCMapBuilder(writer);
     }
-    
+
     class ToUnicodeCMapBuilder extends CMapBuilder {
-        
+
         public ToUnicodeCMapBuilder(Writer writer) {
             super(writer, null);
         }
@@ -82,7 +82,7 @@
             writeBFEntries();
             writeWrapUp();
         }
-        
+
         /**
          * Writes the character mappings for this font.
          * @param p StingBuffer to write to
@@ -99,7 +99,7 @@
          * expressed as part of a character range).
          * @param p StringBuffer to write to
          * @param charArray all the characters to map
-         * @throws IOException 
+         * @throws IOException
          */
         protected void writeBFCharEntries(char[] charArray) throws IOException {
             int totalEntries = 0;
@@ -136,7 +136,7 @@
          * Writes the entries for character ranges for a base font.
          * @param p StringBuffer to write to
          * @param charArray all the characters to map
-         * @throws IOException 
+         * @throws IOException
          */
         protected void writeBFRangeEntries(char[] charArray) throws IOException {
             int totalEntries = 0;
@@ -283,6 +283,6 @@
             return returnString.toString();
         }
 
-    }    
-    
+    }
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFUri.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFUri.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFUri.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFUri.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFWArray.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFWArray.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFWArray.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFWArray.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.util.List;
@@ -31,12 +31,12 @@
      */
     private List entries = new java.util.ArrayList();
 
-    /** 
-     * Default constructor 
+    /**
+     * Default constructor
      */
     public PDFWArray() {
     }
-    
+
     /**
      * Convenience constructor
      * @param metrics the metrics array to initially add

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFWritable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFWritable.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFWritable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFWritable.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -28,7 +28,7 @@
  * serializing the object or by writing a indirect reference to the actual object.
  */
 public interface PDFWritable {
-    
+
     /**
      * Writes a "direct object" (inline object) representation to the stream. A Writer is given
      * for optimized encoding of text content. Since the Writer is buffered, make sure
@@ -38,5 +38,5 @@
      * @throws IOException if an I/O error occurs
      */
     void outputInline(OutputStream out, Writer writer) throws IOException;
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXMode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXMode.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXMode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXMode.java Thu Jul 24 02:35:34 2008
@@ -26,7 +26,7 @@
     public static final PDFXMode DISABLED = new PDFXMode("PDF/X disabled");
     /** PDF/X-3:2003 enabled */
     public static final PDFXMode PDFX_3_2003 = new PDFXMode("PDF/X-3:2003");
-    
+
     private String name;
 
     /**
@@ -41,7 +41,7 @@
     public String getName() {
         return this.name;
     }
-    
+
     /**
      * Returns the mode enum object given a String.
      * @param s the string
@@ -54,10 +54,10 @@
             return DISABLED;
         }
     }
-    
+
     /** {@inheritDoc} */
     public String toString() {
         return name;
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXObject.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXObject.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java
@@ -33,7 +33,7 @@
  * document in another place.
  */
 public abstract class PDFXObject extends AbstractPDFStream {
-    
+
     /**
      * Create an XObject with the given number.
      */
@@ -48,13 +48,13 @@
     public PDFName getName() {
         return (PDFName)get("Name");
     }
-    
+
     /** {@inheritDoc} */
     protected void populateStreamDict(Object lengthEntry) {
         put("Type", new PDFName("XObject"));
         super.populateStreamDict(lengthEntry);
     }
-    
+
     /** {@inheritDoc} */
     protected int getSizeHint() throws IOException {
         return 0;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/StreamCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/StreamCache.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/StreamCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/StreamCache.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.OutputStream;



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message