2002-04-20 07:38:33 +02:00
|
|
|
/***************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* pfrobjs.c */
|
|
|
|
/* */
|
|
|
|
/* FreeType PFR object methods (body). */
|
|
|
|
/* */
|
2003-04-23 16:14:06 +02:00
|
|
|
/* Copyright 2002, 2003 by */
|
2002-04-20 07:38:33 +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. */
|
|
|
|
/* */
|
|
|
|
/***************************************************************************/
|
|
|
|
|
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
#include "pfrobjs.h"
|
|
|
|
#include "pfrload.h"
|
|
|
|
#include "pfrgload.h"
|
|
|
|
#include "pfrcmap.h"
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
#include "pfrsbit.h"
|
2002-04-19 17:13:47 +02:00
|
|
|
#include FT_OUTLINE_H
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
|
|
|
|
2002-04-28 12:25:55 +02:00
|
|
|
#include "pfrerror.h"
|
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
#undef FT_COMPONENT
|
|
|
|
#define FT_COMPONENT trace_pfr
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** FACE OBJECT METHODS *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
FT_LOCAL_DEF( void )
|
2002-04-20 07:38:33 +02:00
|
|
|
pfr_face_done( PFR_Face face )
|
2002-04-19 17:13:47 +02:00
|
|
|
{
|
2003-04-23 16:14:06 +02:00
|
|
|
FT_Memory memory = face->root.driver->root.memory;
|
|
|
|
|
2003-03-13 22:07:51 +01:00
|
|
|
|
2003-02-25 20:20:12 +01:00
|
|
|
/* we don't want dangling pointers */
|
|
|
|
face->root.family_name = NULL;
|
|
|
|
face->root.style_name = NULL;
|
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
/* finalize the physical font record */
|
2002-04-20 07:38:33 +02:00
|
|
|
pfr_phy_font_done( &face->phy_font, FT_FACE_MEMORY( face ) );
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
/* no need to finalize the logical font or the header */
|
2003-03-13 22:07:51 +01:00
|
|
|
FT_FREE( face->root.available_sizes );
|
2002-04-19 17:13:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( FT_Error )
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
pfr_face_init( FT_Stream stream,
|
|
|
|
PFR_Face face,
|
|
|
|
FT_Int face_index,
|
|
|
|
FT_Int num_params,
|
|
|
|
FT_Parameter* params )
|
2002-04-19 17:13:47 +02:00
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
FT_UNUSED( num_params );
|
|
|
|
FT_UNUSED( params );
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
/* load the header and check it */
|
|
|
|
error = pfr_header_load( &face->header, stream );
|
2002-04-20 07:38:33 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
if ( !pfr_header_check( &face->header ) )
|
|
|
|
{
|
2002-04-20 07:38:33 +02:00
|
|
|
FT_TRACE4(( "pfr_face_init: not a valid PFR font\n" ));
|
2002-04-28 12:25:55 +02:00
|
|
|
error = PFR_Err_Unknown_File_Format;
|
2002-04-19 17:13:47 +02:00
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check face index */
|
|
|
|
{
|
|
|
|
FT_UInt num_faces;
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
error = pfr_log_font_count( stream,
|
|
|
|
face->header.log_dir_offset,
|
|
|
|
&num_faces );
|
2002-04-20 07:38:33 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
face->root.num_faces = num_faces;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( face_index < 0 )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
if ( face_index >= face->root.num_faces )
|
|
|
|
{
|
2002-04-20 07:38:33 +02:00
|
|
|
FT_ERROR(( "pfr_face_init: invalid face index\n" ));
|
2002-04-28 12:25:55 +02:00
|
|
|
error = PFR_Err_Invalid_Argument;
|
2002-04-19 17:13:47 +02:00
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* load the face */
|
|
|
|
error = pfr_log_font_load(
|
|
|
|
&face->log_font, stream, face_index,
|
|
|
|
face->header.log_dir_offset,
|
|
|
|
FT_BOOL( face->header.phy_font_max_size_high != 0 ) );
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
/* now load the physical font descriptor */
|
|
|
|
error = pfr_phy_font_load( &face->phy_font, stream,
|
|
|
|
face->log_font.phys_offset,
|
|
|
|
face->log_font.phys_size );
|
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
/* now, set-up all root face fields */
|
|
|
|
{
|
2002-04-20 07:38:33 +02:00
|
|
|
FT_Face root = FT_FACE( face );
|
2002-04-19 17:13:47 +02:00
|
|
|
PFR_PhyFont phy_font = &face->phy_font;
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
root->face_index = face_index;
|
|
|
|
root->num_glyphs = phy_font->num_chars;
|
|
|
|
root->face_flags = FT_FACE_FLAG_SCALABLE;
|
|
|
|
|
|
|
|
if ( (phy_font->flags & PFR_PHY_PROPORTIONAL) == 0 )
|
|
|
|
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
|
|
|
|
|
|
|
|
if ( phy_font->flags & PFR_PHY_VERTICAL )
|
|
|
|
root->face_flags |= FT_FACE_FLAG_VERTICAL;
|
2002-06-18 22:30:13 +02:00
|
|
|
else
|
|
|
|
root->face_flags |= FT_FACE_FLAG_HORIZONTAL;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
if ( phy_font->num_strikes > 0 )
|
|
|
|
root->face_flags |= FT_FACE_FLAG_FIXED_SIZES;
|
|
|
|
|
|
|
|
if ( phy_font->num_kern_pairs > 0 )
|
|
|
|
root->face_flags |= FT_FACE_FLAG_KERNING;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
2003-04-23 16:14:06 +02:00
|
|
|
/* If no family name was found in the "undocumented" auxiliary
|
|
|
|
* data, use the font ID instead. This sucks but is better than
|
|
|
|
* nothing.
|
|
|
|
*/
|
2003-02-25 20:20:12 +01:00
|
|
|
root->family_name = phy_font->family_name;
|
|
|
|
if ( root->family_name == NULL )
|
|
|
|
root->family_name = phy_font->font_id;
|
|
|
|
|
2003-04-23 16:14:06 +02:00
|
|
|
/* note that the style name can be NULL in certain PFR fonts,
|
|
|
|
* probably meaning "Regular"
|
|
|
|
*/
|
|
|
|
root->style_name = phy_font->style_name;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
root->num_fixed_sizes = 0;
|
|
|
|
root->available_sizes = 0;
|
|
|
|
|
|
|
|
root->bbox = phy_font->bbox;
|
2002-04-20 07:38:33 +02:00
|
|
|
root->units_per_EM = (FT_UShort)phy_font->outline_resolution;
|
|
|
|
root->ascender = (FT_Short) phy_font->bbox.yMax;
|
|
|
|
root->descender = (FT_Short) phy_font->bbox.yMin;
|
|
|
|
root->height = (FT_Short)
|
|
|
|
( ( ( root->ascender - root->descender ) * 12 )
|
|
|
|
/ 10 );
|
2002-04-19 17:13:47 +02:00
|
|
|
|
2003-02-25 20:20:12 +01:00
|
|
|
if ( phy_font->num_strikes > 0 )
|
|
|
|
{
|
|
|
|
FT_UInt n, count = phy_font->num_strikes;
|
|
|
|
FT_Bitmap_Size* size;
|
|
|
|
PFR_Strike strike;
|
|
|
|
FT_Memory memory = root->stream->memory;
|
|
|
|
|
|
|
|
|
|
|
|
if ( FT_NEW_ARRAY( root->available_sizes, count ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
size = root->available_sizes;
|
|
|
|
strike = phy_font->strikes;
|
|
|
|
for ( n = 0; n < count; n++, size++, strike++ )
|
|
|
|
{
|
2003-04-23 16:14:06 +02:00
|
|
|
size->height = (FT_UShort)strike->y_ppm;
|
|
|
|
size->width = (FT_UShort)strike->x_ppm;
|
2003-02-25 20:20:12 +01:00
|
|
|
}
|
|
|
|
root->num_fixed_sizes = count;
|
|
|
|
}
|
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
/* now compute maximum advance width */
|
2002-04-20 07:38:33 +02:00
|
|
|
if ( ( phy_font->flags & PFR_PHY_PROPORTIONAL ) == 0 )
|
|
|
|
root->max_advance_width = (FT_Short)phy_font->standard_advance;
|
2002-04-19 17:13:47 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
FT_Int max = 0;
|
|
|
|
FT_UInt count = phy_font->num_chars;
|
|
|
|
PFR_Char gchar = phy_font->chars;
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
for ( ; count > 0; count--, gchar++ )
|
|
|
|
{
|
|
|
|
if ( max < gchar->advance )
|
|
|
|
max = gchar->advance;
|
|
|
|
}
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
root->max_advance_width = (FT_Short)max;
|
2002-04-19 17:13:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
root->max_advance_height = root->height;
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
root->underline_position = (FT_Short)( - root->units_per_EM / 10 );
|
|
|
|
root->underline_thickness = (FT_Short)( root->units_per_EM / 30 );
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
/* create charmap */
|
|
|
|
{
|
2002-04-20 07:38:33 +02:00
|
|
|
FT_CharMapRec charmap;
|
2002-07-18 00:51:06 +02:00
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
charmap.face = root;
|
|
|
|
charmap.platform_id = 3;
|
|
|
|
charmap.encoding_id = 1;
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
charmap.encoding = FT_ENCODING_UNICODE;
|
2002-07-18 00:51:06 +02:00
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
FT_CMap_New( &pfr_cmap_class_rec, NULL, &charmap, NULL );
|
2002-06-19 17:57:55 +02:00
|
|
|
|
2002-07-18 00:51:06 +02:00
|
|
|
#if 0
|
2002-06-19 17:57:55 +02:00
|
|
|
/* Select default charmap */
|
|
|
|
if (root->num_charmaps)
|
|
|
|
root->charmap = root->charmaps[0];
|
2002-07-18 00:51:06 +02:00
|
|
|
#endif
|
2002-04-19 17:13:47 +02:00
|
|
|
}
|
2002-06-21 09:33:23 +02:00
|
|
|
|
2002-06-22 15:35:41 +02:00
|
|
|
/* check whether we've loaded any kerning pairs */
|
|
|
|
if ( phy_font->num_kern_pairs )
|
2002-06-21 09:33:23 +02:00
|
|
|
root->face_flags |= FT_FACE_FLAG_KERNING;
|
2002-04-19 17:13:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** SLOT OBJECT METHOD *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
FT_LOCAL_DEF( FT_Error )
|
|
|
|
pfr_slot_init( PFR_Slot slot )
|
|
|
|
{
|
2002-04-20 07:38:33 +02:00
|
|
|
FT_GlyphLoader loader = slot->root.internal->loader;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
pfr_glyph_init( &slot->glyph, loader );
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( void )
|
|
|
|
pfr_slot_done( PFR_Slot slot )
|
|
|
|
{
|
|
|
|
pfr_glyph_done( &slot->glyph );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_LOCAL_DEF( FT_Error )
|
|
|
|
pfr_slot_load( PFR_Slot slot,
|
|
|
|
PFR_Size size,
|
|
|
|
FT_UInt gindex,
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
FT_Int32 load_flags )
|
2002-04-19 17:13:47 +02:00
|
|
|
{
|
|
|
|
FT_Error error;
|
2002-04-20 07:38:33 +02:00
|
|
|
PFR_Face face = (PFR_Face)slot->root.face;
|
2002-06-17 10:01:32 +02:00
|
|
|
PFR_Char gchar;
|
2002-04-19 17:13:47 +02:00
|
|
|
FT_Outline* outline = &slot->root.outline;
|
|
|
|
FT_ULong gps_offset;
|
|
|
|
|
2003-04-23 16:14:06 +02:00
|
|
|
|
|
|
|
if ( gindex > 0 )
|
2002-06-17 10:01:32 +02:00
|
|
|
gindex--;
|
2002-04-20 07:38:33 +02:00
|
|
|
|
|
|
|
/* check that the glyph index is correct */
|
2002-04-19 17:13:47 +02:00
|
|
|
FT_ASSERT( gindex < face->phy_font.num_chars );
|
|
|
|
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
/* try to load an embedded bitmap */
|
2002-10-07 12:12:43 +02:00
|
|
|
if ( ( load_flags & ( FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP ) ) == 0 )
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
{
|
|
|
|
error = pfr_slot_load_bitmap( slot, size, gindex );
|
|
|
|
if ( error == 0 )
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
|
2003-02-25 20:20:12 +01:00
|
|
|
if ( load_flags & FT_LOAD_SBITS_ONLY )
|
|
|
|
{
|
|
|
|
error = FT_Err_Invalid_Argument;
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
|
2002-06-17 10:01:32 +02:00
|
|
|
gchar = face->phy_font.chars + gindex;
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
slot->root.format = FT_GLYPH_FORMAT_OUTLINE;
|
2002-04-19 17:13:47 +02:00
|
|
|
outline->n_points = 0;
|
|
|
|
outline->n_contours = 0;
|
|
|
|
gps_offset = face->header.gps_section_offset;
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
/* load the glyph outline (FT_LOAD_NO_RECURSE isn't supported) */
|
2002-04-19 17:13:47 +02:00
|
|
|
error = pfr_glyph_load( &slot->glyph, face->root.stream,
|
|
|
|
gps_offset, gchar->gps_offset, gchar->gps_size );
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
if ( !error )
|
2002-04-19 17:13:47 +02:00
|
|
|
{
|
|
|
|
FT_BBox cbox;
|
|
|
|
FT_Glyph_Metrics* metrics = &slot->root.metrics;
|
|
|
|
FT_Pos advance;
|
|
|
|
FT_Int em_metrics, em_outline;
|
|
|
|
FT_Bool scaling;
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
|
|
|
|
scaling = FT_BOOL( ( load_flags & FT_LOAD_NO_SCALE ) == 0 );
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
/* copy outline data */
|
|
|
|
*outline = slot->glyph.loader->base.outline;
|
|
|
|
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
outline->flags &= ~FT_OUTLINE_OWNER;
|
|
|
|
outline->flags |= FT_OUTLINE_REVERSE_FILL;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
if ( size && size->root.metrics.y_ppem < 24 )
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
outline->flags |= FT_OUTLINE_HIGH_PRECISION;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
/* compute the advance vector */
|
|
|
|
metrics->horiAdvance = 0;
|
|
|
|
metrics->vertAdvance = 0;
|
|
|
|
|
|
|
|
advance = gchar->advance;
|
|
|
|
em_metrics = face->phy_font.metrics_resolution;
|
|
|
|
em_outline = face->phy_font.outline_resolution;
|
|
|
|
|
|
|
|
if ( em_metrics != em_outline )
|
|
|
|
advance = FT_MulDiv( advance, em_outline, em_metrics );
|
|
|
|
|
|
|
|
if ( face->phy_font.flags & PFR_PHY_VERTICAL )
|
2002-07-05 17:54:26 +02:00
|
|
|
metrics->vertAdvance = advance;
|
2002-04-19 17:13:47 +02:00
|
|
|
else
|
2002-07-05 17:54:26 +02:00
|
|
|
metrics->horiAdvance = advance;
|
2002-04-19 17:13:47 +02:00
|
|
|
|
|
|
|
slot->root.linearHoriAdvance = metrics->horiAdvance;
|
|
|
|
slot->root.linearVertAdvance = metrics->vertAdvance;
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
/* make-up vertical metrics(?) */
|
2002-04-19 17:13:47 +02:00
|
|
|
metrics->vertBearingX = 0;
|
|
|
|
metrics->vertBearingY = 0;
|
|
|
|
|
|
|
|
/* scale when needed */
|
|
|
|
if ( scaling )
|
|
|
|
{
|
|
|
|
FT_Int n;
|
|
|
|
FT_Fixed x_scale = size->root.metrics.x_scale;
|
|
|
|
FT_Fixed y_scale = size->root.metrics.y_scale;
|
|
|
|
FT_Vector* vec = outline->points;
|
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
|
2002-04-19 17:13:47 +02:00
|
|
|
/* scale outline points */
|
|
|
|
for ( n = 0; n < outline->n_points; n++, vec++ )
|
|
|
|
{
|
|
|
|
vec->x = FT_MulFix( vec->x, x_scale );
|
|
|
|
vec->y = FT_MulFix( vec->y, y_scale );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* scale the advance */
|
|
|
|
metrics->horiAdvance = FT_MulFix( metrics->horiAdvance, x_scale );
|
|
|
|
metrics->vertAdvance = FT_MulFix( metrics->vertAdvance, y_scale );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* compute the rest of the metrics */
|
|
|
|
FT_Outline_Get_CBox( outline, &cbox );
|
|
|
|
|
|
|
|
metrics->width = cbox.xMax - cbox.xMin;
|
|
|
|
metrics->height = cbox.yMax - cbox.yMin;
|
|
|
|
metrics->horiBearingX = cbox.xMin;
|
|
|
|
metrics->horiBearingY = cbox.yMax - metrics->height;
|
|
|
|
}
|
|
|
|
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
Exit:
|
2002-04-19 17:13:47 +02:00
|
|
|
return error;
|
|
|
|
}
|
2002-04-20 07:38:33 +02:00
|
|
|
|
|
|
|
|
2002-06-21 09:33:23 +02:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** KERNING METHOD *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
FT_LOCAL_DEF( FT_Error )
|
|
|
|
pfr_face_get_kerning( PFR_Face face,
|
|
|
|
FT_UInt glyph1,
|
|
|
|
FT_UInt glyph2,
|
|
|
|
FT_Vector* kerning )
|
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
PFR_PhyFont phy_font = &face->phy_font;
|
|
|
|
PFR_KernItem item = phy_font->kern_items;
|
|
|
|
FT_UInt32 idx = PFR_KERN_INDEX( glyph1, glyph2 );
|
|
|
|
|
2002-10-07 12:12:43 +02:00
|
|
|
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
kerning->x = 0;
|
|
|
|
kerning->y = 0;
|
|
|
|
|
|
|
|
/* find the kerning item containing our pair */
|
|
|
|
while ( item )
|
|
|
|
{
|
|
|
|
if ( item->pair1 <= idx && idx <= item->pair2 )
|
|
|
|
goto Found_Item;
|
|
|
|
|
|
|
|
item = item->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* not found */
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
Found_Item:
|
|
|
|
{
|
|
|
|
/* perform simply binary search within the item */
|
|
|
|
FT_UInt min, mid, max;
|
|
|
|
FT_Stream stream = face->root.stream;
|
|
|
|
FT_Byte* p;
|
|
|
|
|
2002-10-07 12:12:43 +02:00
|
|
|
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
if ( FT_STREAM_SEEK( item->offset ) ||
|
|
|
|
FT_FRAME_ENTER( item->pair_count * item->pair_size ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
min = 0;
|
|
|
|
max = item->pair_count;
|
|
|
|
while ( min < max )
|
|
|
|
{
|
|
|
|
FT_UInt char1, char2, charcode;
|
|
|
|
|
2002-10-07 12:12:43 +02:00
|
|
|
|
|
|
|
mid = ( min + max ) >> 1;
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
p = stream->cursor + mid*item->pair_size;
|
|
|
|
|
|
|
|
if ( item->flags & PFR_KERN_2BYTE_CHAR )
|
|
|
|
{
|
2002-10-07 12:12:43 +02:00
|
|
|
char1 = FT_NEXT_USHORT( p );
|
|
|
|
char2 = FT_NEXT_USHORT( p );
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-10-07 12:12:43 +02:00
|
|
|
char1 = FT_NEXT_USHORT( p );
|
|
|
|
char2 = FT_NEXT_USHORT( p );
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
}
|
2002-10-07 12:12:43 +02:00
|
|
|
charcode = PFR_KERN_INDEX( char1, char2 );
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
|
|
|
|
if ( idx == charcode )
|
|
|
|
{
|
|
|
|
if ( item->flags & PFR_KERN_2BYTE_ADJ )
|
2002-10-07 12:12:43 +02:00
|
|
|
kerning->x = item->base_adj + FT_NEXT_SHORT( p );
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
else
|
2002-10-07 12:12:43 +02:00
|
|
|
kerning->x = item->base_adj + FT_NEXT_CHAR( p );
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if ( idx > charcode )
|
2002-10-07 12:12:43 +02:00
|
|
|
min = mid + 1;
|
* src/pfr/pfrsbit.h, src/pfr/pfrsbit.c, src/pfr/pfrload.c,
src/pfr/pfrgload.c, src/pfr/pfrobjs.c, src/pfr/pfrtypes.h,
Jamfile, src/base/ftobjs.c: adding support for embedded bitmaps to
the PFR driver, and rewriting its kerning loader / handler to use all
kerning pairs in a physical font (and not just the first item).
* src/tools/docmaker/content.py, src/tools/docmaker/sources.py,
src/tools/docmaker/tohtml.py: fixing a few nasty bugs
* src/sfnt/ttcmap0.c: the validator for format 4 sub-tables is
now capable of dealing with invalid "length" fields at the start
of the sub-table. This allows fonts like "mg______.ttf" (i.e.
Marriage) to return accurate charmaps.
2002-10-05 16:57:03 +02:00
|
|
|
else
|
|
|
|
max = mid;
|
|
|
|
}
|
|
|
|
|
|
|
|
FT_FRAME_EXIT();
|
|
|
|
}
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
return 0;
|
|
|
|
}
|
2002-06-21 09:33:23 +02:00
|
|
|
|
2002-04-20 07:38:33 +02:00
|
|
|
/* END */
|