Merged changes from trunk up to revision 1343133

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript@1343310 13f79535-47bb-0310-9956-ffa450edef68

diff --cc build.xml
Simple merge

diff --cc lib/xmlgraphics-commons-1.5svn.jar
index 5d555e348ddfa21f4e371c344dc662616f5311cd,d8c5e0989d04200604df7817be3c4f5150b9a29f..88f8d20757909d1378886817cb09240d27b43693
Binary files differ

diff --cc src/java/org/apache/fop/fonts/truetype/TTFFile.java
index 5860e5cd525d584c95de8465830ea4b91499e48c,65ab560cf3945f19d95b422a31639966634ca869..f80226e26937faa086fbb694b592130cca240ef3
--- 1/src/java/org/apache/fop/fonts/truetype/TTFFile.java
--- 2/src/java/org/apache/fop/fonts/truetype/TTFFile.java
+++ b/src/java/org/apache/fop/fonts/truetype/TTFFile.java
@@@ -533,22 -420,12 +533,10 @@@ public class TTFFile 
                              unicodeMappings.add(new UnicodeMapping(glyphIdx, j));
                              mtxTab[glyphIdx].getUnicodeIndex().add(new Integer(j));
  
-                             if (encodingID == 0 && j >= 0xF020 && j <= 0xF0FF) {
-                                 //Experimental: Mapping 0xF020-0xF0FF to 0x0020-0x00FF
-                                 //Tested with Wingdings and Symbol TTF fonts which map their
-                                 //glyphs in the region 0xF020-0xF0FF.
-                                 int mapped = j - 0xF000;
-                                 if (!eightBitGlyphs.get(mapped)) {
-                                     //Only map if Unicode code point hasn't been mapped before
-                                     unicodeMappings.add(new UnicodeMapping(glyphIdx, mapped));
-                                     mtxTab[glyphIdx].getUnicodeIndex().add(new Integer(mapped));
-                                 }
-                             }
- 
                              // Also add winAnsiWidth
 -                            List v = (List)ansiIndex.get(new Integer(j));
 +                            List<Integer> v = ansiIndex.get(new Integer(j));
                              if (v != null) {
 -                                Iterator e = v.listIterator();
 -                                while (e.hasNext()) {
 -                                    Integer aIdx = (Integer)e.next();
 +                                for (Integer aIdx : v) {
                                      ansiWidth[aIdx.intValue()]
                                          = mtxTab[glyphIdx].getWx();
  

diff --cc src/java/org/apache/fop/render/ps/PSDocumentHandler.java
index 01c93cb2d9897e93cb03cc77d6c33f3446834b80,95647d820088beda18a98f56da940aaa4a53c1f1..de82a3098b8833e78af79bed162b64151d9da23e
--- 1/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
--- 2/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
+++ b/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
@@@ -103,9 -104,8 +105,10 @@@ public class PSDocumentHandler extends 
      private static final int COMMENT_DOCUMENT_HEADER = 0;
      private static final int COMMENT_DOCUMENT_TRAILER = 1;
      private static final int COMMENT_PAGE_TRAILER = 2;
+     private static final int PAGE_TRAILER_CODE_BEFORE = 3;
  
 +    private PSEventProducer eventProducer;
 +
      /**
       * Default constructor.
       */

diff --cc src/java/org/apache/fop/render/ps/PSPainter.java
Simple merge