Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

* Jamfile: adding the "refdoc" target to the Jamfile in order to

Browse Source 
build the API Reference in "docs/reference" automatically

        * include/freetype/t1tables.h, src/cid/cidtoken.h, src/type1/t1tokens.h,
        src/type42/t42parse.c:

        re-setting the types of "italic_angle", "underline_position" and
        "underline_thickness" to their previous values (i.e. long, short and
        ushort), in order to avoid breaking binary compatibility

        * include/freetype/ttunpath.h: fixing documentation comment
BRANCH-2-1-5
David Turner 22 years ago
parent 7ea3d3e378
commit 1b1f7b928d
7 changed files with 60 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ChangeLog
  2. 20
      Jamfile
  3. 6
      include/freetype/t1tables.h
  4. 1
      include/freetype/ttunpat.h
  5. 8
      src/cid/cidtoken.h
  6. 6
      src/type1/t1tokens.h
  7. 34
      src/type42/t42parse.c

12
ChangeLog
Unescape View File

@ -1,5 +1,17 @@
2003-08-18 David Turner <david@freetype.org>
* Jamfile: adding the "refdoc" target to the Jamfile in order to
build the API Reference in "docs/reference" automatically
* include/freetype/t1tables.h, src/cid/cidtoken.h, src/type1/t1tokens.h,
src/type42/t42parse.c:
re-setting the types of "italic_angle", "underline_position" and
"underline_thickness" to their previous values (i.e. long, short and
ushort), in order to avoid breaking binary compatibility
* include/freetype/ttunpath.h: fixing documentation comment
* include/freetype/config/ftoption.h, devel/ftoption.h,
include/freetype/internal/ftobjs.h, include/freetype/internal/tttypes.h,
src/truetype/ttinterp.c, src/truetype/ttobjs.c, src/truetype/ttobjs.h:

20
Jamfile
Unescape View File

@ -90,6 +90,18 @@ FT2_INCLUDE = $(FT2_BUILD_INCLUDE)
FT2_SRC = [ FT2_SubDir $(FT2_SRC_DIR) ] ;
# Location of API Reference Documentation
#
if $(DOC_DIR)
{
DOC_DIR = $(DOCDIR:T) ;
}
else
{
DOC_DIR = docs/reference ;
}
# Only used by FreeType developers.
#
if $(DEBUG_HINTER)
@ -132,4 +144,12 @@ if $(DEBUG_HINTER)
SubInclude FT2_TOP tests ;
}
actions RefDoc
{
python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.5 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h $(FT2_INCLUDE)/freetype/cache/*.h
}
RefDoc refdoc ;
# end of top Jamfile

6
include/freetype/t1tables.h
Unescape View File

@ -67,10 +67,10 @@ FT_BEGIN_HEADER
FT_String* full_name;
FT_String* family_name;
FT_String* weight;
FT_Fixed italic_angle;
FT_Long italic_angle;
FT_Bool is_fixed_pitch;
FT_Fixed underline_position;
FT_Fixed underline_thickness;
FT_Short underline_position;
FT_UShort underline_thickness;
} PS_FontInfoRec, *PS_FontInfo;

1
include/freetype/ttunpat.h
Unescape View File

@ -42,6 +42,7 @@ FT_BEGIN_HEADER
*/
#define FT_PARAM_TAG_UNPATENTED_HINTING FT_MAKE_TAG( 'u', 'n', 'p', 'a' )
/* */
FT_END_HEADER

8
src/cid/cidtoken.h
Unescape View File

@ -44,10 +44,10 @@
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_NUM ( "ItalicAngle", italic_angle )
T1_FIELD_BOOL ( "isFixedPitch", is_fixed_pitch )
T1_FIELD_FIXED ( "UnderlinePosition", underline_position )
T1_FIELD_FIXED ( "UnderlineThickness", underline_thickness )
T1_FIELD_NUM ( "UnderlinePosition", underline_position )
T1_FIELD_NUM ( "UnderlineThickness", underline_thickness )
#undef FT_STRUCTURE
@ -98,6 +98,6 @@
#define T1CODE T1_FIELD_LOCATION_BBOX
T1_FIELD_BBOX( "FontBBox", xMin )
/* END */

6
src/type1/t1tokens.h
Unescape View File

@ -28,10 +28,10 @@
T1_FIELD_STRING( "Weight", weight )
/* we use pointers to detect modifications made by synthetic fonts */
T1_FIELD_FIXED ( "ItalicAngle", italic_angle )
T1_FIELD_NUM ( "ItalicAngle", italic_angle )
T1_FIELD_BOOL ( "isFixedPitch", is_fixed_pitch )
T1_FIELD_FIXED ( "UnderlinePosition", underline_position )
T1_FIELD_FIXED ( "UnderlineThickness", underline_thickness )
T1_FIELD_NUM ( "UnderlinePosition", underline_position )
T1_FIELD_NUM ( "UnderlineThickness", underline_thickness )
#undef FT_STRUCTURE

34
src/type42/t42parse.c
Unescape View File

@ -39,11 +39,11 @@
static void
t42_parse_encoding( T42_Face face,
T42_Loader loader );
static void
t42_parse_charstrings( T42_Face face,
T42_Loader loader );
static void
t42_parse_sfnts( T42_Face face,
T42_Loader loader );
@ -62,10 +62,10 @@
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_NUM ( "ItalicAngle", italic_angle )
T1_FIELD_BOOL ( "isFixedPitch", is_fixed_pitch )
T1_FIELD_FIXED ( "UnderlinePosition", underline_position )
T1_FIELD_FIXED ( "UnderlineThickness", underline_thickness )
T1_FIELD_NUM ( "UnderlinePosition", underline_position )
T1_FIELD_NUM ( "UnderlineThickness", underline_thickness )
#undef FT_STRUCTURE
#define FT_STRUCTURE T1_FontRec
@ -460,28 +460,28 @@
t42_hexval( FT_Byte v )
{
FT_UInt d;
d = (FT_UInt)( v - 'A' );
if ( d < 6 )
{
d += 10;
goto Exit;
}
d = (FT_UInt)( v - 'a' );
if ( d < 6 )
{
d += 10;
goto Exit;
}
d = (FT_UInt)( v - '0' );
if ( d < 10 )
goto Exit;
d = 0;
Exit:
Exit:
return d;
}
@ -613,7 +613,7 @@
for ( i = 0; i < num_tables; i++ )
{
FT_Byte* p = face->ttf_data + 12 + 16*i + 12;
len = FT_PEEK_ULONG( p );
/* Pad to a 4-byte boundary length */
@ -816,14 +816,14 @@
T42_Parser parser = &loader->parser;
FT_Byte* cur = base;
FT_Byte* limit = cur + size;
FT_UInt n_keywords = (FT_UInt)( sizeof ( t42_keywords ) /
FT_UInt n_keywords = (FT_UInt)( sizeof ( t42_keywords ) /
sizeof ( t42_keywords[0] ) );
FT_Byte keyword_flags[T42_KEYWORD_COUNT];
{
FT_UInt n;
for ( n = 0; n < T42_KEYWORD_COUNT; n++ )
keyword_flags[n] = 0;
@ -900,7 +900,7 @@
/* we found it -- run the parsing callback! */
parser->root.cursor = cur2;
T1_Skip_Spaces( parser );
/* only record the first instance of each field/keyword */
/* to deal with synthetic fonts correctly */
if ( keyword_flags[i] == 0 )
@ -912,7 +912,7 @@
return parser->root.error;
}
keyword_flags[i] = 1;
cur = parser->root.cursor;
break;
}

Write Preview
Loading…
Cancel
Save