geomerative 1.1.0-java → 2.0.0-java

data/src/org/apache/batik/svggen/font/table/CmapFormat4.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: CmapFormat4.java,v 1.6 2004/09/01 09:35:23 deweese Exp $
@@ -26,65 +26,74 @@ import org.apache.batik.svggen.font.*;
  */
 public class CmapFormat4 extends CmapFormat {
 
-    public  int language;
-    private final int segCountX2;
-    private final int searchRange;
-    private final int entrySelector;
-    private final int rangeShift;
-    private final int[] endCode;
-    private final int[] startCode;
-    private final int[] idDelta;
-    private final int[] idRangeOffset;
-    private final int[] glyphIdArray;
-    private final int segCount;
-    private int first, last;
+  public int language;
+  private final int segCountX2;
+  private final int searchRange;
+  private final int entrySelector;
+  private final int rangeShift;
+  private final int[] endCode;
+  private final int[] startCode;
+  private final int[] idDelta;
+  private final int[] idRangeOffset;
+  private final int[] glyphIdArray;
+  private final int segCount;
+  private int first, last;
 
-    protected CmapFormat4(RandomAccessFileEmulator raf) throws IOException {
-        super(raf);
-        format = 4;
-        segCountX2 = raf.readUnsignedShort();
-        segCount = segCountX2 / 2;
-        endCode = new int[segCount];
-        startCode = new int[segCount];
-        idDelta = new int[segCount];
-        idRangeOffset = new int[segCount];
-        searchRange = raf.readUnsignedShort();
-        entrySelector = raf.readUnsignedShort();
-        rangeShift = raf.readUnsignedShort();
-        last = -1;
-        for (int i = 0; i < segCount; i++) {
-            endCode[i] = raf.readUnsignedShort();
-            if (endCode[i] > last) last = endCode[i];
-        }
-        raf.readUnsignedShort(); // reservePad
-        for (int i = 0; i < segCount; i++) {
-            startCode[i] = raf.readUnsignedShort();
-            if ((i==0 ) || (startCode[i] < first)) first = startCode[i];
-        }
-        for (int i = 0; i < segCount; i++) {
-            idDelta[i] = raf.readUnsignedShort();
-        }
-        for (int i = 0; i < segCount; i++) {
-            idRangeOffset[i] = raf.readUnsignedShort();
-        }
+  protected CmapFormat4(RandomAccessFileEmulator raf) throws IOException {
+    super(raf);
+    format = 4;
+    segCountX2 = raf.readUnsignedShort();
+    segCount = segCountX2 / 2;
+    endCode = new int[segCount];
+    startCode = new int[segCount];
+    idDelta = new int[segCount];
+    idRangeOffset = new int[segCount];
+    searchRange = raf.readUnsignedShort();
+    entrySelector = raf.readUnsignedShort();
+    rangeShift = raf.readUnsignedShort();
+    last = -1;
+    for (int i = 0; i < segCount; i++) {
+      endCode[i] = raf.readUnsignedShort();
+      if (endCode[i] > last) {
+        last = endCode[i];
+      }
+    }
+    raf.readUnsignedShort(); // reservePad
+    for (int i = 0; i < segCount; i++) {
+      startCode[i] = raf.readUnsignedShort();
+      if ((i == 0) || (startCode[i] < first)) {
+        first = startCode[i];
+      }
+    }
+    for (int i = 0; i < segCount; i++) {
+      idDelta[i] = raf.readUnsignedShort();
+    }
+    for (int i = 0; i < segCount; i++) {
+      idRangeOffset[i] = raf.readUnsignedShort();
+    }
 
-        // Whatever remains of this header belongs in glyphIdArray
-        int count = (length - 16 - (segCount*8)) / 2;
-        glyphIdArray = new int[count];
-        for (int i = 0; i < count; i++) {
-            glyphIdArray[i] = raf.readUnsignedShort();
-        }
+    // Whatever remains of this header belongs in glyphIdArray
+    int count = (length - 16 - (segCount * 8)) / 2;
+    glyphIdArray = new int[count];
+    for (int i = 0; i < count; i++) {
+      glyphIdArray[i] = raf.readUnsignedShort();
     }
+  }
+
+  @Override
+  public int getFirst() {
+    return first;
+  }
 
-    @Override
-    public int getFirst() { return first; }
-    @Override
-    public int getLast()  { return last; }
+  @Override
+  public int getLast() {
+    return last;
+  }
 
-    @Override
-    public int mapCharCode(int charCode) {
-        try {
-            /*
+  @Override
+  public int mapCharCode(int charCode) {
+    try {
+      /*
               Quoting :
               http://developer.apple.com/fonts/TTRefMan/RM06/Chap6cmap.html#Surrogates
                
@@ -98,50 +107,51 @@ public class CmapFormat4 extends CmapFormat {
                
               My comment : Isn't there a typo here ? Shouldn't we
               rather read 65,534 ?
-              */
-            if ((charCode < 0) || (charCode >= 0xFFFE))
-                return 0;
+       */
+      if ((charCode < 0) || (charCode >= 0xFFFE)) {
+        return 0;
+      }
 
-            for (int i = 0; i < segCount; i++) {
-                if (endCode[i] >= charCode) {
-                    if (startCode[i] <= charCode) {
-                        if (idRangeOffset[i] > 0) {
-                            return glyphIdArray[idRangeOffset[i]/2 + 
-                                                (charCode - startCode[i]) -
-                                                (segCount - i)];
-                        } else {
-                            return (idDelta[i] + charCode) % 65536;
-                        }
-                    } else {
-                        break;
-                    }
-                }
+      for (int i = 0; i < segCount; i++) {
+        if (endCode[i] >= charCode) {
+          if (startCode[i] <= charCode) {
+            if (idRangeOffset[i] > 0) {
+              return glyphIdArray[idRangeOffset[i] / 2
+                + (charCode - startCode[i])
+                - (segCount - i)];
+            } else {
+              return (idDelta[i] + charCode) % 65536;
             }
-        } catch (ArrayIndexOutOfBoundsException e) {
-            System.err.println("error: Array out of bounds - " + e.getMessage());
+          } else {
+            break;
+          }
         }
-        return 0;
+      }
+    } catch (ArrayIndexOutOfBoundsException e) {
+      System.err.println("error: Array out of bounds - " + e.getMessage());
     }
+    return 0;
+  }
 
-    @Override
-    public String toString() {
-        return new StringBuilder()
-        .append(super.toString())
-        .append(", segCountX2: ")
-        .append(segCountX2)
-        .append(", searchRange: ")
-        .append(searchRange)
-        .append(", entrySelector: ")
-        .append(entrySelector)
-        .append(", rangeShift: ")
-        .append(rangeShift)
-        .append(", endCode: ")
-        .append(endCode)
-        .append(", startCode: ")
-        .append(endCode)
-        .append(", idDelta: ")
-        .append(idDelta)
-        .append(", idRangeOffset: ")
-        .append(idRangeOffset).toString();
-    }
+  @Override
+  public String toString() {
+    return new StringBuilder()
+      .append(super.toString())
+      .append(", segCountX2: ")
+      .append(segCountX2)
+      .append(", searchRange: ")
+      .append(searchRange)
+      .append(", entrySelector: ")
+      .append(entrySelector)
+      .append(", rangeShift: ")
+      .append(rangeShift)
+      .append(", endCode: ")
+      .append(endCode)
+      .append(", startCode: ")
+      .append(endCode)
+      .append(", idDelta: ")
+      .append(idDelta)
+      .append(", idRangeOffset: ")
+      .append(idRangeOffset).toString();
+  }
 }

data/src/org/apache/batik/svggen/font/table/CmapFormat6.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: CmapFormat6.java,v 1.4 2004/09/01 09:35:23 deweese Exp $
@@ -26,35 +26,39 @@ import org.apache.batik.svggen.font.*;
  */
 public class CmapFormat6 extends CmapFormat {
 
-    private final short cformat;
-    private short clength;
-    private short cversion;
-    private short firstCode;
-    private short entryCount;
-    private short[] glyphIdArray;
-
-    protected CmapFormat6(RandomAccessFileEmulator raf) throws IOException {
-        super(raf);
-        cformat = 6;
-    }
-
-    @Override
-    public int getFirst() { return 0; }
-
-    /**
-     *
-     * @return
-     */
-    @Override
-    public int getLast()  { return 0; }
-    
-    /**
-     *
-     * @param charCode
-     * @return
-     */
-    @Override
-    public int mapCharCode(int charCode) {
-        return 0;
-    }
+  private final short cformat;
+  private short clength;
+  private short cversion;
+  private short firstCode;
+  private short entryCount;
+  private short[] glyphIdArray;
+
+  protected CmapFormat6(RandomAccessFileEmulator raf) throws IOException {
+    super(raf);
+    cformat = 6;
+  }
+
+  @Override
+  public int getFirst() {
+    return 0;
+  }
+
+  /**
+   *
+   * @return
+   */
+  @Override
+  public int getLast() {
+    return 0;
+  }
+
+  /**
+   *
+   * @param charCode
+   * @return
+   */
+  @Override
+  public int mapCharCode(int charCode) {
+    return 0;
+  }
 }

data/src/org/apache/batik/svggen/font/table/CmapIndexEntry.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: CmapIndexEntry.java,v 1.3 2004/08/18 07:15:20 vhardy Exp $
@@ -26,59 +26,79 @@ import org.apache.batik.svggen.font.*;
  */
 public class CmapIndexEntry {
 
-    private final int platformId;
-    private final int encodingId;
-    private final int offset;
+  private final int platformId;
+  private final int encodingId;
+  private final int offset;
 
-    protected CmapIndexEntry(RandomAccessFileEmulator raf) throws IOException {
-        platformId = raf.readUnsignedShort();
-        encodingId = raf.readUnsignedShort();
-        offset = raf.readInt();
-    }
+  protected CmapIndexEntry(RandomAccessFileEmulator raf) throws IOException {
+    platformId = raf.readUnsignedShort();
+    encodingId = raf.readUnsignedShort();
+    offset = raf.readInt();
+  }
 
-    public int getEncodingId() {
-        return encodingId;
-    }
+  public int getEncodingId() {
+    return encodingId;
+  }
 
-    public int getOffset() {
-        return offset;
-    }
+  public int getOffset() {
+    return offset;
+  }
 
-    public int getPlatformId() {
-        return platformId;
-    }
+  public int getPlatformId() {
+    return platformId;
+  }
 
-    @Override
-    public String toString() {
-        String platform;
-        String encoding = "";
+  @Override
+  public String toString() {
+    String platform;
+    String encoding = "";
 
-        switch (platformId) {
-            case 1: platform = " (Macintosh)"; break;
-            case 3: platform = " (Windows)"; break;
-            default: platform = "";
-        }
-        if (platformId == 3) {
-            // Windows specific encodings
-            switch (encodingId) {
-                case 0: encoding = " (Symbol)"; break;
-                case 1: encoding = " (Unicode)"; break;
-                case 2: encoding = " (ShiftJIS)"; break;
-                case 3: encoding = " (Big5)"; break;
-                case 4: encoding = " (PRC)"; break;
-                case 5: encoding = " (Wansung)"; break;
-                case 6: encoding = " (Johab)"; break;
-                default: encoding = "";
-            }
-        }
-        return new StringBuffer()
-        .append( "platform id: " )
-        .append( platformId )
-        .append( platform )
-        .append( ", encoding id: " )
-        .append( encodingId )
-        .append( encoding )
-        .append( ", offset: " )
-        .append( offset ).toString();
+    switch (platformId) {
+      case 1:
+        platform = " (Macintosh)";
+        break;
+      case 3:
+        platform = " (Windows)";
+        break;
+      default:
+        platform = "";
+    }
+    if (platformId == 3) {
+      // Windows specific encodings
+      switch (encodingId) {
+        case 0:
+          encoding = " (Symbol)";
+          break;
+        case 1:
+          encoding = " (Unicode)";
+          break;
+        case 2:
+          encoding = " (ShiftJIS)";
+          break;
+        case 3:
+          encoding = " (Big5)";
+          break;
+        case 4:
+          encoding = " (PRC)";
+          break;
+        case 5:
+          encoding = " (Wansung)";
+          break;
+        case 6:
+          encoding = " (Johab)";
+          break;
+        default:
+          encoding = "";
+      }
     }
+    return new StringBuffer()
+      .append("platform id: ")
+      .append(platformId)
+      .append(platform)
+      .append(", encoding id: ")
+      .append(encodingId)
+      .append(encoding)
+      .append(", offset: ")
+      .append(offset).toString();
+  }
 }

data/src/org/apache/batik/svggen/font/table/CmapTable.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: CmapTable.java,v 1.3 2004/08/18 07:15:20 vhardy Exp $
@@ -26,62 +26,62 @@ import org.apache.batik.svggen.font.*;
  */
 public class CmapTable implements Table {
 
-    private final int version;
-    private final int numTables;
-    private final CmapIndexEntry[] entries;
-    private final CmapFormat[] formats;
-
-    protected CmapTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
-        long fp = de.getOffset();
-        raf.seek(fp);
-        version = raf.readUnsignedShort();
-        numTables = raf.readUnsignedShort();
-        entries = new CmapIndexEntry[numTables];
-        formats = new CmapFormat[numTables];
-
-        // Get each of the index entries
-        for (int i = 0; i < numTables; i++) {
-            entries[i] = new CmapIndexEntry(raf);
-        }
-
-        // Get each of the tables
-        for (int i = 0; i < numTables; i++) {
-            raf.seek(fp + entries[i].getOffset());
-            int format = raf.readUnsignedShort();
-            formats[i] = CmapFormat.create(format, raf);
-        }
+  private final int version;
+  private final int numTables;
+  private final CmapIndexEntry[] entries;
+  private final CmapFormat[] formats;
+
+  protected CmapTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
+    long fp = de.getOffset();
+    raf.seek(fp);
+    version = raf.readUnsignedShort();
+    numTables = raf.readUnsignedShort();
+    entries = new CmapIndexEntry[numTables];
+    formats = new CmapFormat[numTables];
+
+    // Get each of the index entries
+    for (int i = 0; i < numTables; i++) {
+      entries[i] = new CmapIndexEntry(raf);
     }
 
-    public CmapFormat getCmapFormat(short platformId, short encodingId) {
-
-        // Find the requested format
-        for (int i = 0; i < numTables; i++) {
-            if (entries[i].getPlatformId() == platformId
-                && entries[i].getEncodingId() == encodingId) {
-                return formats[i];
-            }
-        }
-        return null;
+    // Get each of the tables
+    for (int i = 0; i < numTables; i++) {
+      raf.seek(fp + entries[i].getOffset());
+      int format = raf.readUnsignedShort();
+      formats[i] = CmapFormat.create(format, raf);
     }
+  }
+
+  public CmapFormat getCmapFormat(short platformId, short encodingId) {
 
-    @Override
-    public int getType() {
-        return cmap;
+    // Find the requested format
+    for (int i = 0; i < numTables; i++) {
+      if (entries[i].getPlatformId() == platformId
+        && entries[i].getEncodingId() == encodingId) {
+        return formats[i];
+      }
     }
+    return null;
+  }
 
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer().append("cmap\n");
+  @Override
+  public int getType() {
+    return CMAP;
+  }
 
-        // Get each of the index entries
-        for (int i = 0; i < numTables; i++) {
-            sb.append("\t").append(entries[i].toString()).append("\n");
-        }
+  @Override
+  public String toString() {
+    StringBuffer sb = new StringBuffer().append("cmap\n");
+
+    // Get each of the index entries
+    for (int i = 0; i < numTables; i++) {
+      sb.append("\t").append(entries[i].toString()).append("\n");
+    }
 
-        // Get each of the tables
-        for (int i = 0; i < numTables; i++) {
-            sb.append("\t").append(formats[i].toString()).append("\n");
-        }
-        return sb.toString();
+    // Get each of the tables
+    for (int i = 0; i < numTables; i++) {
+      sb.append("\t").append(formats[i].toString()).append("\n");
     }
+    return sb.toString();
+  }
 }