Merged revisions 593297-597199 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r593452 | jeremias | 2007-11-09 09:33:52 +0100 (Fri, 09 Nov 2007) | 1 line
  
  Bugfix: An invalid PDF was created if a grayscale JPEG image with an sRGB profile was embedded undecoded. I didn't find any other way than to disable the the ICC profile in this case.
........
  r593573 | jeremias | 2007-11-09 16:54:11 +0100 (Fri, 09 Nov 2007) | 1 line
  
  Attempt to shed light on what this method does.
........
  r593909 | jeremias | 2007-11-11 16:30:34 +0100 (Sun, 11 Nov 2007) | 3 lines
  
  Bugzilla #43835:
  Bugfix: Use Font.getName() (logical font name) instead of Font.getFontName() (localized) when registering fonts from AWT.
  Submitted by: David Churavy <churavy.at.kadel.cz>
........
  r594046 | jeremias | 2007-11-12 09:27:46 +0100 (Mon, 12 Nov 2007) | 1 line
  
  Issue a clear warning if the selected hyphenation character is not available in a font. Otherwise you'd just get a "glyph not available" error and you wonder why the hell FOP wants to use that character.
........
  r594054 | jeremias | 2007-11-12 09:52:11 +0100 (Mon, 12 Nov 2007) | 1 line
  
  Better solution for missing hyphenation character problem.
........
  r594067 | jeremias | 2007-11-12 10:40:16 +0100 (Mon, 12 Nov 2007) | 2 lines
  
  Avoid null values in generated Font classes so the encoding can be inspected.
  Don't warn about missing hyphenation characters for fonts such as Symbol and ZapfDingbats which don't have the default hyphenation character.
........
  r594079 | vhennebert | 2007-11-12 11:40:21 +0100 (Mon, 12 Nov 2007) | 2 lines
  
  Use tableLM instead of the primary grid unit to retrieve the Table fobj
........
  r594223 | cbowditch | 2007-11-12 18:25:41 +0100 (Mon, 12 Nov 2007) | 1 line
  
  bug fix: avoid NPE when GC has removed a weak reference in the Property Cache
........
  r594509 | jeremias | 2007-11-13 13:35:31 +0100 (Tue, 13 Nov 2007) | 1 line
  
  Expose a method so I can easily extract the renderer configuration from outside the rendering domain (for a test tool).
........
  r594512 | jeremias | 2007-11-13 13:40:38 +0100 (Tue, 13 Nov 2007) | 4 lines
  
  Improved PFM loading:
  - Fixed bug with Flags (resulted in bad PDFs for certain fonts)
  - Warn about possible charset problems.
  - Fixed bug for "last char" (probably a copy/paste mistake)
........
  r594513 | jeremias | 2007-11-13 13:41:24 +0100 (Tue, 13 Nov 2007) | 1 line
  
  Some TTF fonts don't have a PostScript name, so just emulate it in this case to avoid problems with font lookup further down.
........
  r594515 | jeremias | 2007-11-13 13:42:35 +0100 (Tue, 13 Nov 2007) | 2 lines
  
  Better error messages in fontLookup().
  Expose font triplets to the outside (used by a test tool I wrote).
........
  r594516 | jeremias | 2007-11-13 13:44:29 +0100 (Tue, 13 Nov 2007) | 2 lines
  
  Filter single quotes from the filenames as this will interfere with font-family parsing.
  Fixed bug: InputStream opened by URL.openConnection() wasn't closed which leads to "too many open files" when you have lots of fonts on Java 1.4.
........
  r594517 | jeremias | 2007-11-13 13:45:15 +0100 (Tue, 13 Nov 2007) | 1 line
  
  Log element list length for convenience.
