rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[type42] Support `CharStrings' entry format as created by LilyPond. 

* src/type42/t42parse.c (t42_parse_charstrings): Handle entries
having the format

  (foo) cvn 12345 def
This commit is contained in:
Werner Lemberg 2016-05-30 00:23:59 +02:00
parent 46d36904b0
commit d28eac249a
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2016-05-30 Werner Lemberg <wl@gnu.org>
[type42] Support `CharStrings' entry format as created by LilyPond.
* src/type42/t42parse.c (t42_parse_charstrings): Handle entries
having the format
(foo) cvn 12345 def
2016-05-28 Werner Lemberg <wl@gnu.org>
* src/autofit/afranges.c: Remove `UL' postfix from hex numbers.

19
src/type42/t42parse.c
View File

@ -899,8 +899,13 @@
for (;;)
{
/* The format is simple: */
/* `/glyphname' + index [+ def] */
/* We support two formats. */
/* */
/* `/glyphname' + index [+ `def'] */
/* `(glyphname)' [+ `cvn'] + index [+ `def'] */
/* */
/* The latter format gets created by the */
/* LilyPond typesetting program. */
T1_Skip_Spaces( parser );
@ -928,12 +933,13 @@
if ( parser->root.error )
return;
if ( *cur == '/' )
if ( *cur == '/' || *cur == '(' )
{
FT_UInt len;
FT_Bool have_literal = ( *cur == '(' );
if ( cur + 2 >= limit )
if ( cur + ( have_literal ? 3 : 2 ) >= limit )
{
FT_ERROR(( "t42_parse_charstrings: out of bounds\n" ));
error = FT_THROW( Invalid_File_Format );
@ -942,6 +948,8 @@
cur++; /* skip `/' */
len = (FT_UInt)( parser->root.cursor - cur );
if ( have_literal )
len--;
error = T1_Add_Table( name_table, n, cur, len + 1 );
if ( error )
@ -961,6 +969,9 @@
T1_Skip_Spaces( parser );
if ( have_literal )
T1_Skip_PS_Token( parser );
cur = parser->root.cursor;
(void)T1_ToInt( parser );