Thread: [FOray-commit] SF.net SVN: foray:[10798] trunk/foray (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10798
          http://foray.svn.sourceforge.net/foray/?rev=10798&view=rev
Author:   victormote
Date:     2009-04-29 16:22:11 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
1. Make CharSet an implementation of the aXSL CharSet interface.
2. Conform to the aXSL CharSet requirements, renaming a method.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java
    trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java
    trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java
    trunk/foray/foray-font/src/java/org/foray/font/output/FontOutput4a.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/CharSet.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java
===================================================================

--- trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java	2009-04-29 16:05:47 UTC (rev 10797)
+++ trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java	2009-04-29 16:22:11 UTC (rev 10798)
@@ -272,7 +272,7 @@
      */
     public int width(final int c, final int fontSize) {
         final int metricIndex =
-                this.metricsFile.getCharSet().getCharSetIndex(c);
+                this.metricsFile.getCharSet().getIndex(c);
         if (metricIndex < 0
                 || metricIndex > this.getWidths().length) {
             return Integer.MIN_VALUE;
@@ -367,7 +367,7 @@
      * {@inheritDoc}
      */
     public boolean glyphAvailable(final int c) {
-        return this.getCharSet().getCharSetIndex(c) != -1;
+        return this.getCharSet().getIndex(c) != -1;
     }
 
     /**

Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java	2009-04-29 16:05:47 UTC (rev 10797)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java	2009-04-29 16:22:11 UTC (rev 10798)
@@ -1564,7 +1564,7 @@
             this.nextCharArrayIndex++;
             this.codePoints[charIndex] = theChar;
         } else {
-            charIndex = this.charSet.getCharSetIndex(theChar);
+            charIndex = this.charSet.getIndex(theChar);
         }
         final short[] extentTable = this.getExtentTable();
         if (charIndex < 0

Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java	2009-04-29 16:05:47 UTC (rev 10797)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java	2009-04-29 16:22:11 UTC (rev 10798)
@@ -392,7 +392,7 @@
             final char encodedIndex = (char) i;
             final int codePoint = internalEncoding.decodeCharacter(
                     encodedIndex);
-            final int charSetIndex = charSet.getCharSetIndex(codePoint);
+            final int charSetIndex = charSet.getIndex(codePoint);
             if (charSetIndex < 0
                     || charSetIndex >= extentTable.length) {
                 continue;

Modified: trunk/foray/foray-font/src/java/org/foray/font/output/FontOutput4a.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/output/FontOutput4a.java	2009-04-29 16:05:47 UTC (rev 10797)
+++ trunk/foray/foray-font/src/java/org/foray/font/output/FontOutput4a.java	2009-04-29 16:22:11 UTC (rev 10798)
@@ -227,7 +227,7 @@
             // Decode the character for this index
             final int codePoint = encoding.decodeCharacter(i);
             // Find the charSet index for that character.
-            final int charSetIndex = charSet.getCharSetIndex(codePoint);
+            final int charSetIndex = charSet.getIndex(codePoint);
             if (charSetIndex < 0) {
                 continue;
             }

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CharSet.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CharSet.java	2009-04-29 16:05:47 UTC (rev 10797)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CharSet.java	2009-04-29 16:22:11 UTC (rev 10798)
@@ -37,24 +37,9 @@
 import java.util.Map;
 
 /**
- * <p>Instances of CharSet are collections of related characters.
- * Fonts are frequently designed to cover a specific collection of characters.
- * For example, 12 of the Base-14 fonts cover the ExtendedRoman collection.</p>
- *
- * <p>The main purpose of the class is to efficiently map a Unicode code point
- * to an array index that can be used in other classes to store information
- * about that code point.
- * For example, as an AFM file is parsed, width metric information is
- * accumulated about each glyph in the font.
- * The font Encoding is not a suitable concept to use as an index for such
- * information, because it is limited to 256 characters and most Encodings use
- * less than that.
- * A font may contain more than 256 glyphs.
- * For example, the ExtendedRoman character set contains 315 glyphs.
- * By separating CharSet from Encoding, we can record all of the information
- * about a font without caring how it will be encoded as it is used.</p>
+ * The FOray implementation of {@link org.axsl.ps.CharSet}.
  */
-public class CharSet implements Serializable {
+public class CharSet implements org.axsl.ps.CharSet, Serializable {
 
     /** Constant needed for serialization. */
     public static final long serialVersionUID = -194139196582956914L;
@@ -158,12 +143,9 @@
     }
 
     /**
-     * Returns the array index for a character in this character set.
-     * @param codePoint The character whose index should be found.
-     * @return The index for codePoint, or -1 if codePoint is not in the
-     * character set.
+     * {@inheritDoc}
      */
-    public int getCharSetIndex(final int codePoint) {
+    public int getIndex(final int codePoint) {
         int index = -1;
         if (this.characterSet16 != null) {
             index = Arrays.binarySearch(this.characterSet16, (char) codePoint);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [FOray-commit] SF.net SVN: foray:[10798] trunk/foray (Page 3)

Modular XSL-FO Implementation for Java.

foray-commit