geomerative 1.1.0-java → 2.0.0-java

data/src/org/apache/batik/svggen/font/table/HheaTable.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: HheaTable.java,v 1.3 2004/08/18 07:15:21 vhardy Exp $
@@ -26,84 +26,84 @@ import org.apache.batik.svggen.font.*;
  */
 public class HheaTable implements Table {
 
-    private final int version;
-    private final short ascender;
-    private final short descender;
-    private final short lineGap;
-    private final short advanceWidthMax;
-    private final short minLeftSideBearing;
-    private final short minRightSideBearing;
-    private final short xMaxExtent;
-    private final short caretSlopeRise;
-    private final short caretSlopeRun;
-    private final short metricDataFormat;
-    private final short numberOfHMetrics;
-
-    protected HheaTable(DirectoryEntry de,RandomAccessFileEmulator raf) throws IOException {
-        raf.seek(de.getOffset());
-        version = raf.readInt();
-        ascender = raf.readShort();
-        descender = raf.readShort();
-        lineGap = raf.readShort();
-        advanceWidthMax = raf.readShort();
-        minLeftSideBearing = raf.readShort();
-        minRightSideBearing = raf.readShort();
-        xMaxExtent = raf.readShort();
-        caretSlopeRise = raf.readShort();
-        caretSlopeRun = raf.readShort();
-        for (int i = 0; i < 5; i++) {
-            raf.readShort();
-        }
-        metricDataFormat = raf.readShort();
-        numberOfHMetrics = raf.readShort();
-    }
-
-    public short getAdvanceWidthMax() {
-        return advanceWidthMax;
-    }
-
-    public short getAscender() {
-        return ascender;
-    }
-
-    public short getCaretSlopeRise() {
-        return caretSlopeRise;
-    }
-
-    public short getCaretSlopeRun() {
-        return caretSlopeRun;
-    }
-
-    public short getDescender() {
-        return descender;
-    }
-
-    public short getLineGap() {
-        return lineGap;
-    }
-
-    public short getMetricDataFormat() {
-        return metricDataFormat;
-    }
-
-    public short getMinLeftSideBearing() {
-        return minLeftSideBearing;
-    }
-
-    public short getMinRightSideBearing() {
-        return minRightSideBearing;
-    }
-
-    public short getNumberOfHMetrics() {
-        return numberOfHMetrics;
-    }
-
-    @Override
-    public int getType() {
-        return hhea;
-    }
-
-    public short getXMaxExtent() {
-        return xMaxExtent;
+  private final int version;
+  private final short ascender;
+  private final short descender;
+  private final short lineGap;
+  private final short advanceWidthMax;
+  private final short minLeftSideBearing;
+  private final short minRightSideBearing;
+  private final short xMaxExtent;
+  private final short caretSlopeRise;
+  private final short caretSlopeRun;
+  private final short metricDataFormat;
+  private final short numberOfHMetrics;
+
+  protected HheaTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
+    raf.seek(de.getOffset());
+    version = raf.readInt();
+    ascender = raf.readShort();
+    descender = raf.readShort();
+    lineGap = raf.readShort();
+    advanceWidthMax = raf.readShort();
+    minLeftSideBearing = raf.readShort();
+    minRightSideBearing = raf.readShort();
+    xMaxExtent = raf.readShort();
+    caretSlopeRise = raf.readShort();
+    caretSlopeRun = raf.readShort();
+    for (int i = 0; i < 5; i++) {
+      raf.readShort();
     }
+    metricDataFormat = raf.readShort();
+    numberOfHMetrics = raf.readShort();
+  }
+
+  public short getAdvanceWidthMax() {
+    return advanceWidthMax;
+  }
+
+  public short getAscender() {
+    return ascender;
+  }
+
+  public short getCaretSlopeRise() {
+    return caretSlopeRise;
+  }
+
+  public short getCaretSlopeRun() {
+    return caretSlopeRun;
+  }
+
+  public short getDescender() {
+    return descender;
+  }
+
+  public short getLineGap() {
+    return lineGap;
+  }
+
+  public short getMetricDataFormat() {
+    return metricDataFormat;
+  }
+
+  public short getMinLeftSideBearing() {
+    return minLeftSideBearing;
+  }
+
+  public short getMinRightSideBearing() {
+    return minRightSideBearing;
+  }
+
+  public short getNumberOfHMetrics() {
+    return numberOfHMetrics;
+  }
+
+  @Override
+  public int getType() {
+    return HHEA;
+  }
+
+  public short getXMaxExtent() {
+    return xMaxExtent;
+  }
 }

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

