geomerative 1.1.0-java → 2.0.0-java

data/src/org/apache/batik/svggen/font/Font.java

@@ -35,154 +35,153 @@ import org.apache.batik.svggen.font.table.TableFactory;
 
 /**
  * The TrueType font.
+ *
  * @version $Id: Font.java,v 1.6 2004/08/18 07:15:18 vhardy Exp $
  * @author <a href="mailto:david@steadystate.co.uk">David Schweinsberg</a>
  */
 public class Font {
 
-    private byte[] bs;
+  private byte[] bs;
 //    private Interpreter interp = null;
 //    private Parser parser = null;
-    private TableDirectory tableDirectory = null;
-    private Table[] tables;
-    private Os2Table os2;
-    private CmapTable cmap;
-    private GlyfTable glyf;
-    private HeadTable head;
-    private HheaTable hhea;
-    private HmtxTable hmtx;
-    private LocaTable loca;
-    private MaxpTable maxp;
-    private NameTable name;
-    private PostTable post;
-
-    /**
-     * Constructor
-     */
-    public Font() {
-    }
-
-    public Table getTable(int tableType) {
-        for (Table table : tables) {
-            if ((table != null) && (table.getType() == tableType)) {
-                return table;
-            }
-        }
-        return null;
-    }
-
-    public Os2Table getOS2Table() {
-        return os2;
-    }
-    
-    public CmapTable getCmapTable() {
-        return cmap;
-    }
-    
-    public HeadTable getHeadTable() {
-        return head;
-    }
-    
-    public HheaTable getHheaTable() {
-        return hhea;
-    }
-    
-    public HmtxTable getHmtxTable() {
-        return hmtx;
-    }
-    
-    public LocaTable getLocaTable() {
-        return loca;
-    }
-    
-    public MaxpTable getMaxpTable() {
-        return maxp;
-    }
-
-    public NameTable getNameTable() {
-        return name;
-    }
-
-    public PostTable getPostTable() {
-        return post;
-    }
-
-    public int getAscent() {
-        return hhea.getAscender();
-    }
-
-    public int getDescent() {
-        return hhea.getDescender();
-    }
-
-    public int getNumGlyphs() {
-        return maxp.getNumGlyphs();
-    }
-
-    public Glyph getGlyph(int i) {
-        return (glyf.getDescription(i) != null)
-            ? new Glyph(
-                glyf.getDescription(i),
-                hmtx.getLeftSideBearing(i),
-                hmtx.getAdvanceWidth(i))
-            : null;
-    }
-
-    public TableDirectory getTableDirectory() {
-        return tableDirectory;
-    }
-
-    /**
-     * @param fontInBytes
-     */
-    protected void read(byte[] fontInBytes) {
-	bs = fontInBytes;
-        try {
-            try (RandomAccessFileEmulator raf = new RandomAccessFileEmulator(bs, "r")) {
-                tableDirectory = new TableDirectory(raf);
-                tables = new Table[tableDirectory.getNumTables()];
-                
-                // Load each of the tables
-                for (int i = 0; i < tableDirectory.getNumTables(); i++) {
-                    tables[i] = TableFactory.create
-                        (tableDirectory.getEntry(i), raf);
-                }
-            }
-            
-            // Get references to commonly used tables
-            os2  = (Os2Table) getTable(Table.OS_2);
-            cmap = (CmapTable) getTable(Table.cmap);
-            glyf = (GlyfTable) getTable(Table.glyf);
-            head = (HeadTable) getTable(Table.head);
-            hhea = (HheaTable) getTable(Table.hhea);
-            hmtx = (HmtxTable) getTable(Table.hmtx);
-            loca = (LocaTable) getTable(Table.loca);
-            maxp = (MaxpTable) getTable(Table.maxp);
-            name = (NameTable) getTable(Table.name);
-            post = (PostTable) getTable(Table.post);
-            
-            // Initialize the tables that require it
-            hmtx.init(hhea.getNumberOfHMetrics(), 
-                      maxp.getNumGlyphs() - hhea.getNumberOfHMetrics());
-            loca.init(maxp.getNumGlyphs(), head.getIndexToLocFormat() == 0);
-            glyf.init(maxp.getNumGlyphs(), loca);
-
-        } catch (IOException e) {
+  private TableDirectory tableDirectory = null;
+  private Table[] tables;
+  private Os2Table os2;
+  private CmapTable cmap;
+  private GlyfTable glyf;
+  private HeadTable head;
+  private HheaTable hhea;
+  private HmtxTable hmtx;
+  private LocaTable loca;
+  private MaxpTable maxp;
+  private NameTable name;
+  private PostTable post;
+
+  /**
+   * Constructor
+   */
+  public Font() {
+  }
+
+  public Table getTable(int tableType) {
+    for (Table table : tables) {
+      if ((table != null) && (table.getType() == tableType)) {
+        return table;
+      }
+    }
+    return null;
+  }
+
+  public Os2Table getOS2Table() {
+    return os2;
+  }
+
+  public CmapTable getCmapTable() {
+    return cmap;
+  }
+
+  public HeadTable getHeadTable() {
+    return head;
+  }
+
+  public HheaTable getHheaTable() {
+    return hhea;
+  }
+
+  public HmtxTable getHmtxTable() {
+    return hmtx;
+  }
+
+  public LocaTable getLocaTable() {
+    return loca;
+  }
+
+  public MaxpTable getMaxpTable() {
+    return maxp;
+  }
+
+  public NameTable getNameTable() {
+    return name;
+  }
+
+  public PostTable getPostTable() {
+    return post;
+  }
+
+  public int getAscent() {
+    return hhea.getAscender();
+  }
+
+  public int getDescent() {
+    return hhea.getDescender();
+  }
+
+  public int getNumGlyphs() {
+    return maxp.getNumGlyphs();
+  }
+
+  public Glyph getGlyph(int i) {
+    return (glyf.getDescription(i) != null)
+      ? new Glyph(
+        glyf.getDescription(i),
+        hmtx.getLeftSideBearing(i),
+        hmtx.getAdvanceWidth(i))
+      : null;
+  }
+
+  public TableDirectory getTableDirectory() {
+    return tableDirectory;
+  }
+
+  /**
+   * @param fontInBytes
+   */
+  protected void read(byte[] fontInBytes) {
+    bs = fontInBytes;
+    try {
+      try (RandomAccessFileEmulator raf = new RandomAccessFileEmulator(bs, "r")) {
+        tableDirectory = new TableDirectory(raf);
+        tables = new Table[tableDirectory.getNumTables()];
+
+        // Load each of the tables
+        for (int i = 0; i < tableDirectory.getNumTables(); i++) {
+          tables[i] = TableFactory.create(tableDirectory.getEntry(i), raf);
         }
-    }
-    
-    public static Font create() {
-        return new Font();
-    }
-    
-    /**
-     * @param fontInBytes
-     * @return 
-     */
-     
-    public static Font create(byte[] fontInBytes) {
-        Font f = new Font();
-        f.read(fontInBytes);
-        return f;
-    }
+      }
+
+      // Get references to commonly used tables
+      os2 = (Os2Table) getTable(Table.OS_2);
+      cmap = (CmapTable) getTable(Table.CMAP);
+      glyf = (GlyfTable) getTable(Table.GLYF);
+      head = (HeadTable) getTable(Table.HEAD);
+      hhea = (HheaTable) getTable(Table.HHEA);
+      hmtx = (HmtxTable) getTable(Table.HMTX);
+      loca = (LocaTable) getTable(Table.LOCA);
+      maxp = (MaxpTable) getTable(Table.MAXP);
+      name = (NameTable) getTable(Table.NAME);
+      post = (PostTable) getTable(Table.POST);
+
+      // Initialize the tables that require it
+      hmtx.init(hhea.getNumberOfHMetrics(),
+        maxp.getNumGlyphs() - hhea.getNumberOfHMetrics());
+      loca.init(maxp.getNumGlyphs(), head.getIndexToLocFormat() == 0);
+      glyf.init(maxp.getNumGlyphs(), loca);
+
+    } catch (IOException e) {
+    }
+  }
+
+  public static Font create() {
+    return new Font();
+  }
+
+  /**
+   * @param fontInBytes
+   * @return
+   */
+  public static Font create(byte[] fontInBytes) {
+    Font f = new Font();
+    f.read(fontInBytes);
+    return f;
+  }
 }

data/src/org/apache/batik/svggen/font/Glyph.java

@@ -22,61 +22,92 @@ import org.apache.batik.svggen.font.table.GlyphDescription;
 
 /**
  * An individual glyph within a font.
+ *
  * @version $Id: Glyph.java,v 1.4 2004/08/18 07:15:18 vhardy Exp $
  * @author <a href="mailto:david@steadystate.co.uk">David Schweinsberg</a>
  */
 public class Glyph {
 
-    protected short leftSideBearing;
-    protected int advanceWidth;
-    private Point[] points;
-
-    public Glyph(GlyphDescription gd, short lsb, int advance) {
-        leftSideBearing = lsb;
-        advanceWidth = advance;
-        describe(gd);
-    }
-
-    public int getAdvanceWidth() {
-        return advanceWidth;
-    }
-
-    public short getLeftSideBearing() {
-        return leftSideBearing;
-    }
-
-    public Point getPoint(int i) {
-        return points[i];
-    }
-
-    public int getPointCount() {
-        return points.length;
+  /**
+   *
+   */
+  protected short leftSideBearing;
+
+  /**
+   *
+   */
+  protected int advanceWidth;
+  private Point[] points;
+
+  /**
+   *
+   * @param gd
+   * @param lsb
+   * @param advance
+   */
+  public Glyph(GlyphDescription gd, short lsb, int advance) {
+    leftSideBearing = lsb;
+    advanceWidth = advance;
+    describe(gd);
+  }
+
+  /**
+   *
+   * @return
+   */
+  public int getAdvanceWidth() {
+    return advanceWidth;
+  }
+
+  /**
+   *
+   * @return
+   */
+  public short getLeftSideBearing() {
+    return leftSideBearing;
+  }
+
+  /**
+   *
+   * @param i
+   * @return
+   */
+  public Point getPoint(int i) {
+    return points[i];
+  }
+
+  /**
+   *
+   * @return
+   */
+  public int getPointCount() {
+    return points.length;
+  }
+
+  /**
+   * Resets the glyph to the TrueType table settings
+   */
+  public void reset() {
+  }
+
+  /**
+   * @param factor a float value
+   */
+  public void scale(float factor) {
+    if (points != null) {
+      for (Point point : points) {
+        point.x *= factor;
+        point.y *= -factor;
+      }
     }
-
-    /**
-     * Resets the glyph to the TrueType table settings
-     */
-    public void reset() {
-    }
-
-    /**
-     * @param factor a float value
-     */
-    public void scale(float factor) {
-	if(points!=null){
-            for (Point point : points) {
-                point.x *= factor;
-                point.y *= -factor;
-            }
-	}
-	leftSideBearing = (short)((float)leftSideBearing * factor);
-	advanceWidth = (int)((float)advanceWidth * factor);
-    }
-
-    /**
-     * @param factor a 16.16 fixed value
-     */
-    /*
+    leftSideBearing = (short) ((float) leftSideBearing * factor);
+    advanceWidth = (int) ((float) advanceWidth * factor);
+  }
+
+  /**
+   * @param factor a 16.16 fixed value
+   */
+  /*
     public void scale(int factor) {
         for (int i = 0; i < points.length; i++) {
             //points[i].x = ( points[i].x * factor ) >> 6;
@@ -87,27 +118,27 @@ public class Glyph {
         leftSideBearing = (short)(( leftSideBearing * factor) >> 6);
         advanceWidth = (advanceWidth * factor) >> 6;
     }
-    */
-    /**
-     * Set the points of a glyph from the GlyphDescription
-     */
-    private void describe(GlyphDescription gd) {
-        int endPtIndex = 0;
-        points = new Point[gd.getPointCount() + 2];
-        for (int i = 0; i < gd.getPointCount(); i++) {
-            boolean endPt = gd.getEndPtOfContours(endPtIndex) == i;
-            if (endPt) {
-                endPtIndex++;
-            }
-            points[i] = new Point(
-                    gd.getXCoordinate(i),
-                    gd.getYCoordinate(i),
-                    (gd.getFlags(i) & GlyfDescript.onCurve) != 0,
-                    endPt);
-        }
-
-        // Append the origin and advanceWidth points (n & n+1)
-        points[gd.getPointCount()] = new Point(0, 0, true, true);
-        points[gd.getPointCount()+1] = new Point(advanceWidth, 0, true, true);
+   */
+  /**
+   * Set the points of a glyph from the GlyphDescription
+   */
+  private void describe(GlyphDescription gd) {
+    int endPtIndex = 0;
+    points = new Point[gd.getPointCount() + 2];
+    for (int i = 0; i < gd.getPointCount(); i++) {
+      boolean endPt = gd.getEndPtOfContours(endPtIndex) == i;
+      if (endPt) {
+        endPtIndex++;
+      }
+      points[i] = new Point(
+        gd.getXCoordinate(i),
+        gd.getYCoordinate(i),
+        (gd.getFlags(i) & GlyfDescript.onCurve) != 0,
+        endPt);
     }
+
+    // Append the origin and advanceWidth points (n & n+1)
+    points[gd.getPointCount()] = new Point(0, 0, true, true);
+    points[gd.getPointCount() + 1] = new Point(advanceWidth, 0, true, true);
+  }
 }