23 files changed, 38 insertions, 39 deletions
diff --git a/src/net/java/dev/typecast/app/editor/GlyphPanel.java b/src/net/java/dev/typecast/app/editor/GlyphPanel.java
index a992261..4271e75 100644
--- a/src/net/java/dev/typecast/app/editor/GlyphPanel.java
+++ b/src/net/java/dev/typecast/app/editor/GlyphPanel.java
@@ -26,7 +26,7 @@ import net.java.dev.typecast.app.framework.EditorView;
 import net.java.dev.typecast.edit.GlyphEdit;
 import net.java.dev.typecast.ot.Glyph;
 import net.java.dev.typecast.ot.OTFont;
-import net.java.dev.typecast.t2.Charstring;
+import net.java.dev.typecast.cff.Charstring;
 import net.java.dev.typecast.ot.table.GlyphDescription;
 
 /**
diff --git a/src/net/java/dev/typecast/app/editor/Main.java b/src/net/java/dev/typecast/app/editor/Main.java
index 034b191..ce173d3 100644
--- a/src/net/java/dev/typecast/app/editor/Main.java
+++ b/src/net/java/dev/typecast/app/editor/Main.java
@@ -388,7 +388,7 @@ public class Main {
 
         // Then add the panes we're interested in
         if (obj instanceof GlyphDescription
-                || obj instanceof net.java.dev.typecast.t2.Charstring) {
+                || obj instanceof net.java.dev.typecast.cff.Charstring) {
             _glyphPane = new GlyphPanel(_appPrefs);
             _glyphPane.setModel(font, obj);
             _tabbedPane.add(_glyphPane);
diff --git a/src/net/java/dev/typecast/app/editor/TableTreeBuilder.java b/src/net/java/dev/typecast/app/editor/TableTreeBuilder.java
index 39ad633..6fc7519 100644
--- a/src/net/java/dev/typecast/app/editor/TableTreeBuilder.java
+++ b/src/net/java/dev/typecast/app/editor/TableTreeBuilder.java
@@ -37,13 +37,13 @@ import net.java.dev.typecast.ot.table.GlyfCompositeDescript;
 import net.java.dev.typecast.ot.table.GlyfDescript;
 import net.java.dev.typecast.ot.table.GlyfTable;
 import net.java.dev.typecast.ot.table.CffTable;
-import net.java.dev.typecast.t2.Charstring;
+import net.java.dev.typecast.cff.Charstring;
 import net.java.dev.typecast.ot.table.GsubTable;
 import net.java.dev.typecast.ot.table.ID;
 import net.java.dev.typecast.ot.table.LangSys;
 import net.java.dev.typecast.ot.table.Lookup;
 import net.java.dev.typecast.ot.table.LookupSubtable;
-import net.java.dev.typecast.t2.NameIndex;
+import net.java.dev.typecast.cff.NameIndex;
 import net.java.dev.typecast.ot.table.NameRecord;
 import net.java.dev.typecast.ot.table.NameTable;
 import net.java.dev.typecast.ot.table.PostTable;
diff --git a/src/net/java/dev/typecast/t2/CffFont.java b/src/net/java/dev/typecast/cff/CffFont.java
index 68d8bda..1231a34 100644
--- a/src/net/java/dev/typecast/t2/CffFont.java
+++ b/src/net/java/dev/typecast/cff/CffFont.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 /**
  *
diff --git a/src/net/java/dev/typecast/t2/CffStandardStrings.java b/src/net/java/dev/typecast/cff/CffStandardStrings.java
index a2f8cca..4da6167 100644
--- a/src/net/java/dev/typecast/t2/CffStandardStrings.java
+++ b/src/net/java/dev/typecast/cff/CffStandardStrings.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 /**
  * Compact Font Format Standard Strings.  As per Appendix A of the Adobe
diff --git a/src/net/java/dev/typecast/t2/Charset.java b/src/net/java/dev/typecast/cff/Charset.java
index e221828..fd16acd 100644
--- a/src/net/java/dev/typecast/t2/Charset.java
+++ b/src/net/java/dev/typecast/cff/Charset.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 /**
  *
diff --git a/src/net/java/dev/typecast/t2/CharsetFormat0.java b/src/net/java/dev/typecast/cff/CharsetFormat0.java
index dfca79b..a7f97f5 100644
--- a/src/net/java/dev/typecast/t2/CharsetFormat0.java
+++ b/src/net/java/dev/typecast/cff/CharsetFormat0.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/CharsetFormat1.java b/src/net/java/dev/typecast/cff/CharsetFormat1.java
index 1a0a64f..9b5e93a 100644
--- a/src/net/java/dev/typecast/t2/CharsetFormat1.java
+++ b/src/net/java/dev/typecast/cff/CharsetFormat1.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/CharsetFormat2.java b/src/net/java/dev/typecast/cff/CharsetFormat2.java
index 6ccdd86..69fadf9 100644
--- a/src/net/java/dev/typecast/t2/CharsetFormat2.java
+++ b/src/net/java/dev/typecast/cff/CharsetFormat2.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/CharsetRange.java b/src/net/java/dev/typecast/cff/CharsetRange.java
index 452adc3..b3d0888 100644
--- a/src/net/java/dev/typecast/t2/CharsetRange.java
+++ b/src/net/java/dev/typecast/cff/CharsetRange.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 /**
  *
diff --git a/src/net/java/dev/typecast/t2/CharsetRange1.java b/src/net/java/dev/typecast/cff/CharsetRange1.java
index dff99d8..dc33430 100644
--- a/src/net/java/dev/typecast/t2/CharsetRange1.java
+++ b/src/net/java/dev/typecast/cff/CharsetRange1.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/CharsetRange2.java b/src/net/java/dev/typecast/cff/CharsetRange2.java
index 18b2baf..9e14c44 100644
--- a/src/net/java/dev/typecast/t2/CharsetRange2.java
+++ b/src/net/java/dev/typecast/cff/CharsetRange2.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/Charstring.java b/src/net/java/dev/typecast/cff/Charstring.java
index 36b8f77..c093d3f 100644
--- a/src/net/java/dev/typecast/t2/Charstring.java
+++ b/src/net/java/dev/typecast/cff/Charstring.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 /**
  * CFF Charstring
diff --git a/src/net/java/dev/typecast/t2/CharstringType2.java b/src/net/java/dev/typecast/cff/CharstringType2.java
index eb8bc69..b5da650 100644
--- a/src/net/java/dev/typecast/t2/CharstringType2.java
+++ b/src/net/java/dev/typecast/cff/CharstringType2.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 /**
  * CFF Type 2 Charstring
diff --git a/src/net/java/dev/typecast/t2/Dict.java b/src/net/java/dev/typecast/cff/Dict.java
index d4c6d79..5c500d8 100644
--- a/src/net/java/dev/typecast/t2/Dict.java
+++ b/src/net/java/dev/typecast/cff/Dict.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/Index.java b/src/net/java/dev/typecast/cff/Index.java
index dcad83b..1e8fb81 100644
--- a/src/net/java/dev/typecast/t2/Index.java
+++ b/src/net/java/dev/typecast/cff/Index.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/NameIndex.java b/src/net/java/dev/typecast/cff/NameIndex.java
index 3831070..fa8bdab 100644
--- a/src/net/java/dev/typecast/t2/NameIndex.java
+++ b/src/net/java/dev/typecast/cff/NameIndex.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/StringIndex.java b/src/net/java/dev/typecast/cff/StringIndex.java
index ece39ab..3a25967 100644
--- a/src/net/java/dev/typecast/t2/StringIndex.java
+++ b/src/net/java/dev/typecast/cff/StringIndex.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/t2/T2Interpreter.java b/src/net/java/dev/typecast/cff/T2Interpreter.java
index f15856d..b823454 100644
--- a/src/net/java/dev/typecast/t2/T2Interpreter.java
+++ b/src/net/java/dev/typecast/cff/T2Interpreter.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.util.ArrayList;
 import net.java.dev.typecast.ot.Point;
diff --git a/src/net/java/dev/typecast/t2/T2Mnemonic.java b/src/net/java/dev/typecast/cff/T2Mnemonic.java
index 09e7278..55e3507 100644
--- a/src/net/java/dev/typecast/t2/T2Mnemonic.java
+++ b/src/net/java/dev/typecast/cff/T2Mnemonic.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 /**
  * The Mnemonic representations of the Type 2 charstring instruction set.
diff --git a/src/net/java/dev/typecast/t2/TopDictIndex.java b/src/net/java/dev/typecast/cff/TopDictIndex.java
index cd22466..d7b092e 100644
--- a/src/net/java/dev/typecast/t2/TopDictIndex.java
+++ b/src/net/java/dev/typecast/cff/TopDictIndex.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.dev.typecast.t2;
+package net.java.dev.typecast.cff;
 
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/src/net/java/dev/typecast/ot/Glyph.java b/src/net/java/dev/typecast/ot/Glyph.java
index 8dfa015..0a5d6d2 100644
--- a/src/net/java/dev/typecast/ot/Glyph.java
+++ b/src/net/java/dev/typecast/ot/Glyph.java
@@ -53,11 +53,10 @@ package net.java.dev.typecast.ot;
 import net.java.dev.typecast.ot.table.CffTable;
 import net.java.dev.typecast.ot.table.GlyphDescription;
 import net.java.dev.typecast.ot.table.GlyfDescript;
-import net.java.dev.typecast.t2.Charstring;
-import net.java.dev.typecast.t2.CharstringType2;
-import net.java.dev.typecast.t2.Index;
-
-import net.java.dev.typecast.t2.T2Interpreter;
+import net.java.dev.typecast.cff.Charstring;
+import net.java.dev.typecast.cff.CharstringType2;
+import net.java.dev.typecast.cff.Index;
+import net.java.dev.typecast.cff.T2Interpreter;
 
 /**
  * An individual glyph within a font.
diff --git a/src/net/java/dev/typecast/ot/table/CffTable.java b/src/net/java/dev/typecast/ot/table/CffTable.java
index 4136c7c..9739381 100644
--- a/src/net/java/dev/typecast/ot/table/CffTable.java
+++ b/src/net/java/dev/typecast/ot/table/CffTable.java
@@ -23,18 +23,18 @@ import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.List;
-import net.java.dev.typecast.t2.CffFont;
-import net.java.dev.typecast.t2.Charset;
-import net.java.dev.typecast.t2.CharsetFormat0;
-import net.java.dev.typecast.t2.CharsetFormat1;
-import net.java.dev.typecast.t2.CharsetFormat2;
-import net.java.dev.typecast.t2.Charstring;
-import net.java.dev.typecast.t2.CharstringType2;
-import net.java.dev.typecast.t2.Dict;
-import net.java.dev.typecast.t2.Index;
-import net.java.dev.typecast.t2.NameIndex;
-import net.java.dev.typecast.t2.StringIndex;
-import net.java.dev.typecast.t2.TopDictIndex;
+import net.java.dev.typecast.cff.CffFont;
+import net.java.dev.typecast.cff.Charset;
+import net.java.dev.typecast.cff.CharsetFormat0;
+import net.java.dev.typecast.cff.CharsetFormat1;
+import net.java.dev.typecast.cff.CharsetFormat2;
+import net.java.dev.typecast.cff.Charstring;
+import net.java.dev.typecast.cff.CharstringType2;
+import net.java.dev.typecast.cff.Dict;
+import net.java.dev.typecast.cff.Index;
+import net.java.dev.typecast.cff.NameIndex;
+import net.java.dev.typecast.cff.StringIndex;
+import net.java.dev.typecast.cff.TopDictIndex;
 
 /**
  * Compact Font Format Table