formatting, copyright
This commit is contained in:
parent
afe5351e80
commit
44be4d56fc
|
@ -212,6 +212,8 @@
|
|||
FTDriver_initGlyphSlot => FT_Slot_InitFunc
|
||||
etc.
|
||||
|
||||
* src/cid/cidobjs.c (CID_Face_Init): Remove dead code.
|
||||
|
||||
* include/freetype/internal/ftobjs.h, src/base/ftobjs.c: Updated a
|
||||
few face method definitions:
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID-keyed Type1 Glyph Loader (body). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
@ -92,7 +92,8 @@
|
|||
if ( FT_ALLOC( charstring, glyph_len ) )
|
||||
goto Exit;
|
||||
|
||||
if ( !FT_STREAM_READ_AT( cid->data_offset + off1, charstring, glyph_len ) )
|
||||
if ( !FT_STREAM_READ_AT( cid->data_offset + off1,
|
||||
charstring, glyph_len ) )
|
||||
{
|
||||
FT_Int cs_offset;
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* OpenType Glyph Loader (specification). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID-keyed Type1 font loader (body). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID-keyed Type1 font loader (specification). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID objects manager (body). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
@ -162,15 +162,12 @@
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
/* FACE FUNCTIONS */
|
||||
/* */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
/* <Function> */
|
||||
|
@ -386,7 +383,6 @@
|
|||
root->bbox.xMax = (face->cid.font_bbox.xMax + 0xFFFFU) >> 16;
|
||||
root->bbox.yMax = (face->cid.font_bbox.yMax + 0xFFFFU) >> 16;
|
||||
|
||||
|
||||
if ( !root->units_per_EM )
|
||||
root->units_per_EM = 1000;
|
||||
|
||||
|
@ -395,7 +391,6 @@
|
|||
root->height = (FT_Short)(
|
||||
( ( root->ascender + root->descender ) * 12 ) / 10 );
|
||||
|
||||
|
||||
root->underline_position = face->cid.font_info.underline_position;
|
||||
root->underline_thickness = face->cid.font_info.underline_thickness;
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID objects manager (specification). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID-keyed Type1 parser (body). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID-keyed Type1 parser (specification). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
@ -39,7 +39,7 @@ FT_BEGIN_HEADER
|
|||
/* quickly. */
|
||||
/* */
|
||||
/* <Fields> */
|
||||
/* root :: the root PS_ParserRec fields */
|
||||
/* root :: The root PS_ParserRec fields. */
|
||||
/* */
|
||||
/* stream :: The current input stream. */
|
||||
/* */
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID driver interface (body). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
@ -38,14 +38,14 @@
|
|||
#define FT_COMPONENT trace_ciddriver
|
||||
|
||||
|
||||
|
||||
static const char*
|
||||
cid_get_postscript_name( CID_Face face )
|
||||
{
|
||||
const char* result = face->cid.cid_font_name;
|
||||
|
||||
|
||||
if ( result && result[0] == '/' )
|
||||
result ++;
|
||||
result++;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
@ -86,7 +86,6 @@
|
|||
return CID_Err_Ok;
|
||||
}
|
||||
|
||||
|
||||
#endif /* 0 */
|
||||
|
||||
|
||||
|
@ -319,14 +318,14 @@
|
|||
|
||||
(FT_Size_InitFunc) CID_Size_Init,
|
||||
(FT_Size_DoneFunc) CID_Size_Done,
|
||||
(FT_Slot_InitFunc)CID_GlyphSlot_Init,
|
||||
(FT_Slot_DoneFunc)CID_GlyphSlot_Done,
|
||||
(FT_Slot_InitFunc) CID_GlyphSlot_Init,
|
||||
(FT_Slot_DoneFunc) CID_GlyphSlot_Done,
|
||||
|
||||
(FT_Size_ResetPointsFunc) CID_Size_Reset,
|
||||
(FT_Size_ResetPixelsFunc)CID_Size_Reset,
|
||||
(FT_Size_ResetPixelsFunc) CID_Size_Reset,
|
||||
|
||||
(FT_Slot_LoadFunc) CID_Load_Glyph,
|
||||
(FT_CharMap_CharIndexFunc) CID_Get_Char_Index,
|
||||
(FT_CharMap_CharIndexFunc)CID_Get_Char_Index,
|
||||
|
||||
(FT_Face_GetKerningFunc) 0,
|
||||
(FT_Face_AttachFunc) 0,
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* High-level CID driver interface (specification). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* CID token definitions (specification only). */
|
||||
/* */
|
||||
/* Copyright 1996-2001 by */
|
||||
/* Copyright 1996-2001, 2002 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
@ -39,13 +39,13 @@
|
|||
#undef T1CODE
|
||||
#define T1CODE T1_FIELD_LOCATION_FONT_INFO
|
||||
|
||||
T1_FIELD_STRING( "version", version )
|
||||
T1_FIELD_STRING( "Notice", notice )
|
||||
T1_FIELD_STRING( "FullName", full_name )
|
||||
T1_FIELD_STRING( "FamilyName", family_name )
|
||||
T1_FIELD_STRING( "Weight", weight )
|
||||
T1_FIELD_STRING ( "version", version )
|
||||
T1_FIELD_STRING ( "Notice", notice )
|
||||
T1_FIELD_STRING ( "FullName", full_name )
|
||||
T1_FIELD_STRING ( "FamilyName", family_name )
|
||||
T1_FIELD_STRING ( "Weight", weight )
|
||||
T1_FIELD_FIXED ( "ItalicAngle", italic_angle )
|
||||
T1_FIELD_TYPE_BOOL ( "isFixedPitch", is_fixed_pitch )
|
||||
T1_FIELD_TYPE_BOOL( "isFixedPitch", is_fixed_pitch )
|
||||
T1_FIELD_NUM ( "UnderlinePosition", underline_position )
|
||||
T1_FIELD_NUM ( "UnderlineThickness", underline_thickness )
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
|
||||
|
||||
# Copyright 1996-2000 by
|
||||
# Copyright 1996-2000, 2001 by
|
||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||
#
|
||||
# This file is part of the FreeType project, and may only be used, modified,
|
||||
|
|
Loading…
Reference in New Issue