@@ -19,7 +19,7 @@ package org.apache.batik.svggen.font.table;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: HmtxTable.java,v 1.4 2004/08/18 07:15:21 vhardy Exp $
@@ -27,15 +27,15 @@ import org.apache.batik.svggen.font.*;
  */
 public class HmtxTable implements Table {
 
-    private byte[] buf = null;
-    private int[] hMetrics = null;
-    private short[] leftSideBearing = null;
+  private byte[] buf = null;
+  private int[] hMetrics = null;
+  private short[] leftSideBearing = null;
 
-    protected HmtxTable(DirectoryEntry de,RandomAccessFileEmulator raf) throws IOException {
-        raf.seek(de.getOffset());
-        buf = new byte[de.getLength()];
-        raf.read(buf);
-/*
+  protected HmtxTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
+    raf.seek(de.getOffset());
+    buf = new byte[de.getLength()];
+    raf.read(buf);
+    /*
         TableMaxp t_maxp = (TableMaxp) td.getEntryByTag(maxp).getTable();
         TableHhea t_hhea = (TableHhea) td.getEntryByTag(hhea).getTable();
         int lsbCount = t_maxp.getNumGlyphs() - t_hhea.getNumberOfHMetrics();
@@ -49,51 +49,52 @@ public class HmtxTable implements Table {
                 leftSideBearing[i] = raf.readShort();
             }
         }
-*/
-    }
+     */
+  }
 
