8eab511017
This is a follow-up to commit 26a7f047, [cff] Make blend operator work with floats in private dicts. which addressed the 'party baseline' bug. However, the reporting user indicated that the default location and some other points in design space rendered OK, but other points in design space still had problems. The most obvious issue being that the x-heights of lower-case letters did not align; see https://github.com/adobe-fonts/source-serif/issues/121#issuecomment-1773794136 After some analysis we determined that this was due to an interaction between `BlueValue` rounding and the zone-based algorithm. In short, for a point to be considered in a zone it must fall within the bounds of the zone. (There is a slop factor in some cases, but only a very small one.) In the Adobe-contributed side of the code, point values are not integer-rounded, instead they're kept as (some form of) fixed. Rounding just the `BlueValues` means that points that need to be considered within a zone will fall outside of it at some points in design space. The majority of this patch changes the storage and parsing of `BlueValues` to keep them as `FT_Fixed`. No significant code changes were needed because the values are converted to `Fixed` anyway when stored in `CF_BlueRec`. No attempt was made to address problems in the older pshinter code beyond converting the values from `FT_Fixed` to `FT_Short` when copying the private dictionary. (However, as the point values are also rounded in that code, the problem is much less likely to occur, although inconsistency between rounding and truncation could cause an analogous problem.) * include/freetype/internal/cfftypes.h (CFF_PrivateRec): Use `FT_Fixed` for `blue_values`, `other_blues`, `family_blues`, and `family_other_blues`. * src/cff/cffload.c (cff_blend_doBlend): Updated. * src/cff/cffobjs.c (CFF_fixedToInt): New macro. (cff_make_private_dict): Use it. * src/cff/cffparse.h (cff_kind_delta_fixed): New enum value. * src/cff/cffparse.c (do_fixed): Updated. (CFF_FIELD_DELTA, CFF_FIELD_DELTA_FIXED, CFF_DELTA_KIND): New set of macros, replacing `CFF_FIELD_DELTA`. (cff_parser_run): Updated to handle fixed-float deltas. * src/cff/cfftoken.h: Updated to use `CFF_FIELD_DELTA_FIXED` for blue values. * src/psaux/psblues.c (cf2_blueToFixed): Removed, no longer needed. (cf2_blues_init): Updated. * src/pxaux/psft.c, src/pxaux/psft.h (cf2_getBlueValues, cf2_getOtherBlues, cf2_getFamilyBlues, cf2_getFamilyOtherBlues): Updated signatures. * src/psaux/psobjs.c (t1_make_subfont): Updated.
168 lines
5.3 KiB
C
168 lines
5.3 KiB
C
/****************************************************************************
|
|
*
|
|
* psft.h
|
|
*
|
|
* FreeType Glue Component to Adobe's Interpreter (specification).
|
|
*
|
|
* Copyright 2013 Adobe Systems Incorporated.
|
|
*
|
|
* This software, and all works of authorship, whether in source or
|
|
* object code form as indicated by the copyright notice(s) included
|
|
* herein (collectively, the "Work") is made available, and may only be
|
|
* used, modified, and distributed under the FreeType Project License,
|
|
* LICENSE.TXT. Additionally, subject to the terms and conditions of the
|
|
* FreeType Project License, each contributor to the Work hereby grants
|
|
* to any individual or legal entity exercising permissions granted by
|
|
* the FreeType Project License and this section (hereafter, "You" or
|
|
* "Your") a perpetual, worldwide, non-exclusive, no-charge,
|
|
* royalty-free, irrevocable (except as stated in this section) patent
|
|
* license to make, have made, use, offer to sell, sell, import, and
|
|
* otherwise transfer the Work, where such license applies only to those
|
|
* patent claims licensable by such contributor that are necessarily
|
|
* infringed by their contribution(s) alone or by combination of their
|
|
* contribution(s) with the Work to which such contribution(s) was
|
|
* submitted. If You institute patent litigation against any entity
|
|
* (including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
* the Work or a contribution incorporated within the Work constitutes
|
|
* direct or contributory patent infringement, then any patent licenses
|
|
* granted to You under this License for that Work shall terminate as of
|
|
* the date such litigation is filed.
|
|
*
|
|
* By using, modifying, or distributing the Work you indicate that you
|
|
* have read and understood the terms and conditions of the
|
|
* FreeType Project License as well as those provided in this section,
|
|
* and you accept them fully.
|
|
*
|
|
*/
|
|
|
|
|
|
#ifndef PSFT_H_
|
|
#define PSFT_H_
|
|
|
|
|
|
#include <freetype/internal/compiler-macros.h>
|
|
#include "pstypes.h"
|
|
|
|
/* TODO: disable asserts for now */
|
|
#define CF2_NDEBUG
|
|
|
|
|
|
#include <freetype/ftsystem.h>
|
|
|
|
#include "psglue.h"
|
|
#include <freetype/internal/psaux.h> /* for PS_Decoder */
|
|
|
|
|
|
FT_BEGIN_HEADER
|
|
|
|
|
|
FT_LOCAL( FT_Error )
|
|
cf2_decoder_parse_charstrings( PS_Decoder* decoder,
|
|
FT_Byte* charstring_base,
|
|
FT_ULong charstring_len );
|
|
|
|
FT_LOCAL( CFF_SubFont )
|
|
cf2_getSubfont( PS_Decoder* decoder );
|
|
|
|
FT_LOCAL( CFF_VStore )
|
|
cf2_getVStore( PS_Decoder* decoder );
|
|
|
|
FT_LOCAL( FT_UInt )
|
|
cf2_getMaxstack( PS_Decoder* decoder );
|
|
|
|
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
|
FT_LOCAL( FT_Error )
|
|
cf2_getNormalizedVector( PS_Decoder* decoder,
|
|
CF2_UInt *len,
|
|
FT_Fixed* *vec );
|
|
#endif
|
|
|
|
FT_LOCAL( CF2_Fixed )
|
|
cf2_getPpemY( PS_Decoder* decoder );
|
|
FT_LOCAL( CF2_Fixed )
|
|
cf2_getStdVW( PS_Decoder* decoder );
|
|
FT_LOCAL( CF2_Fixed )
|
|
cf2_getStdHW( PS_Decoder* decoder );
|
|
|
|
FT_LOCAL( void )
|
|
cf2_getBlueMetrics( PS_Decoder* decoder,
|
|
CF2_Fixed* blueScale,
|
|
CF2_Fixed* blueShift,
|
|
CF2_Fixed* blueFuzz );
|
|
FT_LOCAL( void )
|
|
cf2_getBlueValues( PS_Decoder* decoder,
|
|
size_t* count,
|
|
FT_Fixed* *data );
|
|
FT_LOCAL( void )
|
|
cf2_getOtherBlues( PS_Decoder* decoder,
|
|
size_t* count,
|
|
FT_Fixed* *data );
|
|
FT_LOCAL( void )
|
|
cf2_getFamilyBlues( PS_Decoder* decoder,
|
|
size_t* count,
|
|
FT_Fixed* *data );
|
|
FT_LOCAL( void )
|
|
cf2_getFamilyOtherBlues( PS_Decoder* decoder,
|
|
size_t* count,
|
|
FT_Fixed* *data );
|
|
|
|
FT_LOCAL( CF2_Int )
|
|
cf2_getLanguageGroup( PS_Decoder* decoder );
|
|
|
|
FT_LOCAL( CF2_Int )
|
|
cf2_initGlobalRegionBuffer( PS_Decoder* decoder,
|
|
CF2_Int subrNum,
|
|
CF2_Buffer buf );
|
|
FT_LOCAL( FT_Error )
|
|
cf2_getSeacComponent( PS_Decoder* decoder,
|
|
CF2_Int code,
|
|
CF2_Buffer buf );
|
|
FT_LOCAL( void )
|
|
cf2_freeSeacComponent( PS_Decoder* decoder,
|
|
CF2_Buffer buf );
|
|
FT_LOCAL( CF2_Int )
|
|
cf2_initLocalRegionBuffer( PS_Decoder* decoder,
|
|
CF2_Int subrNum,
|
|
CF2_Buffer buf );
|
|
|
|
FT_LOCAL( CF2_Fixed )
|
|
cf2_getDefaultWidthX( PS_Decoder* decoder );
|
|
FT_LOCAL( CF2_Fixed )
|
|
cf2_getNominalWidthX( PS_Decoder* decoder );
|
|
|
|
|
|
FT_LOCAL( FT_Error )
|
|
cf2_getT1SeacComponent( PS_Decoder* decoder,
|
|
FT_UInt glyph_index,
|
|
CF2_Buffer buf );
|
|
FT_LOCAL( void )
|
|
cf2_freeT1SeacComponent( PS_Decoder* decoder,
|
|
CF2_Buffer buf );
|
|
|
|
/*
|
|
* FreeType client outline
|
|
*
|
|
* process output from the charstring interpreter
|
|
*/
|
|
typedef struct CF2_OutlineRec_
|
|
{
|
|
CF2_OutlineCallbacksRec root; /* base class must be first */
|
|
PS_Decoder* decoder;
|
|
|
|
} CF2_OutlineRec, *CF2_Outline;
|
|
|
|
|
|
FT_LOCAL( void )
|
|
cf2_outline_reset( CF2_Outline outline );
|
|
FT_LOCAL( void )
|
|
cf2_outline_close( CF2_Outline outline );
|
|
|
|
|
|
FT_END_HEADER
|
|
|
|
|
|
#endif /* PSFT_H_ */
|
|
|
|
|
|
/* END */
|