geomerative 0.4.3-java → 2.1.0-java

data/src/org/apache/batik/svggen/font/table/GlyfTable.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: GlyfTable.java,v 1.4 2004/08/18 07:15:21 vhardy Exp $
@@ -27,14 +27,14 @@ import org.apache.batik.svggen.font.*;
  */
 public class GlyfTable implements Table {
 
-    private byte[] buf = null;
-    private GlyfDescript[] descript;
+  private byte[] buf = null;
+  private GlyfDescript[] descript;
 
-    protected GlyfTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
-        raf.seek(de.getOffset());
-        buf = new byte[de.getLength()];
-        raf.read(buf);
-/*
+  protected GlyfTable(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();
         TableLoca t_loca = (TableLoca) td.getEntryByTag(loca).getTable();
         descript = new TableGlyfDescript[t_maxp.getNumGlyphs()];
@@ -63,49 +63,49 @@ public class GlyfTable implements Table {
                 }
             }
         }
-*/
-    }
+     */
+  }
 
-    public void init(int numGlyphs, LocaTable loca) {
-        if (buf == null) {
-            return;
-        }
-        descript = new GlyfDescript[numGlyphs];
-        ByteArrayInputStream bais = new ByteArrayInputStream(buf);
-        for (int i = 0; i < numGlyphs; i++) {
-            int len = loca.getOffset((short)(i + 1)) - loca.getOffset(i);
-            if (len > 0) {
-                bais.reset();
-                bais.skip(loca.getOffset(i));
-                short numberOfContours = (short)(bais.read()<<8 | bais.read());
-                if (numberOfContours >= 0) {
-                    descript[i] = new GlyfSimpleDescript(this, numberOfContours, bais);
-                }
-            } else {
-                descript[i] = null;
-            }
+  public void init(int numGlyphs, LocaTable loca) {
+    if (buf == null) {
+      return;
+    }
+    descript = new GlyfDescript[numGlyphs];
+    ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+    for (int i = 0; i < numGlyphs; i++) {
+      int len = loca.getOffset((short) (i + 1)) - loca.getOffset(i);
+      if (len > 0) {
+        bais.reset();
+        bais.skip(loca.getOffset(i));
+        short numberOfContours = (short) (bais.read() << 8 | bais.read());
+        if (numberOfContours >= 0) {
+          descript[i] = new GlyfSimpleDescript(this, numberOfContours, bais);
         }
+      } else {
+        descript[i] = null;
+      }
+    }
 
-        for (int i = 0; i < numGlyphs; i++) {
-            int len = loca.getOffset((short)(i + 1)) - loca.getOffset(i);
-            if (len > 0) {
-                bais.reset();
-                bais.skip(loca.getOffset(i));
-                short numberOfContours = (short)(bais.read()<<8 | bais.read());
-                if (numberOfContours < 0) {
-                    descript[i] = new GlyfCompositeDescript(this, bais);
-                }
-            }
+    for (int i = 0; i < numGlyphs; i++) {
+      int len = loca.getOffset((short) (i + 1)) - loca.getOffset(i);
+      if (len > 0) {
+        bais.reset();
+        bais.skip(loca.getOffset(i));
+        short numberOfContours = (short) (bais.read() << 8 | bais.read());
+        if (numberOfContours < 0) {
+          descript[i] = new GlyfCompositeDescript(this, bais);
         }
-        buf = null;
+      }
     }
+    buf = null;
+  }
 
-    public GlyfDescript getDescription(int i) {
-        return descript[i];
-    }
+  public GlyfDescript getDescription(int i) {
+    return descript[i];
+  }
 
-    @Override
-    public int getType() {
-        return glyf;
-    }
+  @Override
+  public int getType() {
+    return GLYF;
+  }
 }

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

@@ -19,21 +19,33 @@ package org.apache.batik.svggen.font.table;
 
 /**
  * Specifies access to glyph description classes, simple and composite.
+ *
  * @version $Id: GlyphDescription.java,v 1.3 2004/08/18 07:15:21 vhardy Exp $
  * @author <a href="mailto:david@steadystate.co.uk">David Schweinsberg</a>
  */
 public interface GlyphDescription {
-    public int getEndPtOfContours(int i);
-    public byte getFlags(int i);
-    public short getXCoordinate(int i);
-    public short getYCoordinate(int i);
-    public short getXMaximum();
-    public short getXMinimum();
-    public short getYMaximum();
-    public short getYMinimum();
-    public boolean isComposite();
-    public int getPointCount();
-    public int getContourCount();
-    //  public int getComponentIndex(int c);
-    //  public int getComponentCount();
+
+  public int getEndPtOfContours(int i);
+
+  public byte getFlags(int i);
+
+  public short getXCoordinate(int i);
+
+  public short getYCoordinate(int i);
+
+  public short getXMaximum();
+
+  public short getXMinimum();
+
+  public short getYMaximum();
+
+  public short getYMinimum();
+
+  public boolean isComposite();
+
+  public int getPointCount();
+
+  public int getContourCount();
+  //  public int getComponentIndex(int c);
+  //  public int getComponentCount();
 }

data/src/org/apache/batik/svggen/font/table/GposTable.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,15 +27,16 @@ import org.apache.batik.svggen.font.*;
  */
 public class GposTable implements Table {
 
-    protected GposTable(DirectoryEntry de,RandomAccessFileEmulator raf) throws IOException {
-        raf.seek(de.getOffset());
+  protected GposTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
+    raf.seek(de.getOffset());
 
-        // GPOS Header
-        /* int version     = */ raf.readInt();
-        /* int scriptList  = */ raf.readInt();
-        /* int featureList = */ raf.readInt();
-        /* int lookupList  = */ raf.readInt();
-/*        
+
+    // GPOS Header
+    /* int version     = */ raf.readInt();
+    /* int scriptList  = */ raf.readInt();
+    /* int featureList = */ raf.readInt();
+    /* int lookupList  = */ raf.readInt();
+    /*        
         for (int i = 0; i < t_maxp.getNumGlyphs(); i++) {
             raf.seek(tde.getOffset() + t_loca.getOffset(i));
             int len = t_loca.getOffset((short)(i + 1)) - t_loca.getOffset(i);
@@ -61,20 +62,22 @@ public class GposTable implements Table {
                 }
             }
         }
-*/
-    }
-
-    /** Get the table type, as a table directory value.
-     * @return The table type
      */
-    @Override
-    public int getType() {
-        return GPOS;
-    }
-    
-    @Override
-    public String toString() {
-        return "GPOS";
-    }
+  }
+
+  /**
+   * Get the table type, as a table directory value.
+   *
+   * @return The table type
+   */
+  @Override
+  public int getType() {
+    return GPOS;
+  }
+
+  @Override
+  public String toString() {
+    return "GPOS";
+  }
 
 }

data/src/org/apache/batik/svggen/font/table/GsubTable.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,92 +27,95 @@ import org.apache.batik.svggen.font.*;
  */
 public class GsubTable implements Table, LookupSubtableFactory {
 
-    private final ScriptList scriptList;
-    private final FeatureList featureList;
-    private final LookupList lookupList;
-    
-    protected GsubTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
-        raf.seek(de.getOffset());
-
-        // GSUB Header
-        /* int version = */     raf.readInt();
-        int scriptListOffset  = raf.readUnsignedShort();
-        int featureListOffset = raf.readUnsignedShort();
-        int lookupListOffset  = raf.readUnsignedShort();
-
-        // Script List
-        scriptList = new ScriptList(raf, de.getOffset() + scriptListOffset);
-
-        // Feature List
-        featureList = new FeatureList(raf, de.getOffset() + featureListOffset);
-        
-        // Lookup List
-        lookupList = new LookupList(raf, de.getOffset() + lookupListOffset, this);
-    }
-
-    /**
-     * 1 - Single - Replace one glyph with one glyph 
-     * 2 - Multiple - Replace one glyph with more than one glyph 
-     * 3 - Alternate - Replace one glyph with one of many glyphs 
-     * 4 - Ligature - Replace multiple glyphs with one glyph 
-     * 5 - Context - Replace one or more glyphs in context 
-     * 6 - Chaining - Context Replace one or more glyphs in chained context
-     * @param type
-     * @param raf
-     * @param offset
-     * @return 
-     * @throws java.io.IOException 
-     */
-    @Override
-    public LookupSubtable read(int type, RandomAccessFileEmulator raf, int offset)
+  private final ScriptList scriptList;
+  private final FeatureList featureList;
+  private final LookupList lookupList;
+
+  protected GsubTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
+    raf.seek(de.getOffset());
+
+
+    // GSUB Header
+    /* int version = */ raf.readInt();
+    int scriptListOffset = raf.readUnsignedShort();
+    int featureListOffset = raf.readUnsignedShort();
+    int lookupListOffset = raf.readUnsignedShort();
+
+    // Script List
+    scriptList = new ScriptList(raf, de.getOffset() + scriptListOffset);
+
+    // Feature List
+    featureList = new FeatureList(raf, de.getOffset() + featureListOffset);
+
+    // Lookup List
+    lookupList = new LookupList(raf, de.getOffset() + lookupListOffset, this);
+  }
+
+  /**
+   * 1 - Single - Replace one glyph with one glyph 2 - Multiple - Replace one
+   * glyph with more than one glyph 3 - Alternate - Replace one glyph with one
+   * of many glyphs 4 - Ligature - Replace multiple glyphs with one glyph 5 -
+   * Context - Replace one or more glyphs in context 6 - Chaining - Context
+   * Replace one or more glyphs in chained context
+   *
+   * @param type
+   * @param raf
+   * @param offset
+   * @return
+   * @throws java.io.IOException
+   */
+  @Override
+  public LookupSubtable read(int type, RandomAccessFileEmulator raf, int offset)
     throws IOException {
-        LookupSubtable s = null;
-        switch (type) {
-        case 1:
-            s = SingleSubst.read(raf, offset);
-            break;
-        case 2:
+    LookupSubtable s = null;
+    switch (type) {
+      case 1:
+        s = SingleSubst.read(raf, offset);
+        break;
+      case 2:
 //            s = MultipleSubst.read(raf, offset);
-            break;
-        case 3:
+        break;
+      case 3:
 //            s = AlternateSubst.read(raf, offset);
-            break;
-        case 4:
-            s = LigatureSubst.read(raf, offset);
-            break;
-        case 5:
+        break;
+      case 4:
+        s = LigatureSubst.read(raf, offset);
+        break;
+      case 5:
 //            s = ContextSubst.read(raf, offset);
-            break;
-        case 6:
+        break;
+      case 6:
 //            s = ChainingSubst.read(raf, offset);
-            break;
-        }
-        return s;
-    }
-
-    /** Get the table type, as a table directory value.
-     * @return The table type
-     */
-    @Override
-    public int getType() {
-        return GSUB;
-    }
-
-    public ScriptList getScriptList() {
-        return scriptList;
-    }
-
-    public FeatureList getFeatureList() {
-        return featureList;
-    }
-
-    public LookupList getLookupList() {
-        return lookupList;
-    }
-
-    @Override
-    public String toString() {
-        return "GSUB";
+        break;
     }
+    return s;
+  }
+
+  /**
+   * Get the table type, as a table directory value.
+   *
+   * @return The table type
+   */
+  @Override
+  public int getType() {
+    return GSUB;
+  }
+
+  public ScriptList getScriptList() {
+    return scriptList;
+  }
+
+  public FeatureList getFeatureList() {
+    return featureList;
+  }
+
+  public LookupList getLookupList() {
+    return lookupList;
+  }
+
+  @Override
+  public String toString() {
+    return "GSUB";
+  }
 
 }