2000-07-09 02:48:37 +02:00
|
|
|
/***************************************************************************/
|
|
|
|
/* */
|
2000-10-28 19:10:06 +02:00
|
|
|
/* t1load.c */
|
2000-07-09 02:48:37 +02:00
|
|
|
/* */
|
2000-10-28 19:10:06 +02:00
|
|
|
/* Type 1 font loader (body). */
|
2000-07-09 02:48:37 +02:00
|
|
|
/* */
|
2008-05-15 01:26:20 +02:00
|
|
|
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */
|
2000-07-09 02:48:37 +02:00
|
|
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
|
|
|
/* */
|
|
|
|
/* This file is part of the FreeType project, and may only be used, */
|
|
|
|
/* modified, and distributed under the terms of the FreeType project */
|
|
|
|
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
|
|
|
|
/* this file you indicate that you have read the license and */
|
|
|
|
/* understand and accept it fully. */
|
|
|
|
/* */
|
|
|
|
/***************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* This is the new and improved Type 1 data loader for FreeType 2. The */
|
|
|
|
/* old loader has several problems: it is slow, complex, difficult to */
|
|
|
|
/* maintain, and contains incredible hacks to make it accept some */
|
|
|
|
/* ill-formed Type 1 fonts without hiccup-ing. Moreover, about 5% of */
|
|
|
|
/* the Type 1 fonts on my machine still aren't loaded correctly by it. */
|
|
|
|
/* */
|
|
|
|
/* This version is much simpler, much faster and also easier to read and */
|
|
|
|
/* maintain by a great order of magnitude. The idea behind it is to */
|
|
|
|
/* _not_ try to read the Type 1 token stream with a state machine (i.e. */
|
|
|
|
/* a Postscript-like interpreter) but rather to perform simple pattern */
|
|
|
|
/* matching. */
|
|
|
|
/* */
|
|
|
|
/* Indeed, nearly all data definitions follow a simple pattern like */
|
|
|
|
/* */
|
|
|
|
/* ... /Field <data> ... */
|
|
|
|
/* */
|
|
|
|
/* where <data> can be a number, a boolean, a string, or an array of */
|
|
|
|
/* numbers. There are a few exceptions, namely the encoding, font name, */
|
|
|
|
/* charstrings, and subrs; they are handled with a special pattern */
|
|
|
|
/* matching routine. */
|
|
|
|
/* */
|
|
|
|
/* All other common cases are handled very simply. The matching rules */
|
|
|
|
/* are defined in the file `t1tokens.h' through the use of several */
|
2003-10-07 07:49:41 +02:00
|
|
|
/* macros calls PARSE_XXX. This file is included twice here; the first */
|
|
|
|
/* time to generate parsing callback functions, the second time to */
|
|
|
|
/* generate a table of keywords (with pointers to the associated */
|
|
|
|
/* callback functions). */
|
2000-07-09 02:48:37 +02:00
|
|
|
/* */
|
|
|
|
/* The function `parse_dict' simply scans *linearly* a given dictionary */
|
|
|
|
/* (either the top-level or private one) and calls the appropriate */
|
|
|
|
/* callback when it encounters an immediate keyword. */
|
|
|
|
/* */
|
|
|
|
/* This is by far the fastest way one can find to parse and read all */
|
|
|
|
/* data. */
|
|
|
|
/* */
|
|
|
|
/* This led to tremendous code size reduction. Note that later, the */
|
|
|
|
/* glyph loader will also be _greatly_ simplified, and the automatic */
|
|
|
|
/* hinter will replace the clumsy `t1hinter'. */
|
|
|
|
/* */
|
|
|
|
/*************************************************************************/
|
|
|
|
|
2000-12-08 17:17:16 +01:00
|
|
|
|
2000-12-08 03:42:29 +01:00
|
|
|
#include <ft2build.h>
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
|
|
|
#include FT_CONFIG_CONFIG_H
|
|
|
|
#include FT_MULTIPLE_MASTERS_H
|
|
|
|
#include FT_INTERNAL_TYPE1_TYPES_H
|
|
|
|
|
2001-03-20 12:14:24 +01:00
|
|
|
#include "t1load.h"
|
Complete redesign of error codes. Please check ftmoderr.h for more
details.
* include/freetype/internal/cfferrs.h,
include/freetype/internal/tterrors.h,
include/freetype/internal/t1errors.h: Removed. Replaced with files
local to the module. All extra error codes have been moved to
`fterrors.h'.
* src/sfnt/ttpost.h: Move error codes to `fterrors.h'.
* src/autohint/aherrors.h, src/cache/ftcerror.h, src/cff/cfferrs.h,
src/cid/ciderrs.h, src/pcf/pcferror.h, src/psaux/psauxerr.h,
src/psnames/psnamerr.h, src/raster/rasterrs.h, src/sfnt/sferrors.h,
src/smooth/ftsmerrs.h, src/truetype/tterrors.h,
src/type1/t1errors.h, src/winfonts/fnterrs.h: New files defining the
error names for the module it belongs to.
* include/freetype/ftmoderr.h: New file, defining the module error
offsets. Its structure is similar to `fterrors.h'.
* include/freetype/fterrors.h (FT_NOERRORDEF): New macro.
(FT_ERRORDEF): Redefined to use module error offsets.
All internal error codes are now public; unused error codes have
been removed, some are new.
* include/freetype/config/ftheader.h (FT_MODULE_ERRORS_H): New
macro.
* include/freetype/config/ftoption.h
(FT_CONFIG_OPTION_USE_MODULE_ERRORS): New macro.
All other source files have been updated to use the new error codes;
some already existing (internal) error codes local to a module have
been renamed to give them the same name as in the base module.
All make files have been updated to include the local error files.
* src/cid/cidtokens.h: Replaced with...
* src/cid/cidtoken.h: This file for 8+3 consistency.
* src/raster/ftraster.c: Use macros for header file names.
2001-06-06 19:30:41 +02:00
|
|
|
#include "t1errors.h"
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
|
|
|
|
/* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
|
|
|
|
/* messages during execution. */
|
|
|
|
/* */
|
2000-01-27 15:02:04 +01:00
|
|
|
#undef FT_COMPONENT
|
2000-10-28 19:10:06 +02:00
|
|
|
#define FT_COMPONENT trace_t1load
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** MULTIPLE MASTERS SUPPORT *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static FT_Error
|
|
|
|
t1_allocate_blend( T1_Face face,
|
|
|
|
FT_UInt num_designs,
|
|
|
|
FT_UInt num_axis )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2002-04-02 00:01:46 +02:00
|
|
|
PS_Blend blend;
|
2000-07-09 02:48:37 +02:00
|
|
|
FT_Memory memory = face->root.memory;
|
2003-10-07 07:49:41 +02:00
|
|
|
FT_Error error = T1_Err_Ok;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
blend = face->blend;
|
|
|
|
if ( !blend )
|
|
|
|
{
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW( blend ) )
|
2000-07-09 02:48:37 +02:00
|
|
|
goto Exit;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
blend->num_default_design_vector = 0;
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
face->blend = blend;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* allocate design data if needed */
|
|
|
|
if ( num_designs > 0 )
|
|
|
|
{
|
|
|
|
if ( blend->num_designs == 0 )
|
|
|
|
{
|
2000-07-10 22:30:59 +02:00
|
|
|
FT_UInt nn;
|
2000-10-31 21:42:18 +01:00
|
|
|
|
2000-07-10 23:41:32 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* allocate the blend `private' and `font_info' dictionaries */
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( blend->font_infos[1], num_designs ) ||
|
|
|
|
FT_NEW_ARRAY( blend->privates[1], num_designs ) ||
|
2002-07-11 13:26:21 +02:00
|
|
|
FT_NEW_ARRAY( blend->bboxes[1], num_designs ) ||
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_NEW_ARRAY( blend->weight_vector, num_designs * 2 ) )
|
2000-07-09 02:48:37 +02:00
|
|
|
goto Exit;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
blend->default_weight_vector = blend->weight_vector + num_designs;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
blend->font_infos[0] = &face->type1.font_info;
|
|
|
|
blend->privates [0] = &face->type1.private_dict;
|
2002-07-11 13:26:21 +02:00
|
|
|
blend->bboxes [0] = &face->type1.font_bbox;
|
2000-10-31 21:42:18 +01:00
|
|
|
|
2000-07-10 22:30:59 +02:00
|
|
|
for ( nn = 2; nn <= num_designs; nn++ )
|
|
|
|
{
|
2000-07-10 23:41:32 +02:00
|
|
|
blend->privates[nn] = blend->privates [nn - 1] + 1;
|
|
|
|
blend->font_infos[nn] = blend->font_infos[nn - 1] + 1;
|
2002-07-11 13:26:21 +02:00
|
|
|
blend->bboxes[nn] = blend->bboxes [nn - 1] + 1;
|
2000-07-10 22:30:59 +02:00
|
|
|
}
|
2000-10-31 21:42:18 +01:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
blend->num_designs = num_designs;
|
|
|
|
}
|
|
|
|
else if ( blend->num_designs != num_designs )
|
|
|
|
goto Fail;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* allocate axis data if needed */
|
|
|
|
if ( num_axis > 0 )
|
|
|
|
{
|
|
|
|
if ( blend->num_axis != 0 && blend->num_axis != num_axis )
|
|
|
|
goto Fail;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
blend->num_axis = num_axis;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* allocate the blend design pos table if needed */
|
|
|
|
num_designs = blend->num_designs;
|
|
|
|
num_axis = blend->num_axis;
|
|
|
|
if ( num_designs && num_axis && blend->design_pos[0] == 0 )
|
|
|
|
{
|
|
|
|
FT_UInt n;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( blend->design_pos[0], num_designs * num_axis ) )
|
2000-07-09 02:48:37 +02:00
|
|
|
goto Exit;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
for ( n = 1; n < num_designs; n++ )
|
|
|
|
blend->design_pos[n] = blend->design_pos[0] + num_axis * n;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
Exit:
|
|
|
|
return error;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
Fail:
|
2003-10-07 07:49:41 +02:00
|
|
|
error = T1_Err_Invalid_File_Format;
|
2000-07-09 02:48:37 +02:00
|
|
|
goto Exit;
|
2000-07-09 21:15:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
2001-06-28 09:17:51 +02:00
|
|
|
T1_Get_Multi_Master( T1_Face face,
|
|
|
|
FT_Multi_Master* master )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2002-02-28 19:59:37 +01:00
|
|
|
PS_Blend blend = face->blend;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_UInt n;
|
|
|
|
FT_Error error;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
error = T1_Err_Invalid_Argument;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( blend )
|
|
|
|
{
|
|
|
|
master->num_axis = blend->num_axis;
|
|
|
|
master->num_designs = blend->num_designs;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
for ( n = 0; n < blend->num_axis; n++ )
|
|
|
|
{
|
2002-02-28 19:59:37 +01:00
|
|
|
FT_MM_Axis* axis = master->axis + n;
|
|
|
|
PS_DesignMap map = blend->design_map + n;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
axis->name = blend->axis_names[n];
|
|
|
|
axis->minimum = map->design_points[0];
|
|
|
|
axis->maximum = map->design_points[map->num_points - 1];
|
|
|
|
}
|
2003-10-07 07:49:41 +02:00
|
|
|
|
|
|
|
error = T1_Err_Ok;
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2003-10-07 07:49:41 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
return error;
|
2000-07-09 21:15:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
* src/pcf/pcfdrivr.c: Revert change from 2004-04-17.
* src/pcf/pcfutil.c: Use FT_LOCAL_DEF.
* src/pcf/pcfutil.h: Include FT_CONFIG_CONFIG_H.
Use FT_BEGIN_HEADER and FT_END_HEADER.
Use FT_LOCAL.
2004-04-24 George Williams <gww@silcom.com>
Add support for Apple's distortable font technology (in GX fonts).
* devel/ftoption.h, include/freetype/config/ftoption.h
(TT_CONFIG_OPTION_GX_VAR_SUPPORT): New macro.
* include/freetype/ftmm.h (FT_Var_Axis, FT_Var_Named_Style,
FT_MM_Var): New structures.
(FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New function declarations.
* include/freetype/internal/services/svmm.h (FT_Get_MM_Var_Func,
FT_Set_Var_Design_Func): New typedefs.
Update MultiMasters service.
* include/freetype/internal/tttypes.h
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include FT_MULTIPLE_MASTERS_H.
(GX_Blend) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New typedef.
(TT_Face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New members `doblend'
and `blend'.
* include/freetype/tttags.h (TTAG_avar, TTAG_cvar, TTAG_gvar): New
macros.
* include/freetype/internal/fttrace.h: Add `ttgxvar'.
* src/base/ftmm.c (FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New functions.
* src/sfnt/sfobjs.c (sfnt_load_face)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Set FT_FACE_FLAG_MULTIPLE_MASTERS
flag for GX var fonts.
* src/truetype/ttgxvar.c, src/truetype/ttgxvar.h: New files.
* src/truetype/truetype.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.c.
* src/truetype/ttdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H, FT_SERVICE_MULTIPLE_MASTERS_H, and ttgxvar.h.
(tt_service_gx_multi_masters) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]:
New service.
(tt_services) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Updated.
* src/truetype/ttgload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(TT_Process_Simple_Glyph, load_truetype_glyph)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT] :Support GX var fonts.
* src/truetype/ttobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_done_face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_done_blend.
* src/truetype/ttpload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_face_load_cvt) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_face_vary_cvt.
* src/truetype/rules.mk (TT_DRV_SRC): Add ttgxvar.c.
* src/type1/t1driver.c (t1_service_multi_masters): Add T1_Get_MM_Var
and T1_Set_Var_Design.
* src/type1/t1load.c (FT_INT_TO_FIXED, FT_FIXED_TO_INT): New macros.
(T1_Get_MM_Var, T1_Set_Var_Design): New functions.
* src/type1/t1load.h (T1_Get_MM_Var, T1_Set_Var_Design): New
function declarations.
2004-04-25 22:15:11 +02:00
|
|
|
#define FT_INT_TO_FIXED( a ) ( (a) << 16 )
|
|
|
|
#define FT_FIXED_TO_INT( a ) ( FT_RoundFix( a ) >> 16 )
|
|
|
|
|
|
|
|
|
2004-05-20 11:21:19 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* Given a normalized (blend) coordinate, figure out the design */
|
|
|
|
/* coordinate appropriate for that value. */
|
|
|
|
/* */
|
|
|
|
FT_LOCAL_DEF( FT_Fixed )
|
|
|
|
mm_axis_unmap( PS_DesignMap axismap,
|
|
|
|
FT_Fixed ncv )
|
|
|
|
{
|
|
|
|
int j;
|
|
|
|
|
|
|
|
|
|
|
|
if ( ncv <= axismap->blend_points[0] )
|
2008-11-29 18:35:58 +01:00
|
|
|
return FT_INT_TO_FIXED( axismap->design_points[0] );
|
2004-05-20 11:21:19 +02:00
|
|
|
|
|
|
|
for ( j = 1; j < axismap->num_points; ++j )
|
|
|
|
{
|
|
|
|
if ( ncv <= axismap->blend_points[j] )
|
|
|
|
{
|
|
|
|
FT_Fixed t = FT_MulDiv( ncv - axismap->blend_points[j - 1],
|
|
|
|
0x10000L,
|
|
|
|
axismap->blend_points[j] -
|
|
|
|
axismap->blend_points[j - 1] );
|
|
|
|
|
2008-09-15 09:49:40 +02:00
|
|
|
return FT_INT_TO_FIXED( axismap->design_points[j - 1] ) +
|
2004-05-20 11:21:19 +02:00
|
|
|
FT_MulDiv( t,
|
2006-06-26 11:40:00 +02:00
|
|
|
axismap->design_points[j] -
|
2004-05-20 11:21:19 +02:00
|
|
|
axismap->design_points[j - 1],
|
|
|
|
1L );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-11-29 18:35:58 +01:00
|
|
|
return FT_INT_TO_FIXED( axismap->design_points[axismap->num_points - 1] );
|
2004-05-20 11:21:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* Given a vector of weights, one for each design, figure out the */
|
|
|
|
/* normalized axis coordinates which gave rise to those weights. */
|
|
|
|
/* */
|
|
|
|
FT_LOCAL_DEF( void )
|
|
|
|
mm_weights_unmap( FT_Fixed* weights,
|
|
|
|
FT_Fixed* axiscoords,
|
|
|
|
FT_UInt axis_count )
|
|
|
|
{
|
|
|
|
FT_ASSERT( axis_count <= T1_MAX_MM_AXIS );
|
|
|
|
|
|
|
|
if ( axis_count == 1 )
|
|
|
|
axiscoords[0] = weights[1];
|
|
|
|
|
|
|
|
else if ( axis_count == 2 )
|
|
|
|
{
|
|
|
|
axiscoords[0] = weights[3] + weights[1];
|
|
|
|
axiscoords[1] = weights[3] + weights[2];
|
|
|
|
}
|
|
|
|
|
|
|
|
else if ( axis_count == 3 )
|
|
|
|
{
|
|
|
|
axiscoords[0] = weights[7] + weights[5] + weights[3] + weights[1];
|
|
|
|
axiscoords[1] = weights[7] + weights[6] + weights[3] + weights[2];
|
|
|
|
axiscoords[2] = weights[7] + weights[6] + weights[5] + weights[4];
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
axiscoords[0] = weights[15] + weights[13] + weights[11] + weights[9] +
|
|
|
|
weights[7] + weights[5] + weights[3] + weights[1];
|
|
|
|
axiscoords[1] = weights[15] + weights[14] + weights[11] + weights[10] +
|
|
|
|
weights[7] + weights[6] + weights[3] + weights[2];
|
|
|
|
axiscoords[2] = weights[15] + weights[14] + weights[13] + weights[12] +
|
|
|
|
weights[7] + weights[6] + weights[5] + weights[4];
|
|
|
|
axiscoords[3] = weights[15] + weights[14] + weights[13] + weights[12] +
|
|
|
|
weights[11] + weights[10] + weights[9] + weights[8];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
* src/pcf/pcfdrivr.c: Revert change from 2004-04-17.
* src/pcf/pcfutil.c: Use FT_LOCAL_DEF.
* src/pcf/pcfutil.h: Include FT_CONFIG_CONFIG_H.
Use FT_BEGIN_HEADER and FT_END_HEADER.
Use FT_LOCAL.
2004-04-24 George Williams <gww@silcom.com>
Add support for Apple's distortable font technology (in GX fonts).
* devel/ftoption.h, include/freetype/config/ftoption.h
(TT_CONFIG_OPTION_GX_VAR_SUPPORT): New macro.
* include/freetype/ftmm.h (FT_Var_Axis, FT_Var_Named_Style,
FT_MM_Var): New structures.
(FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New function declarations.
* include/freetype/internal/services/svmm.h (FT_Get_MM_Var_Func,
FT_Set_Var_Design_Func): New typedefs.
Update MultiMasters service.
* include/freetype/internal/tttypes.h
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include FT_MULTIPLE_MASTERS_H.
(GX_Blend) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New typedef.
(TT_Face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New members `doblend'
and `blend'.
* include/freetype/tttags.h (TTAG_avar, TTAG_cvar, TTAG_gvar): New
macros.
* include/freetype/internal/fttrace.h: Add `ttgxvar'.
* src/base/ftmm.c (FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New functions.
* src/sfnt/sfobjs.c (sfnt_load_face)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Set FT_FACE_FLAG_MULTIPLE_MASTERS
flag for GX var fonts.
* src/truetype/ttgxvar.c, src/truetype/ttgxvar.h: New files.
* src/truetype/truetype.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.c.
* src/truetype/ttdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H, FT_SERVICE_MULTIPLE_MASTERS_H, and ttgxvar.h.
(tt_service_gx_multi_masters) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]:
New service.
(tt_services) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Updated.
* src/truetype/ttgload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(TT_Process_Simple_Glyph, load_truetype_glyph)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT] :Support GX var fonts.
* src/truetype/ttobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_done_face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_done_blend.
* src/truetype/ttpload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_face_load_cvt) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_face_vary_cvt.
* src/truetype/rules.mk (TT_DRV_SRC): Add ttgxvar.c.
* src/type1/t1driver.c (t1_service_multi_masters): Add T1_Get_MM_Var
and T1_Set_Var_Design.
* src/type1/t1load.c (FT_INT_TO_FIXED, FT_FIXED_TO_INT): New macros.
(T1_Get_MM_Var, T1_Set_Var_Design): New functions.
* src/type1/t1load.h (T1_Get_MM_Var, T1_Set_Var_Design): New
function declarations.
2004-04-25 22:15:11 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* Just a wrapper around T1_Get_Multi_Master to support the different */
|
|
|
|
/* arguments needed by the GX var distortable fonts. */
|
|
|
|
/* */
|
|
|
|
FT_LOCAL_DEF( FT_Error )
|
|
|
|
T1_Get_MM_Var( T1_Face face,
|
|
|
|
FT_MM_Var* *master )
|
|
|
|
{
|
|
|
|
FT_Memory memory = face->root.memory;
|
|
|
|
FT_MM_Var *mmvar;
|
|
|
|
FT_Multi_Master mmaster;
|
|
|
|
FT_Error error;
|
|
|
|
FT_UInt i;
|
2004-05-20 11:21:19 +02:00
|
|
|
FT_Fixed axiscoords[T1_MAX_MM_AXIS];
|
|
|
|
PS_Blend blend = face->blend;
|
* src/pcf/pcfdrivr.c: Revert change from 2004-04-17.
* src/pcf/pcfutil.c: Use FT_LOCAL_DEF.
* src/pcf/pcfutil.h: Include FT_CONFIG_CONFIG_H.
Use FT_BEGIN_HEADER and FT_END_HEADER.
Use FT_LOCAL.
2004-04-24 George Williams <gww@silcom.com>
Add support for Apple's distortable font technology (in GX fonts).
* devel/ftoption.h, include/freetype/config/ftoption.h
(TT_CONFIG_OPTION_GX_VAR_SUPPORT): New macro.
* include/freetype/ftmm.h (FT_Var_Axis, FT_Var_Named_Style,
FT_MM_Var): New structures.
(FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New function declarations.
* include/freetype/internal/services/svmm.h (FT_Get_MM_Var_Func,
FT_Set_Var_Design_Func): New typedefs.
Update MultiMasters service.
* include/freetype/internal/tttypes.h
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include FT_MULTIPLE_MASTERS_H.
(GX_Blend) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New typedef.
(TT_Face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New members `doblend'
and `blend'.
* include/freetype/tttags.h (TTAG_avar, TTAG_cvar, TTAG_gvar): New
macros.
* include/freetype/internal/fttrace.h: Add `ttgxvar'.
* src/base/ftmm.c (FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New functions.
* src/sfnt/sfobjs.c (sfnt_load_face)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Set FT_FACE_FLAG_MULTIPLE_MASTERS
flag for GX var fonts.
* src/truetype/ttgxvar.c, src/truetype/ttgxvar.h: New files.
* src/truetype/truetype.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.c.
* src/truetype/ttdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H, FT_SERVICE_MULTIPLE_MASTERS_H, and ttgxvar.h.
(tt_service_gx_multi_masters) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]:
New service.
(tt_services) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Updated.
* src/truetype/ttgload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(TT_Process_Simple_Glyph, load_truetype_glyph)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT] :Support GX var fonts.
* src/truetype/ttobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_done_face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_done_blend.
* src/truetype/ttpload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_face_load_cvt) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_face_vary_cvt.
* src/truetype/rules.mk (TT_DRV_SRC): Add ttgxvar.c.
* src/type1/t1driver.c (t1_service_multi_masters): Add T1_Get_MM_Var
and T1_Set_Var_Design.
* src/type1/t1load.c (FT_INT_TO_FIXED, FT_FIXED_TO_INT): New macros.
(T1_Get_MM_Var, T1_Set_Var_Design): New functions.
* src/type1/t1load.h (T1_Get_MM_Var, T1_Set_Var_Design): New
function declarations.
2004-04-25 22:15:11 +02:00
|
|
|
|
|
|
|
|
|
|
|
error = T1_Get_Multi_Master( face, &mmaster );
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
if ( FT_ALLOC( mmvar,
|
|
|
|
sizeof ( FT_MM_Var ) +
|
|
|
|
mmaster.num_axis * sizeof ( FT_Var_Axis ) ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
mmvar->num_axis = mmaster.num_axis;
|
|
|
|
mmvar->num_designs = mmaster.num_designs;
|
|
|
|
mmvar->num_namedstyles = (FT_UInt)-1; /* Does not apply */
|
|
|
|
mmvar->axis = (FT_Var_Axis*)&mmvar[1];
|
|
|
|
/* Point to axes after MM_Var struct */
|
|
|
|
mmvar->namedstyle = NULL;
|
|
|
|
|
|
|
|
for ( i = 0 ; i < mmaster.num_axis; ++i )
|
|
|
|
{
|
|
|
|
mmvar->axis[i].name = mmaster.axis[i].name;
|
|
|
|
mmvar->axis[i].minimum = FT_INT_TO_FIXED( mmaster.axis[i].minimum);
|
|
|
|
mmvar->axis[i].maximum = FT_INT_TO_FIXED( mmaster.axis[i].maximum);
|
|
|
|
mmvar->axis[i].def = ( mmvar->axis[i].minimum +
|
|
|
|
mmvar->axis[i].maximum ) / 2;
|
|
|
|
/* Does not apply. But this value is in range */
|
2006-01-13 15:53:28 +01:00
|
|
|
mmvar->axis[i].strid = 0xFFFFFFFFUL; /* Does not apply */
|
|
|
|
mmvar->axis[i].tag = 0xFFFFFFFFUL; /* Does not apply */
|
2004-05-20 11:21:19 +02:00
|
|
|
|
|
|
|
if ( ft_strcmp( mmvar->axis[i].name, "Weight" ) == 0 )
|
|
|
|
mmvar->axis[i].tag = FT_MAKE_TAG( 'w', 'g', 'h', 't' );
|
|
|
|
else if ( ft_strcmp( mmvar->axis[i].name, "Width" ) == 0 )
|
|
|
|
mmvar->axis[i].tag = FT_MAKE_TAG( 'w', 'd', 't', 'h' );
|
|
|
|
else if ( ft_strcmp( mmvar->axis[i].name, "OpticalSize" ) == 0 )
|
|
|
|
mmvar->axis[i].tag = FT_MAKE_TAG( 'o', 'p', 's', 'z' );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( blend->num_designs == 1U << blend->num_axis )
|
|
|
|
{
|
|
|
|
mm_weights_unmap( blend->default_weight_vector,
|
|
|
|
axiscoords,
|
|
|
|
blend->num_axis );
|
|
|
|
|
|
|
|
for ( i = 0; i < mmaster.num_axis; ++i )
|
2008-09-15 09:49:40 +02:00
|
|
|
mmvar->axis[i].def = mm_axis_unmap( &blend->design_map[i],
|
|
|
|
axiscoords[i] );
|
* src/pcf/pcfdrivr.c: Revert change from 2004-04-17.
* src/pcf/pcfutil.c: Use FT_LOCAL_DEF.
* src/pcf/pcfutil.h: Include FT_CONFIG_CONFIG_H.
Use FT_BEGIN_HEADER and FT_END_HEADER.
Use FT_LOCAL.
2004-04-24 George Williams <gww@silcom.com>
Add support for Apple's distortable font technology (in GX fonts).
* devel/ftoption.h, include/freetype/config/ftoption.h
(TT_CONFIG_OPTION_GX_VAR_SUPPORT): New macro.
* include/freetype/ftmm.h (FT_Var_Axis, FT_Var_Named_Style,
FT_MM_Var): New structures.
(FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New function declarations.
* include/freetype/internal/services/svmm.h (FT_Get_MM_Var_Func,
FT_Set_Var_Design_Func): New typedefs.
Update MultiMasters service.
* include/freetype/internal/tttypes.h
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include FT_MULTIPLE_MASTERS_H.
(GX_Blend) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New typedef.
(TT_Face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New members `doblend'
and `blend'.
* include/freetype/tttags.h (TTAG_avar, TTAG_cvar, TTAG_gvar): New
macros.
* include/freetype/internal/fttrace.h: Add `ttgxvar'.
* src/base/ftmm.c (FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New functions.
* src/sfnt/sfobjs.c (sfnt_load_face)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Set FT_FACE_FLAG_MULTIPLE_MASTERS
flag for GX var fonts.
* src/truetype/ttgxvar.c, src/truetype/ttgxvar.h: New files.
* src/truetype/truetype.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.c.
* src/truetype/ttdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H, FT_SERVICE_MULTIPLE_MASTERS_H, and ttgxvar.h.
(tt_service_gx_multi_masters) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]:
New service.
(tt_services) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Updated.
* src/truetype/ttgload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(TT_Process_Simple_Glyph, load_truetype_glyph)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT] :Support GX var fonts.
* src/truetype/ttobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_done_face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_done_blend.
* src/truetype/ttpload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_face_load_cvt) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_face_vary_cvt.
* src/truetype/rules.mk (TT_DRV_SRC): Add ttgxvar.c.
* src/type1/t1driver.c (t1_service_multi_masters): Add T1_Get_MM_Var
and T1_Set_Var_Design.
* src/type1/t1load.c (FT_INT_TO_FIXED, FT_FIXED_TO_INT): New macros.
(T1_Get_MM_Var, T1_Set_Var_Design): New functions.
* src/type1/t1load.h (T1_Get_MM_Var, T1_Set_Var_Design): New
function declarations.
2004-04-25 22:15:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
*master = mmvar;
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
2001-06-28 09:17:51 +02:00
|
|
|
T1_Set_MM_Blend( T1_Face face,
|
|
|
|
FT_UInt num_coords,
|
|
|
|
FT_Fixed* coords )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2002-02-28 19:59:37 +01:00
|
|
|
PS_Blend blend = face->blend;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Error error;
|
|
|
|
FT_UInt n, m;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
error = T1_Err_Invalid_Argument;
|
|
|
|
|
|
|
|
if ( blend && blend->num_axis == num_coords )
|
|
|
|
{
|
|
|
|
/* recompute the weight vector from the blend coordinates */
|
* README: Formatting.
* Jamfile: Fix typo.
* src/cff/cffparse.c: Move error code #defines to...
* include/freetype/internal/cfferrs.h: This file.
* src/cff/cffdrivr.c, src/cff/cffobjs.c, src/cff/cffload.c: Replaced
`FT_Err_*' with `CFF_Err_*'.
* src/cid/cidparse.c: Replaced `FT_Err_*' with `T1_Err_*'.
* src/psaux/psobjs.c, src/psaux/t1decode.c: Ditto.
* src/sfnt/sfobcs.c, src/sfnt/ttload.c: Replaced `FT_Err_*' with
`TT_Err_*'.
* src/truetype/ttgload.c, src/truetype/ttobjs.c: Ditto.
* src/type1/t1gload.c, src/type1/t1load.c, src/type1/t1objs.c,
src/type1/t1parse.c: Replaced `FT_Err_*' with `T1_Err_*'.
* include/freetype/internal/cfferrs.h: Add
`CFF_Err_Unknown_File_Format'.
* include/freetype/internal/t1errors.h: Add
`T1_Err_Unknown_File_Format'.
* include/freetype/internal/tterrors.h: Add
`TT_Err_Unknown_File_Format'.
* src/cff/cffload.h: Add `cff_*_encoding' and `cff_*_charset'
references.
* src/psaux/psobjs.c: Include `FT_INTERNAL_TYPE1_ERRORS_H'.
* src/cff/cffobjs.c (CFF_Init_Face, CFF_Done_Face): Use
FT_LOCAL_DEF.
* src/cid/cidobjs.c (CID_Done_Driver): Ditto.
* src/trutype/ttobjs.c (TT_Init_Face, TT_Done_Face, TT_Init_Size):
Ditto.
* src/type1/t1objs.c (T1_Done_Driver): Ditto.
* src/pcf/pcfdriver.c (PCF_Done_Face): Ditto.
* src/pcf/pcf.h: Use FT_LOCAL for `PCF_Done_Face'.
2001-04-03 01:54:01 +02:00
|
|
|
error = T1_Err_Ok;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
for ( n = 0; n < blend->num_designs; n++ )
|
|
|
|
{
|
|
|
|
FT_Fixed result = 0x10000L; /* 1.0 fixed */
|
|
|
|
|
|
|
|
|
|
|
|
for ( m = 0; m < blend->num_axis; m++ )
|
|
|
|
{
|
|
|
|
FT_Fixed factor;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
/* get current blend axis position */
|
|
|
|
factor = coords[m];
|
|
|
|
if ( factor < 0 ) factor = 0;
|
|
|
|
if ( factor > 0x10000L ) factor = 0x10000L;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( ( n & ( 1 << m ) ) == 0 )
|
|
|
|
factor = 0x10000L - factor;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
result = FT_MulFix( result, factor );
|
|
|
|
}
|
|
|
|
blend->weight_vector[n] = result;
|
|
|
|
}
|
|
|
|
|
* README: Formatting.
* Jamfile: Fix typo.
* src/cff/cffparse.c: Move error code #defines to...
* include/freetype/internal/cfferrs.h: This file.
* src/cff/cffdrivr.c, src/cff/cffobjs.c, src/cff/cffload.c: Replaced
`FT_Err_*' with `CFF_Err_*'.
* src/cid/cidparse.c: Replaced `FT_Err_*' with `T1_Err_*'.
* src/psaux/psobjs.c, src/psaux/t1decode.c: Ditto.
* src/sfnt/sfobcs.c, src/sfnt/ttload.c: Replaced `FT_Err_*' with
`TT_Err_*'.
* src/truetype/ttgload.c, src/truetype/ttobjs.c: Ditto.
* src/type1/t1gload.c, src/type1/t1load.c, src/type1/t1objs.c,
src/type1/t1parse.c: Replaced `FT_Err_*' with `T1_Err_*'.
* include/freetype/internal/cfferrs.h: Add
`CFF_Err_Unknown_File_Format'.
* include/freetype/internal/t1errors.h: Add
`T1_Err_Unknown_File_Format'.
* include/freetype/internal/tterrors.h: Add
`TT_Err_Unknown_File_Format'.
* src/cff/cffload.h: Add `cff_*_encoding' and `cff_*_charset'
references.
* src/psaux/psobjs.c: Include `FT_INTERNAL_TYPE1_ERRORS_H'.
* src/cff/cffobjs.c (CFF_Init_Face, CFF_Done_Face): Use
FT_LOCAL_DEF.
* src/cid/cidobjs.c (CID_Done_Driver): Ditto.
* src/trutype/ttobjs.c (TT_Init_Face, TT_Done_Face, TT_Init_Size):
Ditto.
* src/type1/t1objs.c (T1_Done_Driver): Ditto.
* src/pcf/pcfdriver.c (PCF_Done_Face): Ditto.
* src/pcf/pcf.h: Use FT_LOCAL for `PCF_Done_Face'.
2001-04-03 01:54:01 +02:00
|
|
|
error = T1_Err_Ok;
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2003-10-07 07:49:41 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
return error;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
2001-06-28 09:17:51 +02:00
|
|
|
T1_Set_MM_Design( T1_Face face,
|
|
|
|
FT_UInt num_coords,
|
|
|
|
FT_Long* coords )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2002-02-28 19:59:37 +01:00
|
|
|
PS_Blend blend = face->blend;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Error error;
|
|
|
|
FT_UInt n, p;
|
2000-05-26 19:13:23 +02:00
|
|
|
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
error = T1_Err_Invalid_Argument;
|
|
|
|
if ( blend && blend->num_axis == num_coords )
|
|
|
|
{
|
|
|
|
/* compute the blend coordinates through the blend design map */
|
|
|
|
FT_Fixed final_blends[T1_MAX_MM_DESIGNS];
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-05-26 19:13:23 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
for ( n = 0; n < blend->num_axis; n++ )
|
|
|
|
{
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Long design = coords[n];
|
|
|
|
FT_Fixed the_blend;
|
2002-02-28 19:59:37 +01:00
|
|
|
PS_DesignMap map = blend->design_map + n;
|
2004-05-20 11:21:19 +02:00
|
|
|
FT_Long* designs = map->design_points;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Fixed* blends = map->blend_points;
|
|
|
|
FT_Int before = -1, after = -1;
|
|
|
|
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-12-01 22:43:05 +01:00
|
|
|
for ( p = 0; p < (FT_UInt)map->num_points; p++ )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2004-05-20 11:21:19 +02:00
|
|
|
FT_Long p_design = designs[p];
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* exact match? */
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( design == p_design )
|
|
|
|
{
|
|
|
|
the_blend = blends[p];
|
|
|
|
goto Found;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( design < p_design )
|
|
|
|
{
|
|
|
|
after = p;
|
|
|
|
break;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
before = p;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* now interpolate if necessary */
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( before < 0 )
|
|
|
|
the_blend = blends[0];
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
else if ( after < 0 )
|
|
|
|
the_blend = blends[map->num_points - 1];
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
else
|
|
|
|
the_blend = FT_MulDiv( design - designs[before],
|
|
|
|
blends [after] - blends [before],
|
|
|
|
designs[after] - designs[before] );
|
|
|
|
|
|
|
|
Found:
|
|
|
|
final_blends[n] = the_blend;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
error = T1_Set_MM_Blend( face, num_coords, final_blends );
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
|
* src/pcf/pcfdrivr.c: Revert change from 2004-04-17.
* src/pcf/pcfutil.c: Use FT_LOCAL_DEF.
* src/pcf/pcfutil.h: Include FT_CONFIG_CONFIG_H.
Use FT_BEGIN_HEADER and FT_END_HEADER.
Use FT_LOCAL.
2004-04-24 George Williams <gww@silcom.com>
Add support for Apple's distortable font technology (in GX fonts).
* devel/ftoption.h, include/freetype/config/ftoption.h
(TT_CONFIG_OPTION_GX_VAR_SUPPORT): New macro.
* include/freetype/ftmm.h (FT_Var_Axis, FT_Var_Named_Style,
FT_MM_Var): New structures.
(FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New function declarations.
* include/freetype/internal/services/svmm.h (FT_Get_MM_Var_Func,
FT_Set_Var_Design_Func): New typedefs.
Update MultiMasters service.
* include/freetype/internal/tttypes.h
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include FT_MULTIPLE_MASTERS_H.
(GX_Blend) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New typedef.
(TT_Face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: New members `doblend'
and `blend'.
* include/freetype/tttags.h (TTAG_avar, TTAG_cvar, TTAG_gvar): New
macros.
* include/freetype/internal/fttrace.h: Add `ttgxvar'.
* src/base/ftmm.c (FT_Get_MM_Var, FT_Set_Var_Design_Coordinates,
FT_Set_Var_Blend_Coordinates): New functions.
* src/sfnt/sfobjs.c (sfnt_load_face)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Set FT_FACE_FLAG_MULTIPLE_MASTERS
flag for GX var fonts.
* src/truetype/ttgxvar.c, src/truetype/ttgxvar.h: New files.
* src/truetype/truetype.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.c.
* src/truetype/ttdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H, FT_SERVICE_MULTIPLE_MASTERS_H, and ttgxvar.h.
(tt_service_gx_multi_masters) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]:
New service.
(tt_services) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Updated.
* src/truetype/ttgload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(TT_Process_Simple_Glyph, load_truetype_glyph)
[TT_CONFIG_OPTION_GX_VAR_SUPPORT] :Support GX var fonts.
* src/truetype/ttobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_done_face) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_done_blend.
* src/truetype/ttpload.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
ttgxvar.h.
(tt_face_load_cvt) [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Call
tt_face_vary_cvt.
* src/truetype/rules.mk (TT_DRV_SRC): Add ttgxvar.c.
* src/type1/t1driver.c (t1_service_multi_masters): Add T1_Get_MM_Var
and T1_Set_Var_Design.
* src/type1/t1load.c (FT_INT_TO_FIXED, FT_FIXED_TO_INT): New macros.
(T1_Get_MM_Var, T1_Set_Var_Design): New functions.
* src/type1/t1load.h (T1_Get_MM_Var, T1_Set_Var_Design): New
function declarations.
2004-04-25 22:15:11 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* Just a wrapper around T1_Set_MM_Design to support the different */
|
|
|
|
/* arguments needed by the GX var distortable fonts. */
|
|
|
|
/* */
|
|
|
|
FT_LOCAL_DEF( FT_Error )
|
|
|
|
T1_Set_Var_Design( T1_Face face,
|
|
|
|
FT_UInt num_coords,
|
|
|
|
FT_Fixed* coords )
|
|
|
|
{
|
|
|
|
FT_Long lcoords[4]; /* maximum axis count is 4 */
|
|
|
|
FT_UInt i;
|
|
|
|
FT_Error error;
|
|
|
|
|
|
|
|
|
|
|
|
error = T1_Err_Invalid_Argument;
|
|
|
|
if ( num_coords <= 4 && num_coords > 0 )
|
|
|
|
{
|
|
|
|
for ( i = 0; i < num_coords; ++i )
|
|
|
|
lcoords[i] = FT_FIXED_TO_INT( coords[i] );
|
|
|
|
error = T1_Set_MM_Design( face, num_coords, lcoords );
|
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( void )
|
2001-06-28 09:17:51 +02:00
|
|
|
T1_Done_Blend( T1_Face face )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
|
|
|
FT_Memory memory = face->root.memory;
|
2002-04-02 00:01:46 +02:00
|
|
|
PS_Blend blend = face->blend;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
if ( blend )
|
|
|
|
{
|
|
|
|
FT_UInt num_designs = blend->num_designs;
|
|
|
|
FT_UInt num_axis = blend->num_axis;
|
|
|
|
FT_UInt n;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
/* release design pos table */
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( blend->design_pos[0] );
|
2000-07-09 02:48:37 +02:00
|
|
|
for ( n = 1; n < num_designs; n++ )
|
|
|
|
blend->design_pos[n] = 0;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* release blend `private' and `font info' dictionaries */
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( blend->privates[1] );
|
|
|
|
FT_FREE( blend->font_infos[1] );
|
2002-07-11 13:26:21 +02:00
|
|
|
FT_FREE( blend->bboxes[1] );
|
2000-05-26 19:13:23 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
for ( n = 0; n < num_designs; n++ )
|
|
|
|
{
|
|
|
|
blend->privates [n] = 0;
|
|
|
|
blend->font_infos[n] = 0;
|
2002-07-11 13:26:21 +02:00
|
|
|
blend->bboxes [n] = 0;
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* release weight vectors */
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( blend->weight_vector );
|
2000-07-09 02:48:37 +02:00
|
|
|
blend->default_weight_vector = 0;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* release axis names */
|
|
|
|
for ( n = 0; n < num_axis; n++ )
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( blend->axis_names[n] );
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* release design map */
|
|
|
|
for ( n = 0; n < num_axis; n++ )
|
|
|
|
{
|
2002-02-28 19:59:37 +01:00
|
|
|
PS_DesignMap dmap = blend->design_map + n;
|
2000-05-24 23:12:02 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( dmap->design_points );
|
2000-07-09 02:48:37 +02:00
|
|
|
dmap->num_points = 0;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( face->blend );
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_blend_axis_types( T1_Face face,
|
|
|
|
T1_Loader loader )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_TokenRec axis_tokens[T1_MAX_MM_AXIS];
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Int n, num_axis;
|
2003-10-07 07:49:41 +02:00
|
|
|
FT_Error error = T1_Err_Ok;
|
2002-02-28 19:59:37 +01:00
|
|
|
PS_Blend blend;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Memory memory;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-05-26 04:07:40 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* take an array of objects */
|
2000-10-28 19:10:06 +02:00
|
|
|
T1_ToTokenArray( &loader->parser, axis_tokens,
|
2000-07-09 02:48:37 +02:00
|
|
|
T1_MAX_MM_AXIS, &num_axis );
|
2004-02-12 09:33:20 +01:00
|
|
|
if ( num_axis < 0 )
|
|
|
|
{
|
|
|
|
error = T1_Err_Ignore;
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
if ( num_axis == 0 || num_axis > T1_MAX_MM_AXIS )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_blend_axis_types: incorrect number of axes: %d\n",
|
|
|
|
num_axis ));
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* allocate blend if necessary */
|
|
|
|
error = t1_allocate_blend( face, 0, (FT_UInt)num_axis );
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
blend = face->blend;
|
|
|
|
memory = face->root.memory;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* each token is an immediate containing the name of the axis */
|
|
|
|
for ( n = 0; n < num_axis; n++ )
|
|
|
|
{
|
2002-09-17 14:39:19 +02:00
|
|
|
T1_Token token = axis_tokens + n;
|
|
|
|
FT_Byte* name;
|
|
|
|
FT_PtrDist len;
|
2002-04-02 00:01:46 +02:00
|
|
|
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* skip first slash, if any */
|
2002-04-02 00:01:46 +02:00
|
|
|
if ( token->start[0] == '/' )
|
2000-07-09 02:48:37 +02:00
|
|
|
token->start++;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2002-09-17 14:39:19 +02:00
|
|
|
len = token->limit - token->start;
|
2003-05-21 00:06:38 +02:00
|
|
|
if ( len == 0 )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_ALLOC( blend->axis_names[n], len + 1 ) )
|
2000-07-09 02:48:37 +02:00
|
|
|
goto Exit;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
name = (FT_Byte*)blend->axis_names[n];
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_MEM_COPY( name, token->start, len );
|
2000-07-09 02:48:37 +02:00
|
|
|
name[len] = 0;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
Exit:
|
2000-08-23 04:47:57 +02:00
|
|
|
loader->parser.root.error = error;
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_blend_design_positions( T1_Face face,
|
|
|
|
T1_Loader loader )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_TokenRec design_tokens[T1_MAX_MM_DESIGNS];
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Int num_designs;
|
|
|
|
FT_Int num_axis;
|
|
|
|
T1_Parser parser = &loader->parser;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
FT_Error error = T1_Err_Ok;
|
2002-04-02 00:01:46 +02:00
|
|
|
PS_Blend blend;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* get the array of design tokens -- compute number of designs */
|
2004-02-12 09:33:20 +01:00
|
|
|
T1_ToTokenArray( parser, design_tokens,
|
|
|
|
T1_MAX_MM_DESIGNS, &num_designs );
|
|
|
|
if ( num_designs < 0 )
|
|
|
|
{
|
|
|
|
error = T1_Err_Ignore;
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
if ( num_designs == 0 || num_designs > T1_MAX_MM_DESIGNS )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_blend_design_positions:" ));
|
|
|
|
FT_ERROR(( " incorrect number of designs: %d\n",
|
|
|
|
num_designs ));
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2000-08-23 04:47:57 +02:00
|
|
|
FT_Byte* old_cursor = parser->root.cursor;
|
|
|
|
FT_Byte* old_limit = parser->root.limit;
|
2004-02-12 09:33:20 +01:00
|
|
|
FT_Int n;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
blend = face->blend;
|
|
|
|
num_axis = 0; /* make compiler happy */
|
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
for ( n = 0; n < num_designs; n++ )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2008-06-09 22:49:29 +02:00
|
|
|
T1_TokenRec axis_tokens[T1_MAX_MM_AXIS];
|
2002-04-02 00:01:46 +02:00
|
|
|
T1_Token token;
|
|
|
|
FT_Int axis, n_axis;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
/* read axis/coordinates tokens */
|
|
|
|
token = design_tokens + n;
|
2003-10-07 07:49:41 +02:00
|
|
|
parser->root.cursor = token->start;
|
|
|
|
parser->root.limit = token->limit;
|
2000-10-28 19:10:06 +02:00
|
|
|
T1_ToTokenArray( parser, axis_tokens, T1_MAX_MM_AXIS, &n_axis );
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( n == 0 )
|
|
|
|
{
|
2008-06-09 22:49:29 +02:00
|
|
|
if ( n_axis <= 0 || n_axis > T1_MAX_MM_AXIS )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_blend_design_positions:" ));
|
|
|
|
FT_ERROR(( " invalid number of axes: %d\n",
|
|
|
|
n_axis ));
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
num_axis = n_axis;
|
|
|
|
error = t1_allocate_blend( face, num_designs, num_axis );
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
blend = face->blend;
|
|
|
|
}
|
|
|
|
else if ( n_axis != num_axis )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_blend_design_positions: incorrect table\n" ));
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* now read each axis token into the design position */
|
2000-07-09 02:48:37 +02:00
|
|
|
for ( axis = 0; axis < n_axis; axis++ )
|
|
|
|
{
|
2002-02-28 17:10:29 +01:00
|
|
|
T1_Token token2 = axis_tokens + axis;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.cursor = token2->start;
|
|
|
|
parser->root.limit = token2->limit;
|
2000-10-28 19:10:06 +02:00
|
|
|
blend->design_pos[n][axis] = T1_ToFixed( parser, 0 );
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
loader->parser.root.cursor = old_cursor;
|
|
|
|
loader->parser.root.limit = old_limit;
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
Exit:
|
2000-08-23 04:47:57 +02:00
|
|
|
loader->parser.root.error = error;
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_blend_design_map( T1_Face face,
|
|
|
|
T1_Loader loader )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
FT_Error error = T1_Err_Ok;
|
2002-04-02 00:01:46 +02:00
|
|
|
T1_Parser parser = &loader->parser;
|
|
|
|
PS_Blend blend;
|
|
|
|
T1_TokenRec axis_tokens[T1_MAX_MM_AXIS];
|
|
|
|
FT_Int n, num_axis;
|
|
|
|
FT_Byte* old_cursor;
|
|
|
|
FT_Byte* old_limit;
|
|
|
|
FT_Memory memory = face->root.memory;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2006-06-26 11:40:00 +02:00
|
|
|
T1_ToTokenArray( parser, axis_tokens,
|
2004-02-12 09:33:20 +01:00
|
|
|
T1_MAX_MM_AXIS, &num_axis );
|
|
|
|
if ( num_axis < 0 )
|
|
|
|
{
|
|
|
|
error = T1_Err_Ignore;
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
if ( num_axis == 0 || num_axis > T1_MAX_MM_AXIS )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_blend_design_map: incorrect number of axes: %d\n",
|
|
|
|
num_axis ));
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
2003-10-07 07:49:41 +02:00
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
old_cursor = parser->root.cursor;
|
|
|
|
old_limit = parser->root.limit;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
error = t1_allocate_blend( face, 0, num_axis );
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
blend = face->blend;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* now read each axis design map */
|
2000-07-09 02:48:37 +02:00
|
|
|
for ( n = 0; n < num_axis; n++ )
|
|
|
|
{
|
2002-04-02 00:01:46 +02:00
|
|
|
PS_DesignMap map = blend->design_map + n;
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Token axis_token;
|
|
|
|
T1_TokenRec point_tokens[T1_MAX_MM_MAP_POINTS];
|
2000-08-23 19:32:42 +02:00
|
|
|
FT_Int p, num_points;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
axis_token = axis_tokens + n;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
parser->root.cursor = axis_token->start;
|
|
|
|
parser->root.limit = axis_token->limit;
|
|
|
|
T1_ToTokenArray( parser, point_tokens,
|
|
|
|
T1_MAX_MM_MAP_POINTS, &num_points );
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
if ( num_points <= 0 || num_points > T1_MAX_MM_MAP_POINTS )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_blend_design_map: incorrect table\n" ));
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* allocate design map data */
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_NEW_ARRAY( map->design_points, num_points * 2 ) )
|
2000-07-09 02:48:37 +02:00
|
|
|
goto Exit;
|
|
|
|
map->blend_points = map->design_points + num_points;
|
|
|
|
map->num_points = (FT_Byte)num_points;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
for ( p = 0; p < num_points; p++ )
|
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Token point_token;
|
|
|
|
|
|
|
|
|
|
|
|
point_token = point_tokens + p;
|
|
|
|
|
|
|
|
/* don't include delimiting brackets */
|
|
|
|
parser->root.cursor = point_token->start + 1;
|
|
|
|
parser->root.limit = point_token->limit - 1;
|
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
map->design_points[p] = T1_ToInt( parser );
|
|
|
|
map->blend_points [p] = T1_ToFixed( parser, 0 );
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
}
|
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.cursor = old_cursor;
|
|
|
|
parser->root.limit = old_limit;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
Exit:
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.error = error;
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_weight_vector( T1_Face face,
|
|
|
|
T1_Loader loader )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2004-02-12 09:33:20 +01:00
|
|
|
T1_TokenRec design_tokens[T1_MAX_MM_DESIGNS];
|
|
|
|
FT_Int num_designs;
|
2003-10-07 07:49:41 +02:00
|
|
|
FT_Error error = T1_Err_Ok;
|
2002-04-02 00:01:46 +02:00
|
|
|
T1_Parser parser = &loader->parser;
|
|
|
|
PS_Blend blend = face->blend;
|
2004-02-12 09:33:20 +01:00
|
|
|
T1_Token token;
|
|
|
|
FT_Int n;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Byte* old_cursor;
|
|
|
|
FT_Byte* old_limit;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
T1_ToTokenArray( parser, design_tokens,
|
|
|
|
T1_MAX_MM_DESIGNS, &num_designs );
|
|
|
|
if ( num_designs < 0 )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2004-02-12 09:33:20 +01:00
|
|
|
error = T1_Err_Ignore;
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
if ( num_designs == 0 || num_designs > T1_MAX_MM_DESIGNS )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_weight_vector:" ));
|
|
|
|
FT_ERROR(( " incorrect number of designs: %d\n",
|
|
|
|
num_designs ));
|
2000-07-09 02:48:37 +02:00
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
if ( !blend || !blend->num_designs )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2004-02-12 09:33:20 +01:00
|
|
|
error = t1_allocate_blend( face, num_designs, 0 );
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
blend = face->blend;
|
|
|
|
}
|
|
|
|
else if ( blend->num_designs != (FT_UInt)num_designs )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_weight_vector:"
|
|
|
|
" /BlendDesignPosition and /WeightVector have\n" ));
|
|
|
|
FT_ERROR(( " "
|
|
|
|
" different number of elements!\n" ));
|
2000-07-09 02:48:37 +02:00
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Exit;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
old_cursor = parser->root.cursor;
|
|
|
|
old_limit = parser->root.limit;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
for ( n = 0; n < num_designs; n++ )
|
2000-07-09 02:48:37 +02:00
|
|
|
{
|
2004-02-12 09:33:20 +01:00
|
|
|
token = design_tokens + n;
|
|
|
|
parser->root.cursor = token->start;
|
|
|
|
parser->root.limit = token->limit;
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
blend->default_weight_vector[n] =
|
2000-10-28 19:10:06 +02:00
|
|
|
blend->weight_vector[n] = T1_ToFixed( parser, 0 );
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.cursor = old_cursor;
|
|
|
|
parser->root.limit = old_limit;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
Exit:
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.error = error;
|
2000-07-09 02:48:37 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
/* e.g., /BuildCharArray [0 0 0 0 0 0 0 0] def */
|
|
|
|
/* we're only interested in the number of array elements */
|
|
|
|
static void
|
|
|
|
parse_buildchar( T1_Face face,
|
|
|
|
T1_Loader loader )
|
|
|
|
{
|
|
|
|
face->len_buildchar = T1_ToFixedArray( &loader->parser, 0, NULL, 0 );
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
#endif /* T1_CONFIG_OPTION_NO_MM_SUPPORT */
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** TYPE 1 SYMBOL PARSING *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static FT_Error
|
2003-06-12 06:59:07 +02:00
|
|
|
t1_load_keyword( T1_Face face,
|
|
|
|
T1_Loader loader,
|
|
|
|
const T1_Field field )
|
2000-05-24 23:12:02 +02:00
|
|
|
{
|
2002-05-12 21:59:17 +02:00
|
|
|
FT_Error error;
|
|
|
|
void* dummy_object;
|
|
|
|
void** objects;
|
|
|
|
FT_UInt max_objects;
|
|
|
|
PS_Blend blend = face->blend;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-05-24 23:12:02 +02:00
|
|
|
/* if the keyword has a dedicated callback, call it */
|
2002-02-28 17:10:29 +01:00
|
|
|
if ( field->type == T1_FIELD_TYPE_CALLBACK )
|
2000-05-24 23:12:02 +02:00
|
|
|
{
|
2000-08-24 00:47:44 +02:00
|
|
|
field->reader( (FT_Face)face, loader );
|
2000-08-23 04:47:57 +02:00
|
|
|
error = loader->parser.root.error;
|
2000-05-24 23:12:02 +02:00
|
|
|
goto Exit;
|
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* now, the keyword is either a simple field, or a table of fields; */
|
|
|
|
/* we are now going to take care of it */
|
2000-08-24 00:47:44 +02:00
|
|
|
switch ( field->location )
|
2000-05-24 23:12:02 +02:00
|
|
|
{
|
2002-03-14 11:09:35 +01:00
|
|
|
case T1_FIELD_LOCATION_FONT_INFO:
|
2000-07-09 02:48:37 +02:00
|
|
|
dummy_object = &face->type1.font_info;
|
|
|
|
objects = &dummy_object;
|
|
|
|
max_objects = 0;
|
|
|
|
|
|
|
|
if ( blend )
|
|
|
|
{
|
|
|
|
objects = (void**)blend->font_infos;
|
|
|
|
max_objects = blend->num_designs;
|
|
|
|
}
|
|
|
|
break;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2002-03-14 11:09:35 +01:00
|
|
|
case T1_FIELD_LOCATION_PRIVATE:
|
2000-07-09 02:48:37 +02:00
|
|
|
dummy_object = &face->type1.private_dict;
|
|
|
|
objects = &dummy_object;
|
|
|
|
max_objects = 0;
|
|
|
|
|
|
|
|
if ( blend )
|
|
|
|
{
|
|
|
|
objects = (void**)blend->privates;
|
|
|
|
max_objects = blend->num_designs;
|
|
|
|
}
|
|
|
|
break;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2002-07-11 13:26:21 +02:00
|
|
|
case T1_FIELD_LOCATION_BBOX:
|
|
|
|
dummy_object = &face->type1.font_bbox;
|
|
|
|
objects = &dummy_object;
|
|
|
|
max_objects = 0;
|
|
|
|
|
|
|
|
if ( blend )
|
|
|
|
{
|
|
|
|
objects = (void**)blend->bboxes;
|
|
|
|
max_objects = blend->num_designs;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
case T1_FIELD_LOCATION_LOADER:
|
|
|
|
dummy_object = loader;
|
|
|
|
objects = &dummy_object;
|
|
|
|
max_objects = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T1_FIELD_LOCATION_FACE:
|
|
|
|
dummy_object = face;
|
|
|
|
objects = &dummy_object;
|
|
|
|
max_objects = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
|
|
|
|
case T1_FIELD_LOCATION_BLEND:
|
|
|
|
dummy_object = face->blend;
|
|
|
|
objects = &dummy_object;
|
|
|
|
max_objects = 0;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
default:
|
|
|
|
dummy_object = &face->type1;
|
|
|
|
objects = &dummy_object;
|
|
|
|
max_objects = 0;
|
2000-05-24 23:12:02 +02:00
|
|
|
}
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2002-02-28 17:10:29 +01:00
|
|
|
if ( field->type == T1_FIELD_TYPE_INTEGER_ARRAY ||
|
|
|
|
field->type == T1_FIELD_TYPE_FIXED_ARRAY )
|
2000-10-28 19:10:06 +02:00
|
|
|
error = T1_Load_Field_Table( &loader->parser, field,
|
2000-07-09 02:48:37 +02:00
|
|
|
objects, max_objects, 0 );
|
2000-05-24 23:12:02 +02:00
|
|
|
else
|
2000-10-28 19:10:06 +02:00
|
|
|
error = T1_Load_Field( &loader->parser, field,
|
2000-07-09 02:48:37 +02:00
|
|
|
objects, max_objects, 0 );
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-05-24 23:12:02 +02:00
|
|
|
Exit:
|
|
|
|
return error;
|
2000-07-09 21:15:30 +02:00
|
|
|
}
|
2000-01-27 15:02:04 +01:00
|
|
|
|
|
|
|
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
static void
|
|
|
|
parse_private( T1_Face face,
|
|
|
|
T1_Loader loader )
|
|
|
|
{
|
|
|
|
FT_UNUSED( face );
|
|
|
|
|
|
|
|
loader->keywords_encountered |= T1_PRIVATE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static int
|
2002-02-28 17:10:29 +01:00
|
|
|
read_binary_data( T1_Parser parser,
|
2002-09-17 14:39:19 +02:00
|
|
|
FT_Long* size,
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Byte** base )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2000-06-16 21:34:52 +02:00
|
|
|
FT_Byte* cur;
|
2000-08-23 04:47:57 +02:00
|
|
|
FT_Byte* limit = parser->root.limit;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2004-02-03 22:34:29 +01:00
|
|
|
/* the binary data has one of the following formats */
|
|
|
|
/* */
|
|
|
|
/* `size' [white*] RD white ....... ND */
|
|
|
|
/* `size' [white*] -| white ....... |- */
|
|
|
|
/* */
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
T1_Skip_Spaces( parser );
|
2003-10-07 07:49:41 +02:00
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
cur = parser->root.cursor;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
if ( cur < limit && ft_isdigit( *cur ) )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2000-10-28 19:10:06 +02:00
|
|
|
*size = T1_ToInt( parser );
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_PS_Token( parser ); /* `RD' or `-|' or something else */
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
/* there is only one whitespace char after the */
|
2000-07-09 02:48:37 +02:00
|
|
|
/* `RD' or `-|' token */
|
2000-08-23 04:47:57 +02:00
|
|
|
*base = parser->root.cursor + 1;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-08-23 19:32:42 +02:00
|
|
|
parser->root.cursor += *size + 1;
|
2005-02-13 22:42:42 +01:00
|
|
|
return !parser->root.error;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
FT_ERROR(( "read_binary_data: invalid size field\n" ));
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.error = T1_Err_Invalid_File_Format;
|
2000-01-27 15:02:04 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* We now define the routines to handle the `/Encoding', `/Subrs', */
|
|
|
|
/* and `/CharStrings' dictionaries. */
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_font_matrix( T1_Face face,
|
|
|
|
T1_Loader loader )
|
2000-05-24 23:12:02 +02:00
|
|
|
{
|
2002-04-02 00:01:46 +02:00
|
|
|
T1_Parser parser = &loader->parser;
|
|
|
|
FT_Matrix* matrix = &face->type1.font_matrix;
|
|
|
|
FT_Vector* offset = &face->type1.font_offset;
|
|
|
|
FT_Face root = (FT_Face)&face->root;
|
|
|
|
FT_Fixed temp[6];
|
|
|
|
FT_Fixed temp_scale;
|
2007-06-05 22:50:37 +02:00
|
|
|
FT_Int result;
|
2000-05-24 23:12:02 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2007-06-05 22:50:37 +02:00
|
|
|
result = T1_ToFixedArray( parser, 6, temp, 3 );
|
|
|
|
|
|
|
|
if ( result < 0 )
|
|
|
|
{
|
|
|
|
parser->root.error = T1_Err_Invalid_File_Format;
|
|
|
|
return;
|
|
|
|
}
|
2000-08-17 03:09:06 +02:00
|
|
|
|
2004-03-05 10:26:24 +01:00
|
|
|
temp_scale = FT_ABS( temp[3] );
|
2001-01-24 23:41:20 +01:00
|
|
|
|
2007-06-06 12:05:49 +02:00
|
|
|
if ( temp_scale == 0 )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "parse_font_matrix: invalid font matrix\n" ));
|
|
|
|
parser->root.error = T1_Err_Invalid_File_Format;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-09-10 08:55:43 +02:00
|
|
|
/* Set Units per EM based on FontMatrix values. We set the value to */
|
|
|
|
/* 1000 / temp_scale, because temp_scale was already multiplied by */
|
|
|
|
/* 1000 (in t1_tofixed, from psobjs.c). */
|
2001-08-30 09:59:28 +02:00
|
|
|
|
2001-09-10 08:55:43 +02:00
|
|
|
root->units_per_EM = (FT_UShort)( FT_DivFix( 1000 * 0x10000L,
|
|
|
|
temp_scale ) >> 16 );
|
2001-01-24 23:41:20 +01:00
|
|
|
|
|
|
|
/* we need to scale the values by 1.0/temp_scale */
|
|
|
|
if ( temp_scale != 0x10000L )
|
2000-08-17 03:09:06 +02:00
|
|
|
{
|
2001-01-24 23:41:20 +01:00
|
|
|
temp[0] = FT_DivFix( temp[0], temp_scale );
|
|
|
|
temp[1] = FT_DivFix( temp[1], temp_scale );
|
|
|
|
temp[2] = FT_DivFix( temp[2], temp_scale );
|
|
|
|
temp[4] = FT_DivFix( temp[4], temp_scale );
|
|
|
|
temp[5] = FT_DivFix( temp[5], temp_scale );
|
2000-08-17 09:18:04 +02:00
|
|
|
temp[3] = 0x10000L;
|
2000-08-17 03:09:06 +02:00
|
|
|
}
|
|
|
|
|
2000-05-24 23:12:02 +02:00
|
|
|
matrix->xx = temp[0];
|
|
|
|
matrix->yx = temp[1];
|
|
|
|
matrix->xy = temp[2];
|
|
|
|
matrix->yy = temp[3];
|
2000-10-31 21:42:18 +01:00
|
|
|
|
2000-10-05 06:53:31 +02:00
|
|
|
/* note that the offsets must be expressed in integer font units */
|
2003-10-13 07:58:54 +02:00
|
|
|
offset->x = temp[4] >> 16;
|
|
|
|
offset->y = temp[5] >> 16;
|
2000-05-24 23:12:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_encoding( T1_Face face,
|
|
|
|
T1_Loader loader )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Parser parser = &loader->parser;
|
|
|
|
FT_Byte* cur;
|
|
|
|
FT_Byte* limit = parser->root.limit;
|
2000-10-31 21:42:18 +01:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
PSAux_Service psaux = (PSAux_Service)face->psaux;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_Spaces( parser );
|
|
|
|
cur = parser->root.cursor;
|
|
|
|
if ( cur >= limit )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
FT_ERROR(( "parse_encoding: out of bounds!\n" ));
|
|
|
|
parser->root.error = T1_Err_Invalid_File_Format;
|
|
|
|
return;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-23 18:24:10 +02:00
|
|
|
/* if we have a number or `[', the encoding is an array, */
|
|
|
|
/* and we must load it now */
|
|
|
|
if ( ft_isdigit( *cur ) || *cur == '[' )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2003-10-23 18:24:10 +02:00
|
|
|
T1_Encoding encode = &face->type1.encoding;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Int count, n;
|
2003-10-23 18:24:10 +02:00
|
|
|
PS_Table char_table = &loader->encoding_table;
|
|
|
|
FT_Memory memory = parser->root.memory;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Error error;
|
2003-10-23 18:24:10 +02:00
|
|
|
FT_Bool only_immediates = 0;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* read the number of entries in the encoding; should be 256 */
|
2003-10-23 18:24:10 +02:00
|
|
|
if ( *cur == '[' )
|
|
|
|
{
|
|
|
|
count = 256;
|
|
|
|
only_immediates = 1;
|
|
|
|
parser->root.cursor++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
count = (FT_Int)T1_ToInt( parser );
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_Spaces( parser );
|
|
|
|
if ( parser->root.cursor >= limit )
|
2000-07-09 02:48:37 +02:00
|
|
|
return;
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
/* we use a T1_Table to store our charnames */
|
2002-01-28 14:34:52 +01:00
|
|
|
loader->num_chars = encode->num_chars = count;
|
2003-10-07 07:49:41 +02:00
|
|
|
if ( FT_NEW_ARRAY( encode->char_index, count ) ||
|
|
|
|
FT_NEW_ARRAY( encode->char_name, count ) ||
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_SET_ERROR( psaux->ps_table_funcs->init(
|
2002-05-12 21:59:17 +02:00
|
|
|
char_table, count, memory ) ) )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.error = error;
|
2000-01-27 15:02:04 +01:00
|
|
|
return;
|
|
|
|
}
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2002-05-12 21:59:17 +02:00
|
|
|
/* We need to `zero' out encoding_table.elements */
|
2000-10-19 07:12:00 +02:00
|
|
|
for ( n = 0; n < count; n++ )
|
2000-10-17 22:25:30 +02:00
|
|
|
{
|
2000-11-02 16:14:38 +01:00
|
|
|
char* notdef = (char *)".notdef";
|
2000-10-19 07:12:00 +02:00
|
|
|
|
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
T1_Add_Table( char_table, n, notdef, 8 );
|
2000-10-17 22:25:30 +02:00
|
|
|
}
|
|
|
|
|
2003-10-23 18:24:10 +02:00
|
|
|
/* Now we need to read records of the form */
|
|
|
|
/* */
|
|
|
|
/* ... charcode /charname ... */
|
|
|
|
/* */
|
|
|
|
/* for each entry in our table. */
|
2000-01-27 15:02:04 +01:00
|
|
|
/* */
|
2000-07-09 02:48:37 +02:00
|
|
|
/* We simply look for a number followed by an immediate */
|
|
|
|
/* name. Note that this ignores correctly the sequence */
|
2003-10-23 18:24:10 +02:00
|
|
|
/* that is often seen in type1 fonts: */
|
2000-01-27 15:02:04 +01:00
|
|
|
/* */
|
|
|
|
/* 0 1 255 { 1 index exch /.notdef put } for dup */
|
|
|
|
/* */
|
2000-07-09 02:48:37 +02:00
|
|
|
/* used to clean the encoding array before anything else. */
|
2003-10-23 18:24:10 +02:00
|
|
|
/* */
|
|
|
|
/* Alternatively, if the array is directly given as */
|
|
|
|
/* */
|
|
|
|
/* /Encoding [ ... ] */
|
|
|
|
/* */
|
|
|
|
/* we only read immediates. */
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
n = 0;
|
2003-10-13 07:58:54 +02:00
|
|
|
T1_Skip_Spaces( parser );
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
while ( parser->root.cursor < limit )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
cur = parser->root.cursor;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-23 18:24:10 +02:00
|
|
|
/* we stop when we encounter a `def' or `]' */
|
2003-10-07 07:49:41 +02:00
|
|
|
if ( *cur == 'd' && cur + 3 < limit )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2007-01-12 10:28:44 +01:00
|
|
|
if ( cur[1] == 'e' &&
|
|
|
|
cur[2] == 'f' &&
|
|
|
|
IS_PS_DELIM( cur[3] ) )
|
2000-02-15 13:55:57 +01:00
|
|
|
{
|
2000-07-09 02:48:37 +02:00
|
|
|
FT_TRACE6(( "encoding end\n" ));
|
2003-10-07 07:49:41 +02:00
|
|
|
cur += 3;
|
2000-07-09 02:48:37 +02:00
|
|
|
break;
|
2000-02-15 13:55:57 +01:00
|
|
|
}
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2003-10-23 18:24:10 +02:00
|
|
|
if ( *cur == ']' )
|
|
|
|
{
|
|
|
|
FT_TRACE6(( "encoding end\n" ));
|
|
|
|
cur++;
|
|
|
|
break;
|
|
|
|
}
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-23 18:24:10 +02:00
|
|
|
/* check whether we've found an entry */
|
|
|
|
if ( ft_isdigit( *cur ) || only_immediates )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2000-06-16 21:34:52 +02:00
|
|
|
FT_Int charcode;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2003-10-23 18:24:10 +02:00
|
|
|
if ( only_immediates )
|
|
|
|
charcode = n;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
charcode = (FT_Int)T1_ToInt( parser );
|
|
|
|
T1_Skip_Spaces( parser );
|
|
|
|
}
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
cur = parser->root.cursor;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-23 18:24:10 +02:00
|
|
|
if ( *cur == '/' && cur + 2 < limit && n < count )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2002-09-17 14:39:19 +02:00
|
|
|
FT_PtrDist len;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
cur++;
|
|
|
|
|
|
|
|
parser->root.cursor = cur;
|
|
|
|
T1_Skip_PS_Token( parser );
|
2005-02-13 22:42:42 +01:00
|
|
|
if ( parser->root.error )
|
|
|
|
return;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
len = parser->root.cursor - cur;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
parser->root.error = T1_Add_Table( char_table, charcode,
|
2003-10-07 07:49:41 +02:00
|
|
|
cur, len + 1 );
|
2000-08-23 04:47:57 +02:00
|
|
|
if ( parser->root.error )
|
2000-07-09 02:48:37 +02:00
|
|
|
return;
|
2004-02-12 09:33:20 +01:00
|
|
|
char_table->elements[charcode][len] = '\0';
|
2003-10-23 18:24:10 +02:00
|
|
|
|
|
|
|
n++;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2008-08-28 18:12:48 +02:00
|
|
|
else if ( only_immediates )
|
|
|
|
{
|
|
|
|
/* Since the current position is not updated for */
|
|
|
|
/* immediates-only mode we would get an infinite loop if */
|
|
|
|
/* we don't do anything here. */
|
|
|
|
/* */
|
|
|
|
/* This encoding array is not valid according to the type1 */
|
|
|
|
/* specification (it might be an encoding for a CID type1 */
|
|
|
|
/* font, however), so we conclude that this font is NOT a */
|
|
|
|
/* type1 font. */
|
|
|
|
parser->root.error = FT_Err_Unknown_File_Format;
|
|
|
|
return;
|
|
|
|
}
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
|
|
|
else
|
2007-06-19 09:57:30 +02:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_PS_Token( parser );
|
2007-06-19 09:57:30 +02:00
|
|
|
if ( parser->root.error )
|
|
|
|
return;
|
|
|
|
}
|
2003-10-13 07:58:54 +02:00
|
|
|
|
|
|
|
T1_Skip_Spaces( parser );
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2002-02-28 19:59:37 +01:00
|
|
|
face->type1.encoding_type = T1_ENCODING_TYPE_ARRAY;
|
2000-08-23 19:32:42 +02:00
|
|
|
parser->root.cursor = cur;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2003-10-07 07:49:41 +02:00
|
|
|
|
2002-05-12 21:59:17 +02:00
|
|
|
/* Otherwise, we should have either `StandardEncoding', */
|
|
|
|
/* `ExpertEncoding', or `ISOLatin1Encoding' */
|
2000-01-27 15:02:04 +01:00
|
|
|
else
|
|
|
|
{
|
2002-05-12 21:59:17 +02:00
|
|
|
if ( cur + 17 < limit &&
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
ft_strncmp( (const char*)cur, "StandardEncoding", 16 ) == 0 )
|
2002-02-28 19:59:37 +01:00
|
|
|
face->type1.encoding_type = T1_ENCODING_TYPE_STANDARD;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2002-05-12 21:59:17 +02:00
|
|
|
else if ( cur + 15 < limit &&
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
ft_strncmp( (const char*)cur, "ExpertEncoding", 14 ) == 0 )
|
2002-05-12 21:59:17 +02:00
|
|
|
face->type1.encoding_type = T1_ENCODING_TYPE_EXPERT;
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2002-05-12 21:59:17 +02:00
|
|
|
else if ( cur + 18 < limit &&
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
ft_strncmp( (const char*)cur, "ISOLatin1Encoding", 17 ) == 0 )
|
2002-02-28 19:59:37 +01:00
|
|
|
face->type1.encoding_type = T1_ENCODING_TYPE_ISOLATIN1;
|
2002-02-10 13:33:14 +01:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
else
|
2004-02-12 09:33:20 +01:00
|
|
|
parser->root.error = T1_Err_Ignore;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_subrs( T1_Face face,
|
|
|
|
T1_Loader loader )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Parser parser = &loader->parser;
|
|
|
|
PS_Table table = &loader->subrs;
|
|
|
|
FT_Memory memory = parser->root.memory;
|
|
|
|
FT_Error error;
|
2008-11-04 11:37:30 +01:00
|
|
|
FT_Int num_subrs;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2008-11-04 11:37:30 +01:00
|
|
|
PSAux_Service psaux = (PSAux_Service)face->psaux;
|
2000-08-23 19:32:42 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_Spaces( parser );
|
|
|
|
|
|
|
|
/* test for empty array */
|
|
|
|
if ( parser->root.cursor < parser->root.limit &&
|
|
|
|
*parser->root.cursor == '[' )
|
2002-12-16 22:51:24 +01:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_PS_Token( parser );
|
|
|
|
T1_Skip_Spaces ( parser );
|
|
|
|
if ( parser->root.cursor >= parser->root.limit ||
|
2003-10-13 07:58:54 +02:00
|
|
|
*parser->root.cursor != ']' )
|
2003-10-07 07:49:41 +02:00
|
|
|
parser->root.error = T1_Err_Invalid_File_Format;
|
2002-12-16 22:51:24 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2003-10-07 13:54:03 +02:00
|
|
|
num_subrs = (FT_Int)T1_ToInt( parser );
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-25 19:25:32 +02:00
|
|
|
/* position the parser right before the `dup' of the first subr */
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_PS_Token( parser ); /* `array' */
|
2005-02-13 22:42:42 +01:00
|
|
|
if ( parser->root.error )
|
|
|
|
return;
|
|
|
|
T1_Skip_Spaces( parser );
|
2000-07-25 18:20:57 +02:00
|
|
|
|
2003-10-07 22:06:35 +02:00
|
|
|
/* initialize subrs array -- with synthetic fonts it is possible */
|
|
|
|
/* we get here twice */
|
|
|
|
if ( !loader->num_subrs )
|
|
|
|
{
|
|
|
|
error = psaux->ps_table_funcs->init( table, num_subrs, memory );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
}
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2008-11-04 11:37:30 +01:00
|
|
|
/* the format is simple: */
|
|
|
|
/* */
|
|
|
|
/* `index' + binary data */
|
|
|
|
/* */
|
|
|
|
for (;;)
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2002-09-17 14:39:19 +02:00
|
|
|
FT_Long idx, size;
|
2000-06-16 21:34:52 +02:00
|
|
|
FT_Byte* base;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2008-11-04 11:37:30 +01:00
|
|
|
/* If the next token isn't `dup' we are done. */
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
if ( ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
|
2000-07-25 18:20:57 +02:00
|
|
|
break;
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_PS_Token( parser ); /* `dup' */
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
idx = T1_ToInt( parser );
|
2000-10-31 21:42:18 +01:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( !read_binary_data( parser, &size, &base ) )
|
|
|
|
return;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-25 19:25:32 +02:00
|
|
|
/* The binary string is followed by one token, e.g. `NP' */
|
|
|
|
/* (bound to `noaccess put') or by two separate tokens: */
|
|
|
|
/* `noaccess' & `put'. We position the parser right */
|
|
|
|
/* before the next `dup', if any. */
|
2004-02-03 22:34:29 +01:00
|
|
|
T1_Skip_PS_Token( parser ); /* `NP' or `|' or `noaccess' */
|
2005-02-13 22:42:42 +01:00
|
|
|
if ( parser->root.error )
|
|
|
|
return;
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_Spaces ( parser );
|
2000-07-25 19:25:32 +02:00
|
|
|
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
if ( ft_strncmp( (char*)parser->root.cursor, "put", 3 ) == 0 )
|
2000-07-25 18:20:57 +02:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_PS_Token( parser ); /* skip `put' */
|
|
|
|
T1_Skip_Spaces ( parser );
|
2000-07-25 18:20:57 +02:00
|
|
|
}
|
|
|
|
|
2003-10-07 13:54:03 +02:00
|
|
|
/* with synthetic fonts it is possible we get here twice */
|
|
|
|
if ( loader->num_subrs )
|
|
|
|
continue;
|
|
|
|
|
2000-06-23 02:07:06 +02:00
|
|
|
/* some fonts use a value of -1 for lenIV to indicate that */
|
2000-07-25 19:25:32 +02:00
|
|
|
/* the charstrings are unencoded */
|
2000-06-23 02:07:06 +02:00
|
|
|
/* */
|
2000-07-25 19:25:32 +02:00
|
|
|
/* thanks to Tom Kacvinsky for pointing this out */
|
2000-06-23 02:07:06 +02:00
|
|
|
/* */
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( face->type1.private_dict.lenIV >= 0 )
|
2000-06-23 02:07:06 +02:00
|
|
|
{
|
2002-01-28 14:34:52 +01:00
|
|
|
FT_Byte* temp;
|
|
|
|
|
|
|
|
|
2008-05-18 19:36:15 +02:00
|
|
|
/* some fonts define empty subr records -- this is not totally */
|
|
|
|
/* compliant to the specification (which says they should at */
|
|
|
|
/* least contain a `return'), but we support them anyway */
|
2008-05-15 01:26:20 +02:00
|
|
|
if ( size < face->type1.private_dict.lenIV )
|
2007-05-30 15:57:02 +02:00
|
|
|
{
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
|
2002-01-28 14:34:52 +01:00
|
|
|
/* t1_decrypt() shouldn't write to base -- make temporary copy */
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_ALLOC( temp, size ) )
|
2002-01-28 14:34:52 +01:00
|
|
|
goto Fail;
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_MEM_COPY( temp, base, size );
|
2002-01-28 14:34:52 +01:00
|
|
|
psaux->t1_decrypt( temp, size, 4330 );
|
2000-06-23 02:07:06 +02:00
|
|
|
size -= face->type1.private_dict.lenIV;
|
* include/freetype/internal/ftdriver.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/psaux.h, src/cid/cidgload.c,
src/psaux/psobjs.c, src/psaux/t1decode.c, src/psaux/psobjs.h,
src/pshinter/pshrec.c, src/pshinter/pshalgo.c,
src/psnames/psmodule.c, src/raster/ftraster.c, src/sfnt/sfobjs.c,
src/smooth/ftgrays.c, src/smooth/ftsmooth.c, src/truetype/ttobjs.c,
src/truetype/ttdriver.c, src/truetype/ttgload.c, src/type1/t1afm.c,
src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1load.c,
src/type1/t1objs.c, src/type42/t42parse.c, src/type42/t42parse.h:
Many casts and slight argument type changes to make it work with
a 16bit compiler.
2003-06-05 06:31:05 +02:00
|
|
|
error = T1_Add_Table( table, (FT_Int)idx,
|
2002-01-28 14:34:52 +01:00
|
|
|
temp + face->type1.private_dict.lenIV, size );
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( temp );
|
2000-06-23 02:07:06 +02:00
|
|
|
}
|
2002-01-28 14:34:52 +01:00
|
|
|
else
|
* include/freetype/internal/ftdriver.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/psaux.h, src/cid/cidgload.c,
src/psaux/psobjs.c, src/psaux/t1decode.c, src/psaux/psobjs.h,
src/pshinter/pshrec.c, src/pshinter/pshalgo.c,
src/psnames/psmodule.c, src/raster/ftraster.c, src/sfnt/sfobjs.c,
src/smooth/ftgrays.c, src/smooth/ftsmooth.c, src/truetype/ttobjs.c,
src/truetype/ttdriver.c, src/truetype/ttgload.c, src/type1/t1afm.c,
src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1load.c,
src/type1/t1objs.c, src/type42/t42parse.c, src/type42/t42parse.h:
Many casts and slight argument type changes to make it work with
a 16bit compiler.
2003-06-05 06:31:05 +02:00
|
|
|
error = T1_Add_Table( table, (FT_Int)idx, base, size );
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2003-10-07 13:54:03 +02:00
|
|
|
|
2004-02-01 01:49:56 +01:00
|
|
|
if ( !loader->num_subrs )
|
|
|
|
loader->num_subrs = num_subrs;
|
2003-10-07 13:54:03 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
Fail:
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.error = error;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
#define TABLE_EXTEND 5
|
|
|
|
|
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_charstrings( T1_Face face,
|
|
|
|
T1_Loader loader )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2002-04-02 00:01:46 +02:00
|
|
|
T1_Parser parser = &loader->parser;
|
|
|
|
PS_Table code_table = &loader->charstrings;
|
|
|
|
PS_Table name_table = &loader->glyph_names;
|
|
|
|
PS_Table swap_table = &loader->swap_table;
|
|
|
|
FT_Memory memory = parser->root.memory;
|
2000-10-28 19:10:06 +02:00
|
|
|
FT_Error error;
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2002-04-02 00:01:46 +02:00
|
|
|
PSAux_Service psaux = (PSAux_Service)face->psaux;
|
2000-08-23 04:47:57 +02:00
|
|
|
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Byte* cur;
|
|
|
|
FT_Byte* limit = parser->root.limit;
|
2004-02-01 01:49:56 +01:00
|
|
|
FT_Int n, num_glyphs;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_UInt notdef_index = 0;
|
|
|
|
FT_Byte notdef_found = 0;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-10-19 07:12:00 +02:00
|
|
|
|
2004-02-01 01:49:56 +01:00
|
|
|
num_glyphs = (FT_Int)T1_ToInt( parser );
|
2004-02-02 20:41:09 +01:00
|
|
|
/* some fonts like Optima-Oblique not only define the /CharStrings */
|
|
|
|
/* array but access it also */
|
|
|
|
if ( num_glyphs == 0 || parser->root.error )
|
2000-07-09 02:48:37 +02:00
|
|
|
return;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-12-12 16:38:39 +01:00
|
|
|
/* initialize tables, leaving space for addition of .notdef, */
|
|
|
|
/* if necessary, and a few other glyphs to handle buggy */
|
|
|
|
/* fonts which have more glyphs than specified. */
|
2001-04-10 20:15:17 +02:00
|
|
|
|
2004-02-01 01:49:56 +01:00
|
|
|
/* for some non-standard fonts like `Optima' which provides */
|
|
|
|
/* different outlines depending on the resolution it is */
|
|
|
|
/* possible to get here twice */
|
|
|
|
if ( !loader->num_glyphs )
|
|
|
|
{
|
|
|
|
error = psaux->ps_table_funcs->init(
|
|
|
|
code_table, num_glyphs + 1 + TABLE_EXTEND, memory );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2000-08-23 04:47:57 +02:00
|
|
|
|
2004-02-01 01:49:56 +01:00
|
|
|
error = psaux->ps_table_funcs->init(
|
|
|
|
name_table, num_glyphs + 1 + TABLE_EXTEND, memory );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2004-02-01 01:49:56 +01:00
|
|
|
/* Initialize table for swapping index notdef_index and */
|
|
|
|
/* index 0 names and codes (if necessary). */
|
2001-04-10 20:15:17 +02:00
|
|
|
|
2004-02-01 01:49:56 +01:00
|
|
|
error = psaux->ps_table_funcs->init( swap_table, 4, memory );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
}
|
2001-04-10 20:15:17 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
n = 0;
|
2002-05-12 21:59:17 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
for (;;)
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2002-09-17 14:39:19 +02:00
|
|
|
FT_Long size;
|
2000-06-16 21:34:52 +02:00
|
|
|
FT_Byte* base;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-10-19 07:12:00 +02:00
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
/* the format is simple: */
|
|
|
|
/* `/glyphname' + binary data */
|
2003-10-16 17:48:39 +02:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
T1_Skip_Spaces( parser );
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
cur = parser->root.cursor;
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( cur >= limit )
|
|
|
|
break;
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* we stop when we find a `def' or `end' keyword */
|
2007-01-12 10:28:44 +01:00
|
|
|
if ( cur + 3 < limit && IS_PS_DELIM( cur[3] ) )
|
2003-10-07 07:49:41 +02:00
|
|
|
{
|
|
|
|
if ( cur[0] == 'd' &&
|
|
|
|
cur[1] == 'e' &&
|
|
|
|
cur[2] == 'f' )
|
2005-04-14 13:43:40 +02:00
|
|
|
{
|
|
|
|
/* There are fonts which have this: */
|
|
|
|
/* */
|
|
|
|
/* /CharStrings 118 dict def */
|
|
|
|
/* Private begin */
|
|
|
|
/* CharStrings begin */
|
|
|
|
/* ... */
|
|
|
|
/* */
|
|
|
|
/* To catch this we ignore `def' if */
|
|
|
|
/* no charstring has actually been */
|
|
|
|
/* seen. */
|
|
|
|
if ( n )
|
|
|
|
break;
|
|
|
|
}
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
if ( cur[0] == 'e' &&
|
|
|
|
cur[1] == 'n' &&
|
|
|
|
cur[2] == 'd' )
|
|
|
|
break;
|
|
|
|
}
|
2000-02-15 13:55:57 +01:00
|
|
|
|
2003-10-07 22:06:35 +02:00
|
|
|
T1_Skip_PS_Token( parser );
|
2005-02-13 22:42:42 +01:00
|
|
|
if ( parser->root.error )
|
|
|
|
return;
|
2003-10-07 22:06:35 +02:00
|
|
|
|
|
|
|
if ( *cur == '/' )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2002-09-17 14:39:19 +02:00
|
|
|
FT_PtrDist len;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
|
|
|
|
2003-10-07 22:06:35 +02:00
|
|
|
if ( cur + 1 >= limit )
|
2003-10-07 07:49:41 +02:00
|
|
|
{
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
|
2003-10-07 22:06:35 +02:00
|
|
|
cur++; /* skip `/' */
|
2003-10-07 07:49:41 +02:00
|
|
|
len = parser->root.cursor - cur;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2004-02-01 01:49:56 +01:00
|
|
|
if ( !read_binary_data( parser, &size, &base ) )
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* for some non-standard fonts like `Optima' which provides */
|
|
|
|
/* different outlines depending on the resolution it is */
|
|
|
|
/* possible to get here twice */
|
|
|
|
if ( loader->num_glyphs )
|
|
|
|
continue;
|
|
|
|
|
2003-10-07 22:06:35 +02:00
|
|
|
error = T1_Add_Table( name_table, n, cur, len + 1 );
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
/* add a trailing zero to the name table */
|
|
|
|
name_table->elements[n][len] = '\0';
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-16 17:48:39 +02:00
|
|
|
/* record index of /.notdef */
|
|
|
|
if ( *cur == '.' &&
|
|
|
|
ft_strcmp( ".notdef",
|
2002-04-14 02:54:32 +02:00
|
|
|
(const char*)(name_table->elements[n]) ) == 0 )
|
2000-10-19 07:12:00 +02:00
|
|
|
{
|
|
|
|
notdef_index = n;
|
|
|
|
notdef_found = 1;
|
2000-10-17 22:25:30 +02:00
|
|
|
}
|
|
|
|
|
2007-05-30 15:57:02 +02:00
|
|
|
if ( face->type1.private_dict.lenIV >= 0 &&
|
|
|
|
n < num_glyphs + TABLE_EXTEND )
|
2000-06-23 02:07:06 +02:00
|
|
|
{
|
2002-01-28 14:34:52 +01:00
|
|
|
FT_Byte* temp;
|
|
|
|
|
|
|
|
|
2007-05-30 15:57:02 +02:00
|
|
|
if ( size <= face->type1.private_dict.lenIV )
|
|
|
|
{
|
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
|
2002-01-28 14:34:52 +01:00
|
|
|
/* t1_decrypt() shouldn't write to base -- make temporary copy */
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( FT_ALLOC( temp, size ) )
|
2002-01-28 14:34:52 +01:00
|
|
|
goto Fail;
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_MEM_COPY( temp, base, size );
|
2002-01-28 14:34:52 +01:00
|
|
|
psaux->t1_decrypt( temp, size, 4330 );
|
2000-06-23 02:07:06 +02:00
|
|
|
size -= face->type1.private_dict.lenIV;
|
2002-01-28 14:34:52 +01:00
|
|
|
error = T1_Add_Table( code_table, n,
|
|
|
|
temp + face->type1.private_dict.lenIV, size );
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( temp );
|
2000-06-23 02:07:06 +02:00
|
|
|
}
|
2002-01-28 14:34:52 +01:00
|
|
|
else
|
|
|
|
error = T1_Add_Table( code_table, n, base, size );
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
n++;
|
|
|
|
}
|
|
|
|
}
|
2000-10-17 22:25:30 +02:00
|
|
|
|
2008-10-08 18:04:46 +02:00
|
|
|
loader->num_glyphs = n;
|
2000-10-17 22:25:30 +02:00
|
|
|
|
2003-10-16 17:48:39 +02:00
|
|
|
/* if /.notdef is found but does not occupy index 0, do our magic. */
|
2008-10-08 18:04:46 +02:00
|
|
|
if ( notdef_found &&
|
|
|
|
ft_strcmp( ".notdef", (const char*)name_table->elements[0] ) )
|
2000-10-17 22:25:30 +02:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
/* Swap glyph in index 0 with /.notdef glyph. First, add index 0 */
|
|
|
|
/* name and code entries to swap_table. Then place notdef_index */
|
|
|
|
/* name and code entries into swap_table. Then swap name and code */
|
|
|
|
/* entries at indices notdef_index and 0 using values stored in */
|
|
|
|
/* swap_table. */
|
2000-10-17 22:25:30 +02:00
|
|
|
|
2001-04-10 20:15:17 +02:00
|
|
|
/* Index 0 name */
|
|
|
|
error = T1_Add_Table( swap_table, 0,
|
2000-10-19 07:12:00 +02:00
|
|
|
name_table->elements[0],
|
|
|
|
name_table->lengths [0] );
|
2000-10-17 22:25:30 +02:00
|
|
|
if ( error )
|
2000-10-19 07:12:00 +02:00
|
|
|
goto Fail;
|
2001-04-10 20:15:17 +02:00
|
|
|
|
|
|
|
/* Index 0 code */
|
|
|
|
error = T1_Add_Table( swap_table, 1,
|
2000-10-19 07:12:00 +02:00
|
|
|
code_table->elements[0],
|
|
|
|
code_table->lengths [0] );
|
2000-10-17 22:25:30 +02:00
|
|
|
if ( error )
|
2000-10-19 07:12:00 +02:00
|
|
|
goto Fail;
|
2000-10-17 22:25:30 +02:00
|
|
|
|
2001-04-10 20:15:17 +02:00
|
|
|
/* Index notdef_index name */
|
|
|
|
error = T1_Add_Table( swap_table, 2,
|
2000-10-19 07:12:00 +02:00
|
|
|
name_table->elements[notdef_index],
|
|
|
|
name_table->lengths [notdef_index] );
|
2000-10-17 22:25:30 +02:00
|
|
|
if ( error )
|
2000-10-19 07:12:00 +02:00
|
|
|
goto Fail;
|
2000-10-17 22:25:30 +02:00
|
|
|
|
2001-04-10 20:15:17 +02:00
|
|
|
/* Index notdef_index code */
|
|
|
|
error = T1_Add_Table( swap_table, 3,
|
2000-10-19 07:12:00 +02:00
|
|
|
code_table->elements[notdef_index],
|
|
|
|
code_table->lengths [notdef_index] );
|
2000-10-17 22:25:30 +02:00
|
|
|
if ( error )
|
2000-10-19 07:12:00 +02:00
|
|
|
goto Fail;
|
2000-10-17 22:25:30 +02:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
error = T1_Add_Table( name_table, notdef_index,
|
2001-04-10 20:15:17 +02:00
|
|
|
swap_table->elements[0],
|
|
|
|
swap_table->lengths [0] );
|
2000-10-17 22:25:30 +02:00
|
|
|
if ( error )
|
2000-10-19 07:12:00 +02:00
|
|
|
goto Fail;
|
2000-10-17 22:25:30 +02:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
error = T1_Add_Table( code_table, notdef_index,
|
2001-04-10 20:15:17 +02:00
|
|
|
swap_table->elements[1],
|
|
|
|
swap_table->lengths [1] );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
|
|
|
|
error = T1_Add_Table( name_table, 0,
|
|
|
|
swap_table->elements[2],
|
|
|
|
swap_table->lengths [2] );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
|
|
|
|
error = T1_Add_Table( code_table, 0,
|
|
|
|
swap_table->elements[3],
|
|
|
|
swap_table->lengths [3] );
|
2000-10-17 22:25:30 +02:00
|
|
|
if ( error )
|
2000-10-19 07:12:00 +02:00
|
|
|
goto Fail;
|
2000-10-17 22:25:30 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
else if ( !notdef_found )
|
|
|
|
{
|
2002-04-02 00:01:46 +02:00
|
|
|
/* notdef_index is already 0, or /.notdef is undefined in */
|
|
|
|
/* charstrings dictionary. Worry about /.notdef undefined. */
|
|
|
|
/* We take index 0 and add it to the end of the table(s) */
|
|
|
|
/* and add our own /.notdef glyph to index 0. */
|
2000-10-31 21:42:18 +01:00
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
/* 0 333 hsbw endchar */
|
2008-10-08 18:04:46 +02:00
|
|
|
FT_Byte notdef_glyph[] = { 0x8B, 0xF7, 0xE1, 0x0D, 0x0E };
|
2000-11-02 16:14:38 +01:00
|
|
|
char* notdef_name = (char *)".notdef";
|
2000-10-19 07:12:00 +02:00
|
|
|
|
2000-10-17 22:25:30 +02:00
|
|
|
|
2001-04-10 20:15:17 +02:00
|
|
|
error = T1_Add_Table( swap_table, 0,
|
2000-10-17 22:25:30 +02:00
|
|
|
name_table->elements[0],
|
|
|
|
name_table->lengths [0] );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
|
2001-04-10 20:15:17 +02:00
|
|
|
error = T1_Add_Table( swap_table, 1,
|
2000-10-17 22:25:30 +02:00
|
|
|
code_table->elements[0],
|
|
|
|
code_table->lengths [0] );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
error = T1_Add_Table( name_table, 0, notdef_name, 8 );
|
2000-10-17 22:25:30 +02:00
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
error = T1_Add_Table( code_table, 0, notdef_glyph, 5 );
|
2000-10-17 22:25:30 +02:00
|
|
|
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
|
2001-04-10 20:15:17 +02:00
|
|
|
error = T1_Add_Table( name_table, n,
|
|
|
|
swap_table->elements[0],
|
|
|
|
swap_table->lengths [0] );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
|
|
|
|
error = T1_Add_Table( code_table, n,
|
|
|
|
swap_table->elements[1],
|
|
|
|
swap_table->lengths [1] );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
|
|
|
|
2000-10-17 22:25:30 +02:00
|
|
|
/* we added a glyph. */
|
2008-10-08 18:04:46 +02:00
|
|
|
loader->num_glyphs += 1;
|
2000-10-17 22:25:30 +02:00
|
|
|
}
|
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
return;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
Fail:
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.error = error;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* Define the token field static variables. This is a set of */
|
|
|
|
/* T1_FieldRec variables. */
|
|
|
|
/* */
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
static
|
2002-02-28 17:10:29 +01:00
|
|
|
const T1_FieldRec t1_keywords[] =
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2001-03-20 12:14:24 +01:00
|
|
|
#include "t1tokens.h"
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
/* now add the special functions... */
|
2006-08-19 13:18:09 +02:00
|
|
|
T1_FIELD_CALLBACK( "FontMatrix", parse_font_matrix,
|
|
|
|
T1_FIELD_DICT_FONTDICT )
|
|
|
|
T1_FIELD_CALLBACK( "Encoding", parse_encoding,
|
|
|
|
T1_FIELD_DICT_FONTDICT )
|
|
|
|
T1_FIELD_CALLBACK( "Subrs", parse_subrs,
|
|
|
|
T1_FIELD_DICT_PRIVATE )
|
|
|
|
T1_FIELD_CALLBACK( "CharStrings", parse_charstrings,
|
|
|
|
T1_FIELD_DICT_PRIVATE )
|
|
|
|
T1_FIELD_CALLBACK( "Private", parse_private,
|
|
|
|
T1_FIELD_DICT_FONTDICT )
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-10-28 19:10:06 +02:00
|
|
|
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
|
2006-08-19 13:18:09 +02:00
|
|
|
T1_FIELD_CALLBACK( "BlendDesignPositions", parse_blend_design_positions,
|
|
|
|
T1_FIELD_DICT_FONTDICT )
|
|
|
|
T1_FIELD_CALLBACK( "BlendDesignMap", parse_blend_design_map,
|
|
|
|
T1_FIELD_DICT_FONTDICT )
|
|
|
|
T1_FIELD_CALLBACK( "BlendAxisTypes", parse_blend_axis_types,
|
|
|
|
T1_FIELD_DICT_FONTDICT )
|
|
|
|
T1_FIELD_CALLBACK( "WeightVector", parse_weight_vector,
|
|
|
|
T1_FIELD_DICT_FONTDICT )
|
|
|
|
T1_FIELD_CALLBACK( "BuildCharArray", parse_buildchar,
|
|
|
|
T1_FIELD_DICT_PRIVATE )
|
2000-07-09 21:15:30 +02:00
|
|
|
#endif
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2006-08-13 14:14:36 +02:00
|
|
|
{ 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0, 0 }
|
2000-01-27 15:02:04 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
Make reference valid HTML 4.01 transitional.
* src/tools/docmaker/tohtml.py (html_header_1): Add doctype
and charset.
(html_header_2): Fix style elements and add some more.
Fix syntax.
(block_header, block_footer, description_header, description_footer,
marker_header, marker_footer, source_header, source_footer,
chapter_header, chapter_footer): Don't use <center>...</center> but
`align=center' table attribute.
Use double quotes around table widths given in percent.
(keyword_prefix, keyword_suffix): Don't change font colour directly
but use a new <span> class.
(section_synopsis_header, section_synopsis_footer): Don't change
colour.
(print_html_field): <tr> gets the `valign' attribute, not <table>.
(print_html_field_list): Ditto.
(index_exit): Don't use <center>...</center> but `align=center'
table attribute.
(toc_exit, section_enter): Ditto.
(block_enter): Use <h4><a>, not <a><h4>.
This change reimplements fix from 2003-05-30 without breaking
binary compatibility.
* include/freetype/t1tables.h (PS_FontInfoRec): `italic_angle',
`is_fixed_pitch', `underline_position', `underline_thickness' are
reverted to be normal values.
* include/freetype/internal/psaux.h (T1_FieldType): Remove
`T1_FIELD_TYPE_BOOL_P', `T1_FIELD_TYPE_INTEGER_P',
`T1_FIELD_TYPE_FIXED_P', `T1_FIELD_TYPE_FIXED_1000_P'.
(T1_FIELD_TYPE_BOOL_P, T1_FIELD_NUM_P, T1_FIELD_FIXED_P,
T1_FIELD_FIXED_1000_P): Removed.
(T1_FIELD_TYPE_BOOL): Renamed to...
(T1_FIELD_BOOL): New macro. Updated all callers.
* src/type42/t42parse.c: `italic_angle', `is_fixed_pitch',
`underline_position', `underline_thickness', `paint_type',
`stroke_width' are reverted to be normal values.
(T42_KEYWORD_COUNT): New macro.
(t42_parse_dict): New array `keyword_flags' to mark that a value has
already been assigned to a dictionary entry.
* src/type42/t42objs.c (T42_Face_Init, T42_Face_Done): Updated.
* src/cid/cidtoken.h: `italic_angle', `is_fixed_pitch',
`underline_position', `underline_thickness' are reverted to be
normal values.
* src/cid/cidobjs.c (cid_face_done, cid_face_init): Updated.
* src/psaux/psobjs.c (ps_parser_load_field): Updated.
* src/type1/t1tokens.h: `italic_angle', `is_fixed_pitch',
`underline_position', `underline_thickness', `paint_type',
`stroke_width' are reverted to be normal values.
* src/type1/t1objs.c (T1_Face_Done, T1_Face_Init): Updated.
* src/type1/t1load.c (T1_FIELD_COUNT): New macro.
(parse_dict): Add parameter for keyword flags.
Record only first instance of a field.
(T1_Open_Face): New array `keyword_flags'.
2003-07-26 00:09:53 +02:00
|
|
|
#define T1_FIELD_COUNT \
|
|
|
|
( sizeof ( t1_keywords ) / sizeof ( t1_keywords[0] ) )
|
|
|
|
|
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static FT_Error
|
2002-05-12 21:59:17 +02:00
|
|
|
parse_dict( T1_Face face,
|
|
|
|
T1_Loader loader,
|
|
|
|
FT_Byte* base,
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
FT_Long size )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2002-02-28 17:10:29 +01:00
|
|
|
T1_Parser parser = &loader->parser;
|
2004-02-16 10:38:05 +01:00
|
|
|
FT_Byte *limit, *start_binary = NULL;
|
2004-02-05 15:36:43 +01:00
|
|
|
FT_Bool have_integer = 0;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-08-23 04:47:57 +02:00
|
|
|
parser->root.cursor = base;
|
|
|
|
parser->root.limit = base + size;
|
2003-10-07 07:49:41 +02:00
|
|
|
parser->root.error = T1_Err_Ok;
|
|
|
|
|
|
|
|
limit = parser->root.limit;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-13 07:58:54 +02:00
|
|
|
T1_Skip_Spaces( parser );
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
while ( parser->root.cursor < limit )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
FT_Byte* cur;
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
cur = parser->root.cursor;
|
|
|
|
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
/* look for `eexec' */
|
|
|
|
if ( IS_PS_TOKEN( cur, limit, "eexec" ) )
|
2003-12-22 12:35:36 +01:00
|
|
|
break;
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* look for `closefile' which ends the eexec section */
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
else if ( IS_PS_TOKEN( cur, limit, "closefile" ) )
|
2003-10-07 07:49:41 +02:00
|
|
|
break;
|
|
|
|
|
2006-06-26 11:40:00 +02:00
|
|
|
/* in a synthetic font the base font starts after a */
|
|
|
|
/* `FontDictionary' token that is placed after a Private dict */
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
else if ( IS_PS_TOKEN( cur, limit, "FontDirectory" ) )
|
2006-06-26 11:40:00 +02:00
|
|
|
{
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
if ( loader->keywords_encountered & T1_PRIVATE )
|
|
|
|
loader->keywords_encountered |=
|
|
|
|
T1_FONTDIR_AFTER_PRIVATE;
|
2006-06-26 11:40:00 +02:00
|
|
|
parser->root.cursor += 13;
|
|
|
|
}
|
|
|
|
|
2004-02-03 22:34:29 +01:00
|
|
|
/* check whether we have an integer */
|
|
|
|
else if ( ft_isdigit( *cur ) )
|
|
|
|
{
|
|
|
|
start_binary = cur;
|
|
|
|
T1_Skip_PS_Token( parser );
|
2005-02-13 22:42:42 +01:00
|
|
|
if ( parser->root.error )
|
|
|
|
goto Exit;
|
2004-02-03 22:34:29 +01:00
|
|
|
have_integer = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* in valid Type 1 fonts we don't see `RD' or `-|' directly */
|
|
|
|
/* since those tokens are handled by parse_subrs and */
|
|
|
|
/* parse_charstrings */
|
|
|
|
else if ( *cur == 'R' && cur + 6 < limit && *(cur + 1) == 'D' &&
|
|
|
|
have_integer )
|
|
|
|
{
|
|
|
|
FT_Long s;
|
|
|
|
FT_Byte* b;
|
|
|
|
|
|
|
|
|
|
|
|
parser->root.cursor = start_binary;
|
|
|
|
if ( !read_binary_data( parser, &s, &b ) )
|
|
|
|
return T1_Err_Invalid_File_Format;
|
|
|
|
have_integer = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
else if ( *cur == '-' && cur + 6 < limit && *(cur + 1) == '|' &&
|
|
|
|
have_integer )
|
|
|
|
{
|
|
|
|
FT_Long s;
|
|
|
|
FT_Byte* b;
|
|
|
|
|
|
|
|
|
|
|
|
parser->root.cursor = start_binary;
|
|
|
|
if ( !read_binary_data( parser, &s, &b ) )
|
|
|
|
return T1_Err_Invalid_File_Format;
|
|
|
|
have_integer = 0;
|
|
|
|
}
|
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
/* look for immediates */
|
|
|
|
else if ( *cur == '/' && cur + 2 < limit )
|
|
|
|
{
|
|
|
|
FT_PtrDist len;
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
cur++;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
parser->root.cursor = cur;
|
|
|
|
T1_Skip_PS_Token( parser );
|
2005-02-13 22:42:42 +01:00
|
|
|
if ( parser->root.error )
|
|
|
|
goto Exit;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
len = parser->root.cursor - cur;
|
|
|
|
|
2003-10-13 07:58:54 +02:00
|
|
|
if ( len > 0 && len < 22 && parser->root.cursor < limit )
|
2003-10-07 07:49:41 +02:00
|
|
|
{
|
|
|
|
/* now compare the immediate name to the keyword table */
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
T1_Field keyword = (T1_Field)t1_keywords;
|
2003-10-07 07:49:41 +02:00
|
|
|
|
|
|
|
|
|
|
|
for (;;)
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
FT_Byte* name;
|
2000-07-09 21:15:30 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
name = (FT_Byte*)keyword->ident;
|
|
|
|
if ( !name )
|
|
|
|
break;
|
|
|
|
|
2004-10-14 13:33:04 +02:00
|
|
|
if ( cur[0] == name[0] &&
|
|
|
|
len == (FT_PtrDist)ft_strlen( (const char *)name ) &&
|
|
|
|
ft_memcmp( cur, name, len ) == 0 )
|
2003-10-07 07:49:41 +02:00
|
|
|
{
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
/* We found it -- run the parsing callback! */
|
|
|
|
/* We record every instance of every field */
|
|
|
|
/* (until we reach the base font of a */
|
|
|
|
/* synthetic font) to deal adequately with */
|
|
|
|
/* multiple master fonts; this is also */
|
|
|
|
/* necessary because later PostScript */
|
2006-08-19 13:18:09 +02:00
|
|
|
/* definitions override earlier ones. */
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
|
|
|
|
/* Once we encounter `FontDirectory' after */
|
|
|
|
/* `/Private', we know that this is a synthetic */
|
|
|
|
/* font; except for `/CharStrings' we are not */
|
|
|
|
/* interested in anything that follows this */
|
2006-08-19 13:18:09 +02:00
|
|
|
/* `FontDirectory'. */
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
|
2006-08-13 14:14:36 +02:00
|
|
|
/* MM fonts have more than one /Private token at */
|
|
|
|
/* the top level; let's hope that all the junk */
|
|
|
|
/* that follows the first /Private token is not */
|
2006-08-19 13:18:09 +02:00
|
|
|
/* interesting to us. */
|
2006-08-13 14:14:36 +02:00
|
|
|
|
|
|
|
/* According to Adobe Tech Note #5175 (CID-Keyed */
|
|
|
|
/* Font Installation for ATM Software) a `begin' */
|
2006-08-19 13:18:09 +02:00
|
|
|
/* must be followed by exactly one `end', and */
|
2006-08-13 14:14:36 +02:00
|
|
|
/* `begin' -- `end' pairs must be accurately */
|
2007-01-26 23:18:56 +01:00
|
|
|
/* paired. We could use this to distinguish */
|
2006-08-13 14:14:36 +02:00
|
|
|
/* between the global Private and the Private */
|
2006-08-19 13:18:09 +02:00
|
|
|
/* dict that is a member of the Blend dict. */
|
2006-08-13 14:14:36 +02:00
|
|
|
|
2006-08-19 13:18:09 +02:00
|
|
|
const FT_UInt dict =
|
|
|
|
( loader->keywords_encountered & T1_PRIVATE )
|
|
|
|
? T1_FIELD_DICT_PRIVATE
|
|
|
|
: T1_FIELD_DICT_FONTDICT;
|
2006-08-13 14:14:36 +02:00
|
|
|
|
2006-08-19 13:18:09 +02:00
|
|
|
if ( !( dict & keyword->dict ) )
|
2006-08-13 14:14:36 +02:00
|
|
|
{
|
2006-08-19 13:18:09 +02:00
|
|
|
FT_TRACE1(( "parse_dict: found %s but ignoring it "
|
2006-08-13 14:14:36 +02:00
|
|
|
"since it is in the wrong dictionary\n",
|
|
|
|
keyword->ident ));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-08-19 13:18:09 +02:00
|
|
|
if ( !( loader->keywords_encountered &
|
|
|
|
T1_FONTDIR_AFTER_PRIVATE ) ||
|
2006-08-13 14:14:36 +02:00
|
|
|
ft_strcmp( (const char*)name, "CharStrings" ) == 0 )
|
2003-10-07 07:49:41 +02:00
|
|
|
{
|
2003-10-13 07:58:54 +02:00
|
|
|
parser->root.error = t1_load_keyword( face,
|
|
|
|
loader,
|
|
|
|
keyword );
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
if ( parser->root.error != T1_Err_Ok )
|
2004-02-12 09:33:20 +01:00
|
|
|
{
|
2004-03-05 10:26:24 +01:00
|
|
|
if ( FT_ERROR_BASE( parser->root.error ) == FT_Err_Ignore )
|
2004-02-12 09:33:20 +01:00
|
|
|
parser->root.error = T1_Err_Ok;
|
|
|
|
else
|
|
|
|
return parser->root.error;
|
|
|
|
}
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2003-10-13 07:58:54 +02:00
|
|
|
break;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2003-10-13 07:58:54 +02:00
|
|
|
|
2003-10-07 07:49:41 +02:00
|
|
|
keyword++;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
|
|
|
}
|
2004-02-03 22:34:29 +01:00
|
|
|
|
|
|
|
have_integer = 0;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2003-10-07 07:49:41 +02:00
|
|
|
else
|
2004-02-03 22:34:29 +01:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
T1_Skip_PS_Token( parser );
|
2004-02-12 09:33:20 +01:00
|
|
|
if ( parser->root.error )
|
|
|
|
goto Exit;
|
2004-02-03 22:34:29 +01:00
|
|
|
have_integer = 0;
|
|
|
|
}
|
2003-10-13 07:58:54 +02:00
|
|
|
|
|
|
|
T1_Skip_Spaces( parser );
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2003-10-13 07:58:54 +02:00
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
Exit:
|
2000-08-23 04:47:57 +02:00
|
|
|
return parser->root.error;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
t1_init_loader( T1_Loader loader,
|
|
|
|
T1_Face face )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2000-07-09 02:48:37 +02:00
|
|
|
FT_UNUSED( face );
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2002-07-28 07:05:24 +02:00
|
|
|
FT_MEM_ZERO( loader, sizeof ( *loader ) );
|
2000-01-27 15:02:04 +01:00
|
|
|
loader->num_glyphs = 0;
|
|
|
|
loader->num_chars = 0;
|
2000-02-15 13:55:57 +01:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* initialize the tables -- simply set their `init' field to 0 */
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
loader->encoding_table.init = 0;
|
|
|
|
loader->charstrings.init = 0;
|
|
|
|
loader->glyph_names.init = 0;
|
|
|
|
loader->subrs.init = 0;
|
|
|
|
loader->swap_table.init = 0;
|
|
|
|
loader->fontdata = 0;
|
|
|
|
loader->keywords_encountered = 0;
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2001-06-28 09:17:51 +02:00
|
|
|
static void
|
2002-05-12 21:59:17 +02:00
|
|
|
t1_done_loader( T1_Loader loader )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2002-02-28 17:10:29 +01:00
|
|
|
T1_Parser parser = &loader->parser;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
/* finalize tables */
|
2000-10-28 19:10:06 +02:00
|
|
|
T1_Release_Table( &loader->encoding_table );
|
|
|
|
T1_Release_Table( &loader->charstrings );
|
|
|
|
T1_Release_Table( &loader->glyph_names );
|
2001-04-10 20:15:17 +02:00
|
|
|
T1_Release_Table( &loader->swap_table );
|
2000-10-28 19:10:06 +02:00
|
|
|
T1_Release_Table( &loader->subrs );
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
/* finalize parser */
|
2000-11-23 09:21:13 +01:00
|
|
|
T1_Finalize_Parser( parser );
|
2000-01-27 15:02:04 +01:00
|
|
|
}
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
2001-06-28 09:17:51 +02:00
|
|
|
T1_Open_Face( T1_Face face )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
2002-05-12 21:59:17 +02:00
|
|
|
T1_LoaderRec loader;
|
2002-04-02 00:01:46 +02:00
|
|
|
T1_Parser parser;
|
|
|
|
T1_Font type1 = &face->type1;
|
2004-02-25 22:17:49 +01:00
|
|
|
PS_Private priv = &type1->private_dict;
|
2002-04-02 00:01:46 +02:00
|
|
|
FT_Error error;
|
2000-10-31 21:42:18 +01:00
|
|
|
|
2002-02-28 17:10:29 +01:00
|
|
|
PSAux_Service psaux = (PSAux_Service)face->psaux;
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2000-08-23 19:32:42 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
t1_init_loader( &loader, face );
|
|
|
|
|
2004-02-25 22:17:49 +01:00
|
|
|
/* default values */
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
face->ndv_idx = -1;
|
|
|
|
face->cdv_idx = -1;
|
|
|
|
face->len_buildchar = 0;
|
|
|
|
|
2004-02-25 22:17:49 +01:00
|
|
|
priv->blue_shift = 7;
|
|
|
|
priv->blue_fuzz = 1;
|
|
|
|
priv->lenIV = 4;
|
|
|
|
priv->expansion_factor = (FT_Fixed)( 0.06 * 0x10000L );
|
|
|
|
priv->blue_scale = (FT_Fixed)( 0.039625 * 0x10000L * 1000 );
|
2002-07-09 01:13:25 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
parser = &loader.parser;
|
2002-04-02 00:01:46 +02:00
|
|
|
error = T1_New_Parser( parser,
|
|
|
|
face->root.stream,
|
|
|
|
face->root.memory,
|
|
|
|
psaux );
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2000-01-27 15:02:04 +01:00
|
|
|
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
error = parse_dict( face, &loader,
|
|
|
|
parser->base_dict, parser->base_len );
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-11-23 09:21:13 +01:00
|
|
|
error = T1_Get_Private_Dict( parser, psaux );
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
error = parse_dict( face, &loader,
|
|
|
|
parser->private_dict, parser->private_len );
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2006-06-26 11:40:00 +02:00
|
|
|
|
2006-02-27 19:25:22 +01:00
|
|
|
/* ensure even-ness of `num_blue_values' */
|
2006-02-27 14:14:42 +01:00
|
|
|
priv->num_blue_values &= ~1;
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
|
|
|
|
|
* freetype2/include/freetype/internal/psaux.h: New macros
IS_PS_NEWLINE, IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT,
IS_PS_XDIGIT, and IS_PS_BASE85 (from freetype2/src/psaux/psconv.h).
(T1_FieldLocation): Add T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE, and T1_FIELD_LOCATION_BLEND.
(T1_DecoderRec): New fields `buildchar' and `face'.
(IS_PS_TOKEN): New macro.
* freetype2/include/freetype/internal/t1types.h (T1_FaceRec): New
fields `ndv_idx', `cdv_idx', and `len_buildchar'.
* freetype2/include/freetype/t1tables.h (PS_BlendRec): New fields
`default_design_vector' and `num_default_design_vector'.
* freetype2/src/psaux/psconv.h: Move macros IS_PS_NEWLINE,
IS_PS_SPACE, IS_PS_SPECIAL, IS_PS_DELIM, IS_PS_DIGIT, IS_PS_XDIGIT,
and IS_PS_BASE85 to freetype2/include/freetype/internal/psaux.h.
* freetype2/src/psaux/psobjs.c (ps_parser_to_token_array): Allow
`token' argument to be NULL if we want only to count the number of
tokens.
(ps_tocoordarray): Allow `coords' argument to be NULL if we just
want to skip the array.
(ps_tofixedarray): Allow `values' argument to be NULL if we just
want to skip the array.
* freetype2/src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add
support for (partially commented out) othersubrs 19-25, 27, and 28.
(t1_decoder_init): Initialize new fields `face' and `buildchar'.
(t1_decoder_done): Release new field `buildchar'.
* freetype2/src/type1/t1load.c (parse_buildchar, parse_private): New
functions.
(t1_keywords): Register them.
(t1_allocate_blend): Updated.
(t1_load_keyword): Handle field types T1_FIELD_LOCATION_LOADER,
T1_FIELD_LOCATION_FACE and T1_FIELD_LOCATION_BLEND.
(parse_dict): Remove `keyword_flags' argument.
Use new macro IS_PS_TOKEN.
Changed function so that later PostScript definitions override
earlier ones.
(t1_init_loader): Initialize new field `keywords_encountered'.
(T1_Open_Face): Initialize new fields `ndv_idx', `cdv_idx', and
`len_buildchar'.
Remove `keywords_flags'.
* freetype2/src/type1/t1load.h (T1_LoaderRect): New field
`keywords_encountered'.
(T1_PRIVATE, T1_FONTDIR_AFTER_PRIVATE): New macros.
* freetype2/src/type1/t1tokens.h [!T1_CONFIG_OPTION_NO_MM_SUPPORT]:
New entries for parsing /NDV, /CDV, and /DesignVector.
2006-07-14 20:28:08 +02:00
|
|
|
if ( face->blend &&
|
|
|
|
face->blend->num_default_design_vector != 0 &&
|
|
|
|
face->blend->num_default_design_vector != face->blend->num_axis )
|
|
|
|
{
|
|
|
|
/* we don't use it currently so just warn, reset, and ignore */
|
|
|
|
FT_ERROR(( "T1_Open_Face(): /DesignVector contains %u entries "
|
|
|
|
"while there are %u axes.\n",
|
|
|
|
face->blend->num_default_design_vector,
|
|
|
|
face->blend->num_axis ));
|
|
|
|
|
|
|
|
face->blend->num_default_design_vector = 0;
|
|
|
|
}
|
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
/* the following can happen for MM instances; we then treat the */
|
|
|
|
/* font as a normal PS font */
|
|
|
|
if ( face->blend &&
|
|
|
|
( !face->blend->num_designs || !face->blend->num_axis ) )
|
|
|
|
T1_Done_Blend( face );
|
|
|
|
|
|
|
|
/* another safety check */
|
|
|
|
if ( face->blend )
|
|
|
|
{
|
|
|
|
FT_UInt i;
|
|
|
|
|
|
|
|
|
|
|
|
for ( i = 0; i < face->blend->num_axis; i++ )
|
|
|
|
if ( !face->blend->design_map[i].num_points )
|
|
|
|
{
|
|
|
|
T1_Done_Blend( face );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-19 11:54:56 +02:00
|
|
|
if ( face->blend )
|
|
|
|
{
|
|
|
|
if ( face->len_buildchar > 0 )
|
|
|
|
{
|
|
|
|
FT_Memory memory = face->root.memory;
|
|
|
|
|
|
|
|
|
|
|
|
if ( FT_NEW_ARRAY( face->buildchar, face->len_buildchar ) )
|
|
|
|
{
|
|
|
|
FT_ERROR(( "T1_Open_Face: cannot allocate BuildCharArray\n" ));
|
|
|
|
face->len_buildchar = 0;
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-02-12 09:33:20 +01:00
|
|
|
#endif /* T1_CONFIG_OPTION_NO_MM_SUPPORT */
|
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* now, propagate the subrs, charstrings, and glyphnames tables */
|
|
|
|
/* to the Type1 data */
|
2000-01-27 15:02:04 +01:00
|
|
|
type1->num_glyphs = loader.num_glyphs;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2001-01-24 23:41:20 +01:00
|
|
|
if ( loader.subrs.init )
|
2000-02-15 13:55:57 +01:00
|
|
|
{
|
2001-01-24 23:41:20 +01:00
|
|
|
loader.subrs.init = 0;
|
|
|
|
type1->num_subrs = loader.num_subrs;
|
|
|
|
type1->subrs_block = loader.subrs.block;
|
|
|
|
type1->subrs = loader.subrs.elements;
|
|
|
|
type1->subrs_len = loader.subrs.lengths;
|
2000-02-15 13:55:57 +01:00
|
|
|
}
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2002-08-01 18:16:16 +02:00
|
|
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
2002-08-06 23:47:40 +02:00
|
|
|
if ( !face->root.internal->incremental_interface )
|
2002-08-01 18:16:16 +02:00
|
|
|
#endif
|
|
|
|
if ( !loader.charstrings.init )
|
|
|
|
{
|
2004-02-03 22:34:29 +01:00
|
|
|
FT_ERROR(( "T1_Open_Face: no `/CharStrings' array in face!\n" ));
|
2002-08-01 18:16:16 +02:00
|
|
|
error = T1_Err_Invalid_File_Format;
|
|
|
|
}
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
loader.charstrings.init = 0;
|
|
|
|
type1->charstrings_block = loader.charstrings.block;
|
|
|
|
type1->charstrings = loader.charstrings.elements;
|
|
|
|
type1->charstrings_len = loader.charstrings.lengths;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
/* we copy the glyph names `block' and `elements' fields; */
|
|
|
|
/* the `lengths' field must be released later */
|
2000-01-27 15:02:04 +01:00
|
|
|
type1->glyph_names_block = loader.glyph_names.block;
|
2000-06-16 21:34:52 +02:00
|
|
|
type1->glyph_names = (FT_String**)loader.glyph_names.elements;
|
2000-01-27 15:02:04 +01:00
|
|
|
loader.glyph_names.block = 0;
|
|
|
|
loader.glyph_names.elements = 0;
|
|
|
|
|
2002-05-12 21:59:17 +02:00
|
|
|
/* we must now build type1.encoding when we have a custom array */
|
2002-02-28 19:59:37 +01:00
|
|
|
if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_Int charcode, idx, min_char, max_char;
|
2000-06-16 21:34:52 +02:00
|
|
|
FT_Byte* char_name;
|
|
|
|
FT_Byte* glyph_name;
|
2000-01-27 15:02:04 +01:00
|
|
|
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
/* OK, we do the following: for each element in the encoding */
|
|
|
|
/* table, look up the index of the glyph having the same name */
|
2000-01-27 15:02:04 +01:00
|
|
|
/* the index is then stored in type1.encoding.char_index, and */
|
|
|
|
/* a the name to type1.encoding.char_name */
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
min_char = +32000;
|
|
|
|
max_char = -32000;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
charcode = 0;
|
2000-10-15 10:53:27 +02:00
|
|
|
for ( ; charcode < loader.encoding_table.max_elems; charcode++ )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
|
|
|
type1->encoding.char_index[charcode] = 0;
|
2000-08-01 00:51:00 +02:00
|
|
|
type1->encoding.char_name [charcode] = (char *)".notdef";
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
char_name = loader.encoding_table.elements[charcode];
|
2000-07-09 02:48:37 +02:00
|
|
|
if ( char_name )
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
for ( idx = 0; idx < type1->num_glyphs; idx++ )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
glyph_name = (FT_Byte*)type1->glyph_names[idx];
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
if ( ft_strcmp( (const char*)char_name,
|
2002-04-14 02:54:32 +02:00
|
|
|
(const char*)glyph_name ) == 0 )
|
2000-01-27 15:02:04 +01:00
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
type1->encoding.char_index[charcode] = (FT_UShort)idx;
|
2000-02-02 13:20:53 +01:00
|
|
|
type1->encoding.char_name [charcode] = (char*)glyph_name;
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-10-19 07:12:00 +02:00
|
|
|
/* Change min/max encoded char only if glyph name is */
|
|
|
|
/* not /.notdef */
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
if ( ft_strcmp( (const char*)".notdef",
|
2002-04-14 02:54:32 +02:00
|
|
|
(const char*)glyph_name ) != 0 )
|
2000-10-19 07:12:00 +02:00
|
|
|
{
|
2003-10-07 07:49:41 +02:00
|
|
|
if ( charcode < min_char )
|
|
|
|
min_char = charcode;
|
|
|
|
if ( charcode > max_char )
|
|
|
|
max_char = charcode;
|
2000-10-19 07:12:00 +02:00
|
|
|
}
|
2000-01-27 15:02:04 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2003-10-07 07:49:41 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Yes, this happens: Certain PDF-embedded fonts have only a
|
|
|
|
* `.notdef' glyph defined!
|
2003-04-23 17:50:27 +02:00
|
|
|
*/
|
2003-10-07 07:49:41 +02:00
|
|
|
|
2003-04-03 17:52:59 +02:00
|
|
|
if ( min_char > max_char )
|
|
|
|
{
|
|
|
|
min_char = 0;
|
|
|
|
max_char = loader.encoding_table.max_elems;
|
|
|
|
}
|
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
type1->encoding.code_first = min_char;
|
|
|
|
type1->encoding.code_last = max_char;
|
|
|
|
type1->encoding.num_chars = loader.num_chars;
|
2002-01-28 14:34:52 +01:00
|
|
|
}
|
2000-05-17 01:44:38 +02:00
|
|
|
|
2000-01-27 15:02:04 +01:00
|
|
|
Exit:
|
|
|
|
t1_done_loader( &loader );
|
|
|
|
return error;
|
2000-05-17 01:44:38 +02:00
|
|
|
}
|
2000-07-09 02:48:37 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* END */
|