Commit 5abd252a0a26a878c6b7830f10e0611f1d6c0425

Alexei Podtelezhnikov 2020-11-20T15:24:42

[cff,cid,type1] Demote old engine for lack of CFF2. * src/cff/cffobjs.c (cff_iriver_init): Always default to Adobe engine. * src/cid/cidobjs.c (cid_driver_init): Ditto. * src/type1/t1objs.c (T1_Driver_Init): Ditto.

diff --git a/ChangeLog b/ChangeLog
index ae007eb..60eee3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-11-20  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[cff,cid,type1] Demote old engine for lack of CFF2.
+
+	* src/cff/cffobjs.c (cff_iriver_init): Always default to Adobe engine.
+	* src/cid/cidobjs.c (cid_driver_init): Ditto.
+        * src/type1/t1objs.c (T1_Driver_Init): Ditto.
+
 2020-11-09  Werner Lemberg  <wl@gnu.org>
 
 	* src/type42/t42parse.c (t42_parse_sfnts): More tracing messages.
diff --git a/docs/CHANGES b/docs/CHANGES
index 77fb356..31f8088 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -2,6 +2,10 @@ CHANGES BETWEEN 2.10.4 and 2.11.0
 
   I. IMPORTANT CHANGES
 
+  - The legacy Type 1/CFF engine  is  further demoted  due to  lack of
+    CFF2 charstring support.  You now need  to use FT_Property_Set  to
+    enable it besides T1/CFF_CONFIG_OPTION_OLD_ENGINE options.
+
 
   II. MISCELLANEOUS
 
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index d555d52..418c0c0 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -1174,11 +1174,7 @@
 
 
     /* set default property values, cf. `ftcffdrv.h' */
-#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
-    driver->hinting_engine = FT_HINTING_FREETYPE;
-#else
     driver->hinting_engine = FT_HINTING_ADOBE;
-#endif
 
     driver->no_stem_darkening = TRUE;
 
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 04b295e..53a8f15 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -479,11 +479,7 @@
 
 
     /* set default property values, cf. `ftt1drv.h' */
-#ifdef T1_CONFIG_OPTION_OLD_ENGINE
-    driver->hinting_engine = FT_HINTING_FREETYPE;
-#else
     driver->hinting_engine = FT_HINTING_ADOBE;
-#endif
 
     driver->no_stem_darkening = TRUE;
 
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index 3b918b7..d85bf5c 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -598,11 +598,7 @@
 
 
     /* set default property values, cf. `ftt1drv.h' */
-#ifdef T1_CONFIG_OPTION_OLD_ENGINE
-    driver->hinting_engine = FT_HINTING_FREETYPE;
-#else
     driver->hinting_engine = FT_HINTING_ADOBE;
-#endif
 
     driver->no_stem_darkening = TRUE;