Moved CF2

24 files changed, 3 insertions, 24 deletions

diff --git a/src/cff/Jamfile b/src/cff/Jamfile
index e6dd05fc1..f665a0b25 100644
--- a/src/cff/Jamfile
+++ b/src/cff/Jamfile
@@ -23,15 +23,6 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) cff ;
                cffobjs
                cffparse
                cffpic
-               cf2arrst
-               cf2blues
-               cf2error
-               cf2font
-               cf2ft
-               cf2hints
-               cf2intrp
-               cf2read
-               cf2stack
                ;
   }
   else
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 52b9bf34e..fd31f8d19 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -27,7 +27,7 @@
 #include "cffobjs.h"
 #include "cffload.h"
 #include "cffgload.h"
-#include "cf2ft.h"      /* for cf2_decoder_parse_charstrings */
+//#include "cf2ft.h"      /* for cf2_decoder_parse_charstrings */
 
 #include "cfferrs.h"
 
diff --git a/src/cff/rules.mk b/src/cff/rules.mk
index 86840bfe3..feecf4611 100644
--- a/src/cff/rules.mk
+++ b/src/cff/rules.mk
@@ -32,16 +32,7 @@ CFF_DRV_SRC := $(CFF_DIR)/cffcmap.c  \
                $(CFF_DIR)/cffload.c  \
                $(CFF_DIR)/cffobjs.c  \
                $(CFF_DIR)/cffparse.c \
-               $(CFF_DIR)/cffpic.c   \
-               $(CFF_DIR)/cf2arrst.c \
-               $(CFF_DIR)/cf2blues.c \
-               $(CFF_DIR)/cf2error.c \
-               $(CFF_DIR)/cf2font.c  \
-               $(CFF_DIR)/cf2ft.c    \
-               $(CFF_DIR)/cf2hints.c \
-               $(CFF_DIR)/cf2intrp.c \
-               $(CFF_DIR)/cf2read.c  \
-               $(CFF_DIR)/cf2stack.c
+               $(CFF_DIR)/cffpic.c
 
 
 # CFF driver headers
@@ -49,10 +40,7 @@ CFF_DRV_SRC := $(CFF_DIR)/cffcmap.c  \
 CFF_DRV_H := $(CFF_DRV_SRC:%.c=%.h) \
              $(CFF_DIR)/cfferrs.h   \
              $(CFF_DIR)/cfftoken.h  \
-             $(CFF_DIR)/cfftypes.h  \
-             $(CFF_DIR)/cf2fixed.h  \
-             $(CFF_DIR)/cf2glue.h   \
-             $(CFF_DIR)/cf2types.h
+             $(CFF_DIR)/cfftypes.h 
 
 
 # CFF driver object(s)
diff --git a/src/cff/cf2arrst.c b/src/psaux/cf2arrst.c
index 6796450fe..6796450fe 100644
--- a/src/cff/cf2arrst.c
+++ b/src/psaux/cf2arrst.c
diff --git a/src/cff/cf2arrst.h b/src/psaux/cf2arrst.h
index 3c21a3b67..3c21a3b67 100644
--- a/src/cff/cf2arrst.h
+++ b/src/psaux/cf2arrst.h
diff --git a/src/cff/cf2blues.c b/src/psaux/cf2blues.c
index a94254d82..a94254d82 100644
--- a/src/cff/cf2blues.c
+++ b/src/psaux/cf2blues.c
diff --git a/src/cff/cf2blues.h b/src/psaux/cf2blues.h
index a6bcd9de5..a6bcd9de5 100644
--- a/src/cff/cf2blues.h
+++ b/src/psaux/cf2blues.h
diff --git a/src/cff/cf2error.c b/src/psaux/cf2error.c
index e3dd69f50..e3dd69f50 100644
--- a/src/cff/cf2error.c
+++ b/src/psaux/cf2error.c
diff --git a/src/cff/cf2error.h b/src/psaux/cf2error.h
index d2c770d29..d2c770d29 100644
--- a/src/cff/cf2error.h
+++ b/src/psaux/cf2error.h
diff --git a/src/cff/cf2fixed.h b/src/psaux/cf2fixed.h
index d8e695b15..d8e695b15 100644
--- a/src/cff/cf2fixed.h
+++ b/src/psaux/cf2fixed.h
diff --git a/src/cff/cf2font.c b/src/psaux/cf2font.c
index c81f93845..c81f93845 100644
--- a/src/cff/cf2font.c
+++ b/src/psaux/cf2font.c
diff --git a/src/cff/cf2font.h b/src/psaux/cf2font.h
index 17ecd17bb..17ecd17bb 100644
--- a/src/cff/cf2font.h
+++ b/src/psaux/cf2font.h
diff --git a/src/cff/cf2ft.c b/src/psaux/cf2ft.c
index 3bc007b9b..3bc007b9b 100644
--- a/src/cff/cf2ft.c
+++ b/src/psaux/cf2ft.c
diff --git a/src/cff/cf2ft.h b/src/psaux/cf2ft.h
index b054a6e95..b054a6e95 100644
--- a/src/cff/cf2ft.h
+++ b/src/psaux/cf2ft.h
diff --git a/src/cff/cf2glue.h b/src/psaux/cf2glue.h
index 56a7c248f..56a7c248f 100644
--- a/src/cff/cf2glue.h
+++ b/src/psaux/cf2glue.h
diff --git a/src/cff/cf2hints.c b/src/psaux/cf2hints.c
index d7938c9c6..d7938c9c6 100644
--- a/src/cff/cf2hints.c
+++ b/src/psaux/cf2hints.c
diff --git a/src/cff/cf2hints.h b/src/psaux/cf2hints.h
index a8984542a..a8984542a 100644
--- a/src/cff/cf2hints.h
+++ b/src/psaux/cf2hints.h
diff --git a/src/cff/cf2intrp.c b/src/psaux/cf2intrp.c
index 356475828..356475828 100644
--- a/src/cff/cf2intrp.c
+++ b/src/psaux/cf2intrp.c
diff --git a/src/cff/cf2intrp.h b/src/psaux/cf2intrp.h
index ec030e894..ec030e894 100644
--- a/src/cff/cf2intrp.h
+++ b/src/psaux/cf2intrp.h
diff --git a/src/cff/cf2read.c b/src/psaux/cf2read.c
index 2b429e3ee..2b429e3ee 100644
--- a/src/cff/cf2read.c
+++ b/src/psaux/cf2read.c
diff --git a/src/cff/cf2read.h b/src/psaux/cf2read.h
index b0b0db803..b0b0db803 100644
--- a/src/cff/cf2read.h
+++ b/src/psaux/cf2read.h
diff --git a/src/cff/cf2stack.c b/src/psaux/cf2stack.c
index 12a026d21..12a026d21 100644
--- a/src/cff/cf2stack.c
+++ b/src/psaux/cf2stack.c
diff --git a/src/cff/cf2stack.h b/src/psaux/cf2stack.h
index ef08eefe4..ef08eefe4 100644
--- a/src/cff/cf2stack.h
+++ b/src/psaux/cf2stack.h
diff --git a/src/cff/cf2types.h b/src/psaux/cf2types.h
index 5b7e1239a..5b7e1239a 100644
--- a/src/cff/cf2types.h
+++ b/src/psaux/cf2types.h