Commit 7f7aadf4 authored by David Turner's avatar David Turner
Browse files

finished moving all configuration macros to

"config/ftoption.h"
parent 3246efed
......@@ -25,7 +25,6 @@
/*************************************************************************/
#include <ftextend.h>
#include <ftobjs.h>
/* required by the tracing mode */
#undef FT_COMPONENT
......
......@@ -18,7 +18,6 @@
#ifndef FTEXTEND_H
#define FTEXTEND_H
#include <ftconfig.h>
#include <ftobjs.h>
......
......@@ -46,7 +46,6 @@ ifndef SFNT_INCLUDE
# driver headers
#
SFNT_DRV_H := $(SHARED_H) \
$(SFNT_DIR_)sfconfig.h \
$(SFNT_DIR_)ttload.h \
$(SFNT_DIR_)ttsbit.h \
$(SFNT_DIR_)ttcmap.h \
......
/***************************************************************************/
/* */
/* sfconfig.h */
/* */
/* the `sfnt' driver configuration file. */
/* */
/* Copyright 1996-1999 by */
/* 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 file is used to configure various aspects of the TrueType */
/* driver. */
/* */
/*************************************************************************/
#ifndef SFCONFIG_H
#define SFCONFIG_H
#if 0
/*************************************************************************/
/* */
/* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support */
/* embedded bitmaps in the TrueType/OpenType driver. */
/* */
#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
/*************************************************************************/
/* */
/* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to */
/* load and enumerate the glyph Postscript names in a TrueType or */
/* OpenType file. */
/* */
/* Note that if FT_CONFIG_OPTION_POSTSCRIPT_NAMES is also defined, */
/* the TrueType driver will use the "psnames" module to fetch the */
/* glyph names. */
/* */
/* Otherwise, the driver will provide its own set of glyph names to */
/* be built without the "psnames" module. */
/* */
#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
#endif
#endif /* SFCONFIG_H */
/* END */
......@@ -3,7 +3,6 @@
#include <ttsbit.h>
#include <ttpost.h>
#include <ttcmap.h>
#include <sfconfig.h>
#include <sfnt.h>
static const SFNT_Interface sfnt_interface =
......
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <sfconfig.h>
#include <ttload.c>
#include <ttcmap.c>
......
......@@ -22,6 +22,7 @@
#include <ftdebug.h>
#include <ftconfig.h>
#include <ttload.h>
#include <tttags.h>
......
......@@ -24,9 +24,9 @@
/* */
/*************************************************************************/
#include <ftstream.h>
#include <ttpost.h>
#include <ftstream.h>
#include <tterrors.h>
#include <ttload.h>
#include <tttags.h>
......
......@@ -52,7 +52,6 @@ TT_DRV_SRC := $(TT_DIR_)ttobjs.c \
# driver headers
#
TT_DRV_H := $(SFNT_H) \
$(TT_DIR_)ttconfig.h \
$(TT_DRV_SRC:%.c=%.h)
......
/***************************************************************************/
/* */
/* ttconfig.h */
/* */
/* TrueType configuration file (specification only). */
/* */
/* Copyright 1996-1999 by */
/* 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 file is used to configure various aspects of the TrueType */
/* driver. */
/* */
/*************************************************************************/
#ifndef TTCONFIG_H
#define TTCONFIG_H
#if 0
/*************************************************************************/
/* */
/* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile */
/* a bytecode interpreter in the TrueType driver. Note that there are */
/* important patent issues related to the use of the interpreter. */
/* */
/* By undefining this, you'll only compile the code necessary to load */
/* TrueType glyphs without hinting.. */
/* */
#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/*************************************************************************/
/* */
/* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */
/* bytecode interpreter with a huge switch statement, rather than a */
/* call table. This results in smaller and faster code for a number of */
/* architectures. */
/* */
/* Note however that on some compiler/processor combinations, undefining */
/* this macro will generate a faster, though larger, code. */
/* */
#define TT_CONFIG_OPTION_INTERPRETER_SWITCH
/*************************************************************************/
/* */
/* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support */
/* embedded bitmaps in the TrueType/OpenType driver. */
/* */
#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
/*************************************************************************/
/* */
/* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to */
/* load and enumerate the glyph Postscript names in a TrueType or */
/* OpenType file. */
/* */
#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
/* The maximum number of sub-glyphs in a TrueType composite glyph */
#define TT_MAX_SUBGLYPHS 32
#define TT_USE_FIXED
#endif
#endif /* TTCONFIG_H */
/* END */
......@@ -27,7 +27,7 @@
EXPORT_DEF
const FT_DriverInterface ttz_driver_interface;
const FT_DriverInterface tt_driver_interface;
#endif /* TTDRIVER_H */
......
......@@ -22,7 +22,6 @@
#include <ftobjs.h>
#include <tttypes.h>
#include <ttconfig.h>
#include <tterrors.h>
......
......@@ -109,7 +109,6 @@ T1_DRV_SRC := $(T1_DIR_)t1objs.c \
# Type1 driver headers
#
T1_DRV_H := $(T1_DIR_)t1errors.h \
$(T1_DIR_)t1config.h \
$(T1SHARED_H) \
$(T1_DRV_SRC:%.c=%.h)
......
......@@ -10,12 +10,14 @@
#include <t1types.h>
#include <stdlib.h> /* for qsort */
#if 0
LOCAL_FUNC
void T1_Done_AFM( FT_Memory memory, T1_AFM* afm )
{
FREE( afm->kern_pairs );
afm->num_pairs = 0;
}
#endif
#undef IS_KERN_PAIR
#define IS_KERN_PAIR(p) ( p[0] == 'K' && p[1] == 'P' )
......
......@@ -34,9 +34,11 @@ LOCAL_DEF
FT_Error T1_Read_AFM( FT_Face face,
FT_Stream stream );
#if 0
LOCAL_DEF
void T1_Done_AFM( FT_Memory memory,
T1_AFM* afm );
#endif
LOCAL_DEF
void T1_Get_Kerning( T1_AFM* afm,
......
/*******************************************************************
*
* t1config.h
*
* Type 1 driver configuration file
*
* Copyright 1996-1998 by
* 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.
*
******************************************************************/
#ifndef T1CONFIG_H
#define T1CONFIG_H
#if 0
/* T1_MAX_STACK_DEPTH is the maximal depth of the token stack used */
/* by the Type 1 parser (see t1load.c). A minimum of 16 is required */
/* */
#define T1_MAX_STACK_DEPTH 16
/* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */
/* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */
/* required */
#define T1_MAX_DICT_DEPTH 5
/* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */
/* calls during glyph loading */
#define T1_MAX_SUBRS_CALLS 8
/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity */
#define T1_MAX_CHARSTRINGS_OPERANDS 32
/* Define T1_CONFIG_OPTION_DISABLE_HINTER if you want to generate */
/* a driver with no hinter. This can be useful to debug the parser */
/* */
#undef T1_CONFIG_OPTION_DISABLE_HINTER
/* Define this configuration macro if you want to prevent the */
/* compilation of "t1afm", which is in charge of reading Type1 */
/* AFM files into an existing face. Note that when set, the T1 */
/* driver will be unable to produce kerning distances.. */
/* */
#undef T1_CONFIG_OPTION_NO_AFM
#endif
#endif /* T1CONFIG_H */
#include <ftconfig.h>
#include <ftdebug.h>
#include <t1types.h>
#include <t1tokens.h>
#include <t1config.h>
#include <t1parse.h>
#include <stdio.h>
......
......@@ -19,7 +19,8 @@
#define T1OBJS_H
#include <ftobjs.h>
#include <t1config.h>
#include <ftconfig.h>
#include <t1errors.h>
#include <t1types.h>
......
......@@ -49,7 +49,6 @@ T1Z_DRV_SRC := $(T1Z_DIR_)t1parse.c \
# Type1 driver headers
#
T1Z_DRV_H := $(T1Z_DIR_)t1errors.h \
$(T1Z_DIR_)t1config.h \
$(T1SHARED_H) \
$(T1Z_DRV_SRC:%.c=%.h)
......
......@@ -10,12 +10,14 @@
#include <t1types.h>
#include <stdlib.h> /* for qsort */
#if 0
LOCAL_FUNC
void T1_Done_AFM( FT_Memory memory, T1_AFM* afm )
{
FREE( afm->kern_pairs );
afm->num_pairs = 0;
}
#endif
#undef IS_KERN_PAIR
#define IS_KERN_PAIR(p) ( p[0] == 'K' && p[1] == 'P' )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment