Merged revisions 654783,654849,654869,654946,654982,655085,655093,655275,655281,655285,655309,655349,655370 via svnmerge from

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

........
  r654783 | vhennebert | 2008-05-09 13:30:40 +0100 (Fri, 09 May 2008) | 3 lines
  
  Checkstyle and minor typo fixes
  Set svn:keywords and svn:eol-style properties on new files
........
  r654849 | acumiskey | 2008-05-09 16:14:37 +0100 (Fri, 09 May 2008) | 1 line
  
  Unwanted list self concatenation :).
........
  r654869 | acumiskey | 2008-05-09 17:13:47 +0100 (Fri, 09 May 2008) | 1 line
  
  Moved the instantiation of the FontManager to the constructor along with all the other aggregated objects.
........
  r654946 | adelmelle | 2008-05-09 22:40:14 +0100 (Fri, 09 May 2008) | 6 lines
  
  Bugzilla 44794:
  Added support for page-number-citation and page-number-citation-last of fo:inline.
  Corrected behavior for page-number-citation-last of fo:block - forward references properly resolved.
  
  (+ support for page-number-citation-last on list-related FOs)
........
  r654982 | acumiskey | 2008-05-10 00:47:28 +0100 (Sat, 10 May 2008) | 1 line
  
  Checkstyle cleanup and javadoc
........
  r655085 | adelmelle | 2008-05-10 14:44:09 +0100 (Sat, 10 May 2008) | 5 lines
  
  Tweaks:
  -> remove split in CommonFont: font-size is resolved early, so no need anymore for CachedCommonFont
  -> allow disabling the PropertyCache via a system property (just in case...)
........
  r655093 | adelmelle | 2008-05-10 15:23:56 +0100 (Sat, 10 May 2008) | 1 line
  
  Correction: set default to true...
........
  r655275 | maxberger | 2008-05-11 08:30:55 +0100 (Sun, 11 May 2008) | 1 line
  
  made sure warning for missing glyphs is emitted in all cases
........
  r655281 | maxberger | 2008-05-11 10:01:31 +0100 (Sun, 11 May 2008) | 1 line
  
  Support character-by-character font-selection strategy on fo:character element
........
  r655285 | maxberger | 2008-05-11 10:17:07 +0100 (Sun, 11 May 2008) | 1 line
  
  Forgot to update testcases
........
  r655309 | adelmelle | 2008-05-11 13:22:22 +0100 (Sun, 11 May 2008) | 3 lines
  
  Make the LM clean up on end-of-layout, if possible.
  Added clearChildNodes() method to FObj to release the reference to the FO's children.
........
  r655349 | spepping | 2008-05-11 19:05:51 +0100 (Sun, 11 May 2008) | 2 lines
  
  The spec requires rounding, not truncating
........
  r655370 | adelmelle | 2008-05-11 22:03:41 +0100 (Sun, 11 May 2008) | 1 line
  
  Avoid creation of unnecessary dummy areas.
........


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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/java/org/apache/fop/fonts/base14/Base14FontCollection.java b/src/java/org/apache/fop/fonts/base14/Base14FontCollection.java
index 68324f13a..7bebccc88 100644
--- a/src/java/org/apache/fop/fonts/base14/Base14FontCollection.java
+++ b/src/java/org/apache/fop/fonts/base14/Base14FontCollection.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-/* $Id: $ */
+/* $Id$ */
 
 package org.apache.fop.fonts.base14;
 
@@ -27,7 +27,7 @@ import org.apache.fop.fonts.FontInfo;
  * Sets up Base 14 fonts
  */
 public class Base14FontCollection implements FontCollection {
-    
+
     private boolean kerning = false;
 
     /**
@@ -38,7 +38,7 @@ public class Base14FontCollection implements FontCollection {
     public Base14FontCollection(boolean kerning) {
         this.kerning  = kerning;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -143,7 +143,7 @@ public class Base14FontCollection implements FontCollection {
         fontInfo.addFontProperties("F8", "Times Roman", Font.STYLE_ITALIC, Font.WEIGHT_BOLD);
         fontInfo.addFontProperties("F9", "Computer-Modern-Typewriter",
                                                         Font.STYLE_NORMAL, Font.WEIGHT_NORMAL);
-        
+
         return 15;
     }
 }