[freetype2] master c4fc0e6 4/4: [truetype] Simplify `trick_names'.

[Werner Lemberg]

branch: master
commit c4fc0e690c452fe2ea3ad909a2ae484cf34c7742
Author: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Commit: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>

    [truetype] Simplify `trick_names'.
    
    * src/truetype/ttobjs.c (tt_check_trickyness_family): For the case
    that the beginning part of a long tricky family name is already
    registered as another tricky family name, no need to double-check
    the longer one.  Such long tricky family names are removed from
    the `trick_names'.
---
 src/truetype/ttobjs.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 03f2518..9029aea 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -175,7 +175,7 @@
   {
 
 #define TRICK_NAMES_MAX_CHARACTERS  19
-#define TRICK_NAMES_COUNT           28
+#define TRICK_NAMES_COUNT           20
 
     static const char trick_names[TRICK_NAMES_COUNT]
                                  [TRICK_NAMES_MAX_CHARACTERS + 1] =
@@ -196,23 +196,27 @@
       "DFGothic-EB",        /* DynaLab Inc. 1992-1995 */
       "DFGyoSho-Lt",        /* DynaLab Inc. 1992-1995 */
       "DFHei",              /* DynaLab Inc. 1992-1995 [DFHei-Bd-WIN-HK-BF] */
-      "DFHei-Md-HK-BF",     /* maybe DynaLab Inc. */
+                            /* covers "DFHei-Md-HK-BF" maybe DynaLab Inc. */
+
       "DFHSGothic-W5",      /* DynaLab Inc. 1992-1995 */
       "DFHSMincho-W3",      /* DynaLab Inc. 1992-1995 */
       "DFHSMincho-W7",      /* DynaLab Inc. 1992-1995 */
       "DFKaiSho-SB",        /* dfkaisb.ttf */
-      "DFKaiShu",
-      "DFKaiShu-Md-HK-BF",  /* maybe DynaLab Inc. */
+      "DFKaiShu",           /* covers "DFKaiShu-Md-HK-BF", maybe DynaLab Inc. 
*/
       "DFKai-SB",           /* kaiu.ttf; version 3.00, 1998 
[DFKaiShu-SB-Estd-BF] */
+
       "DFMing",             /* DynaLab Inc. 1992-1995 [DFMing-Md-WIN-HK-BF] */
-      "DFMing-Bd-HK-BF",    /* maybe DynaLab Inc. */
+                            /* covers "DFMing-Bd-HK-BF", maybe DynaLab Inc. */
+
       "DLC",                /* dftt-m7.ttf; version 1.00, 1993 [DLCMingBold] */
                             /* dftt-f5.ttf; version 1.00, 1993 [DLCFongSung] */
-      "DLCHayMedium",       /* dftt-b5.ttf; version 1.00, 1993 */
-      "DLCHayBold",         /* dftt-b7.ttf; version 1.00, 1993 */
-      "DLCKaiMedium",       /* dftt-k5.ttf; version 1.00, 1992 */
-      "DLCLiShu",           /* dftt-l5.ttf; version 1.00, 1992 */
-      "DLCRoundBold",       /* dftt-r7.ttf; version 1.00, 1993 */
+                            /* covers following */
+                            /* "DLCHayMedium", dftt-b5.ttf; version 1.00, 1993 
*/
+                            /* "DLCHayBold",   dftt-b7.ttf; version 1.00, 1993 
*/
+                            /* "DLCKaiMedium", dftt-k5.ttf; version 1.00, 1992 
*/
+                            /* "DLCLiShu",     dftt-l5.ttf; version 1.00, 1992 
*/
+                            /* "DLCRoundBold", dftt-r7.ttf; version 1.00, 1993 
*/
+
       "HuaTianKaiTi?",      /* htkt2.ttf */
       "HuaTianSongTi?",     /* htst3.ttf */
       "Ming(for ISO10646)", /* hkscsiic.ttf; version 0.12, 2007 [Ming] */