[Git][freetype/freetype][master] 4 commits: [truetype] Add checksums for

suzuki toshiya pushed to branch master at FreeType / FreeType

Commits:

1c23982d

by suzuki toshiya at 2021-08-24T16:46:06+09:00

[truetype] Add checksums for 2 tricky fonts.

Thanks to Ting717 for providing sample PDF. Fixes #1087.

* src/truetype/ttobjs.c (tt_check_trickyness_sfnt_ids): Add
checksums for 2 tricky fonts `DFHei-Bd-WIN-HK-BF' and
`DFMing-Md-WIN-HK-BF'.

2b3ccd6e

by suzuki toshiya at 2021-08-24T16:49:34+09:00

[truetype] New function to skip the randomization tag.

* src/truetype/ttobjs.c (tt_skip_pdffont_random_tag):
New function to skip the randomization tag in the names of the
fonts embedded in a PDF.  It is used by tt_check_trickyness_family(),
to keep from mistaking "DLC" in the randomization tag as a
tricky font name. See discussion in:

https://lists.nongnu.org/archive/html/freetype-devel/2021-02/msg00002.html

For technical detail about the randomization tag, please find
PDF Reference 5.5.3 "Font Subsets".  Thanks to Justyna Wawrzynska
for pointing out the issue caused by the randomization tag.

992382ba

by suzuki toshiya at 2021-08-24T16:51:54+09:00

[truetype] Add 2 tricky font names.

Additional fix for the issue #1087.

* src/truetype/ttobjs.c (tt_check_trickyness_family): Add 2 tricky
font names reported in #1087.

c4fc0e69

by suzuki toshiya at 2021-08-24T16:58:11+09:00

[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'.

1 changed file:

src/truetype/ttobjs.c

Changes:

src/truetype/ttobjs.c

@@ -143,6 +143,30 @@
  #endif /* TT_USE_BYTECODE_INTERPRETER */
 +  /* The fonts embedded in PDF changes their family names
 +   * by the randomization tag. PDF Reference 5.5.3 "Font
 +   * Subsets" defines its format as 6 uppercase letters and
 +   * '+' sign.  For safety, we do not skip the tag violating
 +   * this rule.
 +   */
++
 +  static const FT_String*
 +  tt_skip_pdffont_random_tag( const FT_String*  name )
 +  {
 +    unsigned int  i;
++
++
 +    if ( name[6] != '+' )
 +      return name;
++
 +    for ( i = 0; i < 6; i++ )
 +      if ( !ft_isupper( name[i] ) )
 +        return name;
++
 +    FT_TRACE7(( "name without randomization tag: %s\n", name + 7 ));
 +    return name + 7;
 +  }
++
    /* Compare the face with a list of well-known `tricky' fonts. */
    /* This list shall be expanded as we find more of them.       */
@@ -151,7 +175,7 @@
+   {
  #define TRICK_NAMES_MAX_CHARACTERS  19
 -#define TRICK_NAMES_COUNT           26
 +#define TRICK_NAMES_COUNT           20
      static const char trick_names[TRICK_NAMES_COUNT]
                                   [TRICK_NAMES_MAX_CHARACTERS + 1] =
@@ -171,22 +195,28 @@
        "DFGirl-W6-WIN-BF",   /* dftt-h6.ttf; version 1.00, 1993 */
        "DFGothic-EB",        /* DynaLab Inc. 1992-1995 */
        "DFGyoSho-Lt",        /* DynaLab Inc. 1992-1995 */
 -      "DFHei-Md-HK-BF",     /* maybe DynaLab Inc. */
 +      "DFHei",              /* DynaLab Inc. 1992-1995 [DFHei-Bd-WIN-HK-BF] */
 +                            /* 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-Bd-HK-BF",    /* maybe DynaLab Inc. */
++
 +      "DFMing",             /* DynaLab Inc. 1992-1995 [DFMing-Md-WIN-HK-BF] */
 +                            /* 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] */
@@ -199,10 +229,12 @@
      };
      int  nn;
 +    const FT_String*  name_without_tag;
 +    name_without_tag = tt_skip_pdffont_random_tag( name );
      for ( nn = 0; nn < TRICK_NAMES_COUNT; nn++ )
 -      if ( ft_strstr( name, trick_names[nn] ) )
 +      if ( ft_strstr( name_without_tag, trick_names[nn] ) )
          return TRUE;
      return FALSE;
@@ -277,7 +309,7 @@
    tt_check_trickyness_sfnt_ids( TT_Face  face )
+   {
  #define TRICK_SFNT_IDS_PER_FACE   3
 -#define TRICK_SFNT_IDS_NUM_FACES  29
 +#define TRICK_SFNT_IDS_NUM_FACES  31
      static const tt_sfnt_id_rec sfnt_id[TRICK_SFNT_IDS_NUM_FACES]
                                         [TRICK_SFNT_IDS_PER_FACE] = {
@@ -430,6 +462,16 @@
          { 0x00170003UL, 0x00000060UL }, /* cvt  */
          { 0xDBB4306EUL, 0x000058AAUL }, /* fpgm */
          { 0xD643482AUL, 0x00000035UL }  /* prep */
 +      },
 +        { /* DFHei-Bd-WIN-HK-BF, issue #1087 */
 +        { 0x1269EB58UL, 0x00000350UL }, /* cvt  */
 +        { 0x5CD5957AUL, 0x00006A4EUL }, /* fpgm */
 +        { 0xF758323AUL, 0x00000380UL }  /* prep */
 +      },
 +        { /* DFMing-Md-WIN-HK-BF, issue #1087 */
 +        { 0x122FEB0BUL, 0x00000350UL }, /* cvt  */
 +        { 0x7F10919AUL, 0x000070A9UL }, /* fpgm */
 +        { 0x7CD7E7B7UL, 0x0000025CUL }  /* prep */
+       }
      };
@@ -510,13 +552,21 @@
      /* For first, check the face name for quick check. */
      if ( face->family_name                               &&
           tt_check_trickyness_family( face->family_name ) )
 +    {
 +      FT_TRACE3(( "found as a tricky font by "
 +                  "its family name: %s\n", face->family_name ));
        return TRUE;
 +    }
      /* Type42 fonts may lack `name' tables, we thus try to identify */
      /* tricky fonts by checking the checksums of Type42-persistent  */
      /* sfnt tables (`cvt', `fpgm', and `prep').                     */
      if ( tt_check_trickyness_sfnt_ids( (TT_Face)face ) )
 +    {
 +      FT_TRACE3(( "found as a tricky font by "
 +                  "its cvt/fpgm/prep table checksum\n" ));
        return TRUE;
 +    }
      return FALSE;
+   }

From:	suzuki toshiya (@mpsuzuki)
Subject:	[Git][freetype/freetype][master] 4 commits: [truetype] Add checksums for 2 tricky fonts.
Date:	Tue, 24 Aug 2021 07:57:56 +0000