........
  r594522 | jeremias | 2007-11-13 14:07:33 +0100 (Tue, 13 Nov 2007) | 1 line
  
  More informative overflow message (sometimes the overflow is just a few millipoints and it's nice to know how many).
........
  r594552 | jeremias | 2007-11-13 15:37:00 +0100 (Tue, 13 Nov 2007) | 1 line
  
  Fix two javadoc warnings.
........
  r594571 | vhennebert | 2007-11-13 17:24:32 +0100 (Tue, 13 Nov 2007) | 7 lines
  
  Moved the creation of grid units to the FO tree building stage. Brought a few improvements along with the move:
  - bugfix: border-resolution for border-end on row-spanning cells was wrong
  - bugfix: in case of missing cells the border-end of the table was applied to an inner cell, instead of the cell in the last column (but missing cells aren't painted yet :-\)
  - bugfix: in collapsing-border model, border-before and -after specified on table-column were applied to every cell of the column, instead of only the first and the last ones
  - border resolution is now made progressively when possible, and no longer triggers the fetching of all the rows of the table
  Added testcases for the border conflict resolution (between the various elements of a table and not only the cells)
........
  r594578 | vhennebert | 2007-11-13 17:50:09 +0100 (Tue, 13 Nov 2007) | 2 lines
  
  Moved *GridUnit from layoutmgr/table to fo/flow/table
........
  r594579 | vhennebert | 2007-11-13 17:55:54 +0100 (Tue, 13 Nov 2007) | 2 lines
  
  Changed back visibility of fields from public to package-private, due to the move of *GridUnit in the fo.flow.table package
........
  r594584 | vhennebert | 2007-11-13 18:13:19 +0100 (Tue, 13 Nov 2007) | 2 lines
  
  Use a singleton for a default BorderInfo of style none, instead of every time a new instance
........
  r594592 | vhennebert | 2007-11-13 18:39:17 +0100 (Tue, 13 Nov 2007) | 2 lines
  
  Cleaned up RowGroupLayoutManager and TableRowIterator
........
  r594821 | vhennebert | 2007-11-14 11:18:45 +0100 (Wed, 14 Nov 2007) | 2 lines
  
  Moved EffRow to the fo.flow.table package
........
  r594829 | vhennebert | 2007-11-14 11:41:52 +0100 (Wed, 14 Nov 2007) | 2 lines
  
  Reduced visibility of some methods and constructors from public to package-private, as a consequence of the move of *GridUnit to the fo.flow.table package
........
  r594836 | vhennebert | 2007-11-14 12:14:03 +0100 (Wed, 14 Nov 2007) | 2 lines
  
  Restored the setting of the parent table-row element on grid units
........
  r594852 | vhennebert | 2007-11-14 13:21:53 +0100 (Wed, 14 Nov 2007) | 2 lines
  
  Restored the setting of rowIndex on primary grid units (although testcases were already working...)
........
  r595297 | jeremias | 2007-11-15 14:28:58 +0100 (Thu, 15 Nov 2007) | 2 lines
  
  Bugzilla #43143:
  Had to remove the Expert(Subset) Encoding detection as this caused problems with a barcode font that used dfCharset=2 but was not using ExpertSubset encoding. To detect Expert(Subset)Encoding, the AFM needs to be parsed. And since we don't support that encoding, yet, the fallback to WinAnsiEncoding should work well enough.
........
  r595637 | acumiskey | 2007-11-16 13:12:52 +0100 (Fri, 16 Nov 2007) | 3 lines
  
  This should improve the ability of the FontLoader when resolving PFM files
  for Type 1 fonts on case sensitive Unix systems.
........
  r596072 | jeremias | 2007-11-18 11:48:53 +0100 (Sun, 18 Nov 2007) | 4 lines
  
  ApacheCon US is over.
  OSSSummit was cancelled/postponed.
  Added example for total page count using XSL 1.1
  Adjusted total page count example to new FOP API. (Thanks to Miroslav Gregan for the hint)
........
  r596097 | jeremias | 2007-11-18 17:56:09 +0100 (Sun, 18 Nov 2007) | 6 lines
  
  Bugzilla #43605:
  Added methods for page-number-citation and page-number-citation-last in FOEventHandler.java
  Submitted by: V. Schappert <vschappert.at.bloomberg.net>
  
  Patch modified by Jeremias:
  Bugfix: FOEventHandler.startPageNumberCitation() was also called in the case of a page-number-citation-last. Introduced abstract base classes to avoid this.
........
  r596100 | jeremias | 2007-11-18 18:17:24 +0100 (Sun, 18 Nov 2007) | 1 line
  
  Added sample as suggested by Kumar Puppala.
........
  r596390 | vhennebert | 2007-11-19 19:25:27 +0100 (Mon, 19 Nov 2007) | 2 lines
  
  Bugzilla #43766: breaks generated by the merging algorithm for table rows containing empty cells has always a penalty of 900
........
  r596554 | jeremias | 2007-11-20 08:14:33 +0100 (Tue, 20 Nov 2007) | 2 lines
  
  Bugzilla #43904:
  Buffer the OutputStreams in our transcoders if the users forget.
........
  r596600 | jeremias | 2007-11-20 11:20:29 +0100 (Tue, 20 Nov 2007) | 3 lines
  
  Bugzilla #43910:
  Avoid a NullPointerException in AreaTreeHandler.endDocument().
  Submitted by: David Delbecq <delbd.at.oma.be>
........
  r596724 | jeremias | 2007-11-20 16:56:33 +0100 (Tue, 20 Nov 2007) | 3 lines
  
  Bugfix: Bugfix for URI resolution: Make StreamSources without system identifier work again.
  Bugfix: Close streams opened by test font resolution in font configuration (the font URIs will be resolved again later anyway).
  Better error message when the loading of font metric files doesn't work due to missing information in the returned Source instances.
........
  r596727 | vhennebert | 2007-11-20 17:07:32 +0100 (Tue, 20 Nov 2007) | 2 lines
  
  Bugfix in tables: wrong element generation by the merging algorithm when glues must be produced to cope with conditional spaces. The corresponding length was added twice: one in the glue itself and one in the following box.
........
  r596739 | cbowditch | 2007-11-20 17:49:13 +0100 (Tue, 20 Nov 2007) | 1 line
  
  bug fix: memory leak in PropertyCache. Fix provided by Jeremias. There are still some thread synchronization issues to be addressed in the PropertyCache. See the following thread for details: http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/200711.mbox/%3cBAY117-DAV109E36CC066889386AB917FB870@phx.gbl%3e
........
  r596742 | vhennebert | 2007-11-20 18:08:46 +0100 (Tue, 20 Nov 2007) | 2 lines
  
  Added a news entry about Max Berger becoming a committer. Welcome Max!
........
  r596776 | vhennebert | 2007-11-20 19:47:39 +0100 (Tue, 20 Nov 2007) | 2 lines
  
  Bugzilla #43803: table cells having no children are allowed in relaxed validation mode.
........
  r597052 | vhennebert | 2007-11-21 13:23:59 +0100 (Wed, 21 Nov 2007) | 2 lines
  
  Bugfix: the last element generated by the merging algorithm may now be a glue
........


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

1 files changed, 1 insertions, 2 deletions

diff --git a/src/codegen/fonts/font-file.xsl b/src/codegen/fonts/font-file.xsl
index 17d6de2e3..dbca3eba5 100644
--- a/src/codegen/fonts/font-file.xsl
+++ b/src/codegen/fonts/font-file.xsl
@@ -30,7 +30,6 @@
   <xsl:output method="text"/>
 
   <xsl:param name="encoding" select="/font-metrics/encoding"/>
-  <xsl:variable name="native-encoding" select="/font-metrics/encoding"/>
   <xsl:variable name="glyphs" select="document('encodings.xml')/encoding-set/encoding[@id=$encoding]/glyph"/>
 
   <xsl:template match="font-metrics">
@@ -48,7 +47,7 @@ public class <xsl:value-of select="class-name"/> extends Typeface {
     private final static String fontName = "<xsl:value-of select="font-name"/>";
     private final static String fullName = "<xsl:value-of select="full-name"/>";
     private final static Set familyNames;
-    private final static String encoding = <xsl:choose><xsl:when test="$encoding != $native-encoding">"<xsl:value-of select="$encoding"/>"</xsl:when><xsl:otherwise>null</xsl:otherwise></xsl:choose>;
+    private final static String encoding = "<xsl:value-of select="$encoding"/>";
     private final static int capHeight = <xsl:value-of select="cap-height"/>;
     private final static int xHeight = <xsl:value-of select="x-height"/>;
     private final static int ascender = <xsl:value-of select="ascender"/>;