-    public void init(int numberOfHMetrics, int lsbCount) {
-        if (buf == null) {
-            return;
-        }
-        hMetrics = new int[numberOfHMetrics];
-        ByteArrayInputStream bais = new ByteArrayInputStream(buf);
-        for (int i = 0; i < numberOfHMetrics; i++) {
-            hMetrics[i] = (bais.read()<<24 | bais.read()<<16 | 
-                           bais.read()<< 8 | bais.read());
-        }
-        if (lsbCount > 0) {
-            leftSideBearing = new short[lsbCount];
-            for (int i = 0; i < lsbCount; i++) {
-                leftSideBearing[i] = (short)(bais.read()<<8 | bais.read());
-            }
-        }
-        buf = null;
+  public void init(int numberOfHMetrics, int lsbCount) {
+    if (buf == null) {
+      return;
     }
-
-    public int getAdvanceWidth(int i) {
-        if (hMetrics == null) {
-            return 0;
-        }
-        if (i < hMetrics.length) {
-            return hMetrics[i] >> 16;
-        } else {
-            return hMetrics[hMetrics.length - 1] >> 16;
-        }
+    hMetrics = new int[numberOfHMetrics];
+    ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+    for (int i = 0; i < numberOfHMetrics; i++) {
+      hMetrics[i] = (bais.read() << 24 | bais.read() << 16
+        | bais.read() << 8 | bais.read());
     }
+    if (lsbCount > 0) {
+      leftSideBearing = new short[lsbCount];
+      for (int i = 0; i < lsbCount; i++) {
+        leftSideBearing[i] = (short) (bais.read() << 8 | bais.read());
+      }
+    }
+    buf = null;
+  }
 
-    public short getLeftSideBearing(int i) {
-        if (hMetrics == null) {
-            return 0;
-        }
-        if (i < hMetrics.length) {
-            return (short)(hMetrics[i] & 0xffff);
-        } else {
-            return leftSideBearing[i - hMetrics.length];
-        }
+  public int getAdvanceWidth(int i) {
+    if (hMetrics == null) {
+      return 0;
+    }
+    if (i < hMetrics.length) {
+      return hMetrics[i] >> 16;
+    } else {
+      return hMetrics[hMetrics.length - 1] >> 16;
     }
+  }
 
-    public int getType() {
-        return hmtx;
+  public short getLeftSideBearing(int i) {
+    if (hMetrics == null) {
+      return 0;
     }
+    if (i < hMetrics.length) {
+      return (short) (hMetrics[i] & 0xffff);
+    } else {
+      return leftSideBearing[i - hMetrics.length];
+    }
+  }
+
+  @Override
+  public int getType() {
+    return HMTX;
+  }
 }

data/src/org/apache/batik/svggen/font/table/KernSubtable.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;
 
 /**
  *
@@ -27,32 +27,34 @@ import org.apache.batik.svggen.font.*;
  */
 public abstract class KernSubtable {
 
-    /** Creates new KernSubtable */
-    protected KernSubtable() {
-    }
-    
-    public abstract int getKerningPairCount();
-
-    public abstract KerningPair getKerningPair(int i);
-
-    public static KernSubtable read(RandomAccessFileEmulator raf) throws IOException {
-        KernSubtable table = null;
-        /* int version =*/ raf.readUnsignedShort();
-        /* int length  =*/ raf.readUnsignedShort();
-        int coverage   = raf.readUnsignedShort();
-        int format     = coverage >> 8;
-        
-        switch (format) {
-        case 0:
-            table = new KernSubtableFormat0(raf);
-            break;
-        case 2:
-            table = new KernSubtableFormat2(raf);
-            break;
-        default:
-            break;
-        }
-        return table;
+  /**
+   * Creates new KernSubtable
+   */
+  protected KernSubtable() {
+  }
+
+  public abstract int getKerningPairCount();
+
+  public abstract KerningPair getKerningPair(int i);
+
+  public static KernSubtable read(RandomAccessFileEmulator raf) throws IOException {
+    KernSubtable table = null;
+    /* int version =*/ raf.readUnsignedShort();
+    /* int length  =*/ raf.readUnsignedShort();
+    int coverage = raf.readUnsignedShort();
+    int format = coverage >> 8;
+
+    switch (format) {
+      case 0:
+        table = new KernSubtableFormat0(raf);
+        break;
+      case 2:
+        table = new KernSubtableFormat2(raf);
+        break;
+      default:
+        break;
     }
+    return table;
+  }
 
 }

data/src/org/apache/batik/svggen/font/table/KernSubtableFormat0.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;
 
 /**
  *
@@ -26,40 +26,43 @@ import org.apache.batik.svggen.font.*;
  * @version $Id: KernSubtableFormat0.java,v 1.3 2004/08/18 07:15:21 vhardy Exp $
  */
 public class KernSubtableFormat0 extends KernSubtable {
-    
-    private final int nPairs;
-    private final int searchRange;
-    private final int entrySelector;
-    private final int rangeShift;
-    private final KerningPair[] kerningPairs;
 
-    /** Creates new KernSubtableFormat0
-     * @param raf
-     * @throws java.io.IOException */
-    protected KernSubtableFormat0(RandomAccessFileEmulator raf) throws IOException {
-        nPairs = raf.readUnsignedShort();
-        searchRange = raf.readUnsignedShort();
-        entrySelector = raf.readUnsignedShort();
-        rangeShift = raf.readUnsignedShort();
-        kerningPairs = new KerningPair[nPairs];
-        for (int i = 0; i < nPairs; i++) {
-            kerningPairs[i] = new KerningPair(raf);
-        }
-    }
+  private final int nPairs;
+  private final int searchRange;
+  private final int entrySelector;
+  private final int rangeShift;
+  private final KerningPair[] kerningPairs;
 
-    @Override
-    public int getKerningPairCount() {
-        return nPairs;
+  /**
+   * Creates new KernSubtableFormat0
+   *
+   * @param raf
+   * @throws java.io.IOException
+   */
+  protected KernSubtableFormat0(RandomAccessFileEmulator raf) throws IOException {
+    nPairs = raf.readUnsignedShort();
+    searchRange = raf.readUnsignedShort();
+    entrySelector = raf.readUnsignedShort();
+    rangeShift = raf.readUnsignedShort();
+    kerningPairs = new KerningPair[nPairs];
+    for (int i = 0; i < nPairs; i++) {
+      kerningPairs[i] = new KerningPair(raf);
     }
+  }
 
-    /**
-     *
-     * @param i
-     * @return
-     */
-    @Override
-    public KerningPair getKerningPair(int i) {
-        return kerningPairs[i];
-    }
+  @Override
+  public int getKerningPairCount() {
+    return nPairs;
+  }
+
+  /**
+   *
+   * @param i
+   * @return
+   */
+  @Override
+  public KerningPair getKerningPair(int i) {
+    return kerningPairs[i];
+  }
 
 }