summaryrefslogtreecommitdiffstats
path: root/src/autofit/afcjk.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/autofit/afcjk.h')
-rw-r--r--src/autofit/afcjk.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/autofit/afcjk.h b/src/autofit/afcjk.h
index 6f5bdc5..4dd4f39 100644
--- a/src/autofit/afcjk.h
+++ b/src/autofit/afcjk.h
@@ -2,9 +2,9 @@
/* */
/* afcjk.h */
/* */
-/* Auto-fitter hinting routines for CJK script (specification). */
+/* Auto-fitter hinting routines for CJK writing system (specification). */
/* */
-/* Copyright 2006, 2007, 2011-2013 by */
+/* Copyright 2006, 2007, 2011-2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -31,11 +31,6 @@ FT_BEGIN_HEADER
AF_DECLARE_WRITING_SYSTEM_CLASS( af_cjk_writing_system_class )
- /* the CJK-specific script classes */
-
- AF_DECLARE_SCRIPT_CLASS( af_hani_script_class )
-
-
/*************************************************************************/
/*************************************************************************/
/***** *****/
@@ -55,8 +50,6 @@ FT_BEGIN_HEADER
( (b)->properties & AF_BLUE_PROPERTY_CJK_TOP )
#define AF_CJK_IS_HORIZ_BLUE( b ) \
( (b)->properties & AF_BLUE_PROPERTY_CJK_HORIZ )
-#define AF_CJK_IS_FILLED_BLUE( b ) \
- ( (b)->properties & AF_BLUE_PROPERTY_CJK_FILL )
#define AF_CJK_IS_RIGHT_BLUE AF_CJK_IS_TOP_BLUE
#define AF_CJK_MAX_WIDTHS 16
@@ -105,9 +98,9 @@ FT_BEGIN_HEADER
typedef struct AF_CJKMetricsRec_
{
- AF_ScriptMetricsRec root;
- FT_UInt units_per_em;
- AF_CJKAxisRec axis[AF_DIMENSION_MAX];
+ AF_StyleMetricsRec root;
+ FT_UInt units_per_em;
+ AF_CJKAxisRec axis[AF_DIMENSION_MAX];
} AF_CJKMetricsRec, *AF_CJKMetrics;