From 8502c98b15390a397de2d5826c9d8b017d7fc208 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 22 Jun 2015 06:35:23 +0200 Subject: [PATCH] Fix Savannah bug #45097. We no longer `pollute' the namespace of possible header file names; instead we move `ft2build.h' up by one level so that it gets installed in the default include directory (e.g., /usr/local/include). After this commit, only `ft2build.h' stays in the compiler's include path. No visible changes for the user who follows the standard FreeType header inclusion rules. * include/*: Move to ... * include/freetype2/*: This directory, except `ft2build.h'. * CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS, PRIVATE_HEADERS), Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated. * builds/amiga/include/config/ftconfig.h, builds/freetype.mk (PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work), builds/unix/install.mk (install, uninstall), builds/unix/freetype2.in: Updated. * builds/unix/freetype-config.in: Updated. Emit -I directory only if it is not `/usr/include'. * builds/wince/*, builds/windows/*: Updated. * devel/ft2build.h, include/ft2build.h: Updated. * include/freetype2/config/ftheader.h, include/freetype2/internal/ftserv.h, include/freetype2/internal/internal.h: Update all header file macros. * src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated. * docs/*: Updated. --- CMakeLists.txt | 6 +- ChangeLog | 38 ++++++ Jamfile | 10 +- autogen.sh | 2 +- builds/amiga/README | 15 +-- builds/amiga/include/config/ftconfig.h | 6 +- builds/amiga/makefile | 2 +- builds/amiga/makefile.os4 | 2 +- builds/amiga/smakefile | 2 +- builds/amiga/src/base/ftdebug.c | 4 +- builds/freetype.mk | 4 +- builds/symbian/bld.inf | 92 +++++++------- builds/toplevel.mk | 2 +- builds/unix/freetype-config.in | 5 +- builds/unix/freetype2.in | 2 +- builds/unix/ftconfig.in | 2 +- builds/unix/install.mk | 4 + builds/wince/vc2005-ce/freetype.vcproj | 10 +- builds/wince/vc2008-ce/freetype.vcproj | 10 +- builds/windows/vc2005/freetype.vcproj | 10 +- builds/windows/vc2008/freetype.vcproj | 10 +- builds/windows/vc2010/freetype.vcxproj | 10 +- .../windows/vc2010/freetype.vcxproj.filters | 10 +- builds/windows/visualc/freetype.dsp | 10 +- builds/windows/visualc/freetype.vcproj | 10 +- builds/windows/visualce/freetype.dsp | 10 +- builds/windows/visualce/freetype.vcproj | 10 +- devel/ft2build.h | 2 +- devel/ftoption.h | 10 +- docs/CHANGES | 27 ++++ docs/CUSTOMIZE | 15 +-- docs/INSTALL.ANY | 14 +-- docs/release | 2 +- include/{ => freetype2}/config/ftconfig.h | 0 include/{ => freetype2}/config/ftheader.h | 116 +++++++++--------- include/{ => freetype2}/config/ftmodule.h | 0 include/{ => freetype2}/config/ftoption.h | 10 +- include/{ => freetype2}/config/ftstdlib.h | 0 include/{ => freetype2}/freetype.h | 0 include/{ => freetype2}/ftadvanc.h | 0 include/{ => freetype2}/ftautoh.h | 0 include/{ => freetype2}/ftbbox.h | 0 include/{ => freetype2}/ftbdf.h | 0 include/{ => freetype2}/ftbitmap.h | 0 include/{ => freetype2}/ftbzip2.h | 0 include/{ => freetype2}/ftcache.h | 0 include/{ => freetype2}/ftcffdrv.h | 0 include/{ => freetype2}/ftchapters.h | 0 include/{ => freetype2}/ftcid.h | 0 include/{ => freetype2}/fterrdef.h | 0 include/{ => freetype2}/fterrors.h | 0 include/{ => freetype2}/ftfntfmt.h | 0 include/{ => freetype2}/ftgasp.h | 0 include/{ => freetype2}/ftglyph.h | 0 include/{ => freetype2}/ftgxval.h | 0 include/{ => freetype2}/ftgzip.h | 0 include/{ => freetype2}/ftimage.h | 0 include/{ => freetype2}/ftincrem.h | 0 include/{ => freetype2}/ftlcdfil.h | 0 include/{ => freetype2}/ftlist.h | 0 include/{ => freetype2}/ftlzw.h | 0 include/{ => freetype2}/ftmac.h | 0 include/{ => freetype2}/ftmm.h | 0 include/{ => freetype2}/ftmodapi.h | 0 include/{ => freetype2}/ftmoderr.h | 0 include/{ => freetype2}/ftotval.h | 0 include/{ => freetype2}/ftoutln.h | 0 include/{ => freetype2}/ftpfr.h | 0 include/{ => freetype2}/ftrender.h | 0 include/{ => freetype2}/ftsizes.h | 0 include/{ => freetype2}/ftsnames.h | 0 include/{ => freetype2}/ftstroke.h | 0 include/{ => freetype2}/ftsynth.h | 0 include/{ => freetype2}/ftsystem.h | 0 include/{ => freetype2}/fttrigon.h | 0 include/{ => freetype2}/ftttdrv.h | 0 include/{ => freetype2}/fttypes.h | 0 include/{ => freetype2}/ftwinfnt.h | 0 include/{ => freetype2}/internal/autohint.h | 0 include/{ => freetype2}/internal/ftcalc.h | 0 include/{ => freetype2}/internal/ftdebug.h | 0 include/{ => freetype2}/internal/ftdriver.h | 0 include/{ => freetype2}/internal/ftgloadr.h | 0 include/{ => freetype2}/internal/ftmemory.h | 0 include/{ => freetype2}/internal/ftobjs.h | 0 include/{ => freetype2}/internal/ftpic.h | 0 include/{ => freetype2}/internal/ftrfork.h | 0 include/{ => freetype2}/internal/ftserv.h | 36 +++--- include/{ => freetype2}/internal/ftstream.h | 0 include/{ => freetype2}/internal/fttrace.h | 0 include/{ => freetype2}/internal/ftvalid.h | 0 include/{ => freetype2}/internal/internal.h | 38 +++--- include/{ => freetype2}/internal/psaux.h | 0 include/{ => freetype2}/internal/pshints.h | 0 .../{ => freetype2}/internal/services/svbdf.h | 0 .../{ => freetype2}/internal/services/svcid.h | 0 .../internal/services/svfntfmt.h | 0 .../internal/services/svgldict.h | 0 .../internal/services/svgxval.h | 0 .../internal/services/svkern.h | 0 .../{ => freetype2}/internal/services/svmm.h | 0 .../internal/services/svotval.h | 0 .../{ => freetype2}/internal/services/svpfr.h | 0 .../internal/services/svpostnm.h | 0 .../internal/services/svprop.h | 0 .../internal/services/svpscmap.h | 0 .../internal/services/svpsinfo.h | 0 .../internal/services/svsfnt.h | 0 .../internal/services/svttcmap.h | 0 .../internal/services/svtteng.h | 0 .../internal/services/svttglyf.h | 0 .../internal/services/svwinfnt.h | 0 include/{ => freetype2}/internal/sfnt.h | 0 include/{ => freetype2}/internal/t1types.h | 0 include/{ => freetype2}/internal/tttypes.h | 0 include/{ => freetype2}/t1tables.h | 0 include/{ => freetype2}/ttnameid.h | 0 include/{ => freetype2}/tttables.h | 0 include/{ => freetype2}/tttags.h | 0 include/{ => freetype2}/ttunpat.h | 0 include/ft2build.h | 2 +- modules.cfg | 48 ++++---- src/base/ftdebug.c | 4 +- src/base/ftinit.c | 4 +- src/raster/ftraster.c | 4 +- src/smooth/ftgrays.c | 4 +- src/tools/chktrcmp.py | 2 +- src/tools/docmaker/content.py | 7 +- 128 files changed, 358 insertions(+), 285 deletions(-) rename include/{ => freetype2}/config/ftconfig.h (100%) rename include/{ => freetype2}/config/ftheader.h (89%) rename include/{ => freetype2}/config/ftmodule.h (100%) rename include/{ => freetype2}/config/ftoption.h (99%) rename include/{ => freetype2}/config/ftstdlib.h (100%) rename include/{ => freetype2}/freetype.h (100%) rename include/{ => freetype2}/ftadvanc.h (100%) rename include/{ => freetype2}/ftautoh.h (100%) rename include/{ => freetype2}/ftbbox.h (100%) rename include/{ => freetype2}/ftbdf.h (100%) rename include/{ => freetype2}/ftbitmap.h (100%) rename include/{ => freetype2}/ftbzip2.h (100%) rename include/{ => freetype2}/ftcache.h (100%) rename include/{ => freetype2}/ftcffdrv.h (100%) rename include/{ => freetype2}/ftchapters.h (100%) rename include/{ => freetype2}/ftcid.h (100%) rename include/{ => freetype2}/fterrdef.h (100%) rename include/{ => freetype2}/fterrors.h (100%) rename include/{ => freetype2}/ftfntfmt.h (100%) rename include/{ => freetype2}/ftgasp.h (100%) rename include/{ => freetype2}/ftglyph.h (100%) rename include/{ => freetype2}/ftgxval.h (100%) rename include/{ => freetype2}/ftgzip.h (100%) rename include/{ => freetype2}/ftimage.h (100%) rename include/{ => freetype2}/ftincrem.h (100%) rename include/{ => freetype2}/ftlcdfil.h (100%) rename include/{ => freetype2}/ftlist.h (100%) rename include/{ => freetype2}/ftlzw.h (100%) rename include/{ => freetype2}/ftmac.h (100%) rename include/{ => freetype2}/ftmm.h (100%) rename include/{ => freetype2}/ftmodapi.h (100%) rename include/{ => freetype2}/ftmoderr.h (100%) rename include/{ => freetype2}/ftotval.h (100%) rename include/{ => freetype2}/ftoutln.h (100%) rename include/{ => freetype2}/ftpfr.h (100%) rename include/{ => freetype2}/ftrender.h (100%) rename include/{ => freetype2}/ftsizes.h (100%) rename include/{ => freetype2}/ftsnames.h (100%) rename include/{ => freetype2}/ftstroke.h (100%) rename include/{ => freetype2}/ftsynth.h (100%) rename include/{ => freetype2}/ftsystem.h (100%) rename include/{ => freetype2}/fttrigon.h (100%) rename include/{ => freetype2}/ftttdrv.h (100%) rename include/{ => freetype2}/fttypes.h (100%) rename include/{ => freetype2}/ftwinfnt.h (100%) rename include/{ => freetype2}/internal/autohint.h (100%) rename include/{ => freetype2}/internal/ftcalc.h (100%) rename include/{ => freetype2}/internal/ftdebug.h (100%) rename include/{ => freetype2}/internal/ftdriver.h (100%) rename include/{ => freetype2}/internal/ftgloadr.h (100%) rename include/{ => freetype2}/internal/ftmemory.h (100%) rename include/{ => freetype2}/internal/ftobjs.h (100%) rename include/{ => freetype2}/internal/ftpic.h (100%) rename include/{ => freetype2}/internal/ftrfork.h (100%) rename include/{ => freetype2}/internal/ftserv.h (96%) rename include/{ => freetype2}/internal/ftstream.h (100%) rename include/{ => freetype2}/internal/fttrace.h (100%) rename include/{ => freetype2}/internal/ftvalid.h (100%) rename include/{ => freetype2}/internal/internal.h (61%) rename include/{ => freetype2}/internal/psaux.h (100%) rename include/{ => freetype2}/internal/pshints.h (100%) rename include/{ => freetype2}/internal/services/svbdf.h (100%) rename include/{ => freetype2}/internal/services/svcid.h (100%) rename include/{ => freetype2}/internal/services/svfntfmt.h (100%) rename include/{ => freetype2}/internal/services/svgldict.h (100%) rename include/{ => freetype2}/internal/services/svgxval.h (100%) rename include/{ => freetype2}/internal/services/svkern.h (100%) rename include/{ => freetype2}/internal/services/svmm.h (100%) rename include/{ => freetype2}/internal/services/svotval.h (100%) rename include/{ => freetype2}/internal/services/svpfr.h (100%) rename include/{ => freetype2}/internal/services/svpostnm.h (100%) rename include/{ => freetype2}/internal/services/svprop.h (100%) rename include/{ => freetype2}/internal/services/svpscmap.h (100%) rename include/{ => freetype2}/internal/services/svpsinfo.h (100%) rename include/{ => freetype2}/internal/services/svsfnt.h (100%) rename include/{ => freetype2}/internal/services/svttcmap.h (100%) rename include/{ => freetype2}/internal/services/svtteng.h (100%) rename include/{ => freetype2}/internal/services/svttglyf.h (100%) rename include/{ => freetype2}/internal/services/svwinfnt.h (100%) rename include/{ => freetype2}/internal/sfnt.h (100%) rename include/{ => freetype2}/internal/t1types.h (100%) rename include/{ => freetype2}/internal/tttypes.h (100%) rename include/{ => freetype2}/t1tables.h (100%) rename include/{ => freetype2}/ttnameid.h (100%) rename include/{ => freetype2}/tttables.h (100%) rename include/{ => freetype2}/tttags.h (100%) rename include/{ => freetype2}/ttunpat.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6631fdeb0..9cd9c8a85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,9 +121,9 @@ execute_process( OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h ) -file(GLOB PUBLIC_HEADERS "include/*.h") -file(GLOB PUBLIC_CONFIG_HEADERS "include/config/*.h") -file(GLOB PRIVATE_HEADERS "include/internal/*.h") +file(GLOB PUBLIC_HEADERS "include/freetype2/*.h") +file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype2/config/*.h") +file(GLOB PRIVATE_HEADERS "include/freetype2/internal/*.h") set(BASE_SRCS src/autofit/autofit.c diff --git a/ChangeLog b/ChangeLog index 4af98ece7..6fbc2ab1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2015-06-22 Werner Lemberg + + Fix Savannah bug #45097. + + We no longer `pollute' the namespace of possible header file names; + instead we move `ft2build.h' up by one level so that it gets + installed in the default include directory (e.g., + /usr/local/include). After this commit, only `ft2build.h' stays in + the compiler's include path. + + No visible changes for the user who follows the standard FreeType + header inclusion rules. + + * include/*: Move to ... + * include/freetype2/*: This directory, except `ft2build.h'. + + * CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS, + PRIVATE_HEADERS), Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated. + + * builds/amiga/include/config/ftconfig.h, builds/freetype.mk + (PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work), + builds/unix/install.mk (install, uninstall), + builds/unix/freetype2.in: Updated. + + * builds/unix/freetype-config.in: Updated. + Emit -I directory only if it is not `/usr/include'. + + * builds/wince/*, builds/windows/*: Updated. + + * devel/ft2build.h, include/ft2build.h: Updated. + + * include/freetype2/config/ftheader.h, + include/freetype2/internal/ftserv.h, + include/freetype2/internal/internal.h: Update all header file + macros. + + * src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated. + 2015-06-21 Werner Lemberg Make Jam support work again. diff --git a/Jamfile b/Jamfile index 90b1d6805..d42dabc04 100644 --- a/Jamfile +++ b/Jamfile @@ -143,9 +143,9 @@ CCFLAGS += -DFT2_BUILD_LIBRARY ; # macros that are later used in #include statements. They need to be parsed # in order to record these definitions. # -HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) config ftheader.h ] ; -HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) internal internal.h ] ; -HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) internal ftserv.h ] ; +HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 config ftheader.h ] ; +HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 internal internal.h ] ; +HDRMACRO [ FT2_SubDir $(FT2_INCLUDE_DIR) freetype2 internal ftserv.h ] ; # Now include the Jamfile in `freetype2/src', used to drive the compilation @@ -199,8 +199,8 @@ actions RefDoc --prefix=ft2 --title=FreeType-2.6 --output=$(DOC_DIR) - $(FT2_INCLUDE)/*.h - $(FT2_INCLUDE)/config/*.h + $(FT2_INCLUDE)/freetype2/*.h + $(FT2_INCLUDE)/freetype2/config/*.h } RefDoc refdoc ; diff --git a/autogen.sh b/autogen.sh index 9729af42d..290dd6083 100755 --- a/autogen.sh +++ b/autogen.sh @@ -139,7 +139,7 @@ check_tool_version $LIBTOOLIZE libtoolize LIBTOOLIZE 2.2.4 check_tool_version $AUTOCONF autoconf AUTOCONF 2.62 # This sets freetype_major, freetype_minor, and freetype_patch. -eval `sed -nf version.sed include/freetype.h` +eval `sed -nf version.sed include/freetype2/freetype.h` # We set freetype-patch to an empty value if it is zero. if test "$freetype_patch" = ".0"; then diff --git a/builds/amiga/README b/builds/amiga/README index 1a68b107c..3ee605701 100644 --- a/builds/amiga/README +++ b/builds/amiga/README @@ -51,8 +51,8 @@ directory. The results are: - ftdebug.o, an object module containing the standard version of the debugging code which uses vprintf() and exit() (not pure). - Debugging can be turned on in FT:include/config/ftoption.h and with - FT_SetTraceLevel(). + Debugging can be turned on in FT:include/freetype2/config/ftoption.h + and with FT_SetTraceLevel(). - ftdebugpure.o, an object module containing the pure version of the debugging code which uses KVPrintf() from lib:debug.lib and no @@ -64,14 +64,15 @@ directory. The results are: ftsystem.o would force ALL FreeType2 modules to be linked to your program, I decided to use a different scheme: You must #include FT:src/base/ftinit.c in your sourcecode and specify with #define - statements which modules you need. See include/config/ftmodule.h. + statements which modules you need. See + include/freetype2/config/ftmodule.h. To use in your own programs: - Insert the #define and #include statements from top of - include/config/ftmodule.h in your source code and uncomment the - #define statements for the FreeType2 modules you need. + include/freetype2/config/ftmodule.h in your source code and + uncomment the #define statements for the FreeType2 modules you need. - You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for calling the FreeType2 functions, because the link library and the @@ -100,8 +101,8 @@ To adapt to other compilers: useful for the src directory). - An example of how to replace/workaround a problematic include file - is include/config/ftconfig.h; it changes a #define that would - prevent SAS/C from generating XDEF's where it should do that and + is include/freetype2/config/ftconfig.h; it changes a #define that + would prevent SAS/C from generating XDEF's where it should do that and then includes the standard FreeType2 include file. Local Variables: diff --git a/builds/amiga/include/config/ftconfig.h b/builds/amiga/include/config/ftconfig.h index 790eeec82..2f66ff7d5 100644 --- a/builds/amiga/include/config/ftconfig.h +++ b/builds/amiga/include/config/ftconfig.h @@ -34,9 +34,9 @@ /* Now include the original file */ #ifndef __MORPHOS__ #ifdef __SASC -#include "FT:include/config/ftconfig.h" +#include "FT:include/freetype2/config/ftconfig.h" #else -#include "/FT/include/config/ftconfig.h" +#include "/FT/include/freetype2/config/ftconfig.h" #endif #else /* We must define that, it seems that @@ -45,7 +45,7 @@ * binaries from http://www.morphos.de) */ #define _LIBC_LIMITS_H_ -#include "/FT/include/config/ftconfig.h" +#include "/FT/include/freetype2/config/ftconfig.h" #endif /* diff --git a/builds/amiga/makefile b/builds/amiga/makefile index bcb45b9ed..7ff3cab9a 100644 --- a/builds/amiga/makefile +++ b/builds/amiga/makefile @@ -43,7 +43,7 @@ # # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or -# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h). +# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h). all: libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o diff --git a/builds/amiga/makefile.os4 b/builds/amiga/makefile.os4 index 481fe5950..5350be67e 100644 --- a/builds/amiga/makefile.os4 +++ b/builds/amiga/makefile.os4 @@ -40,7 +40,7 @@ # # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or -# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h). +# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h). all: assign libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o diff --git a/builds/amiga/smakefile b/builds/amiga/smakefile index 156beb29f..1081ab03f 100644 --- a/builds/amiga/smakefile +++ b/builds/amiga/smakefile @@ -40,7 +40,7 @@ # # link your programs with ft2_680x0.lib and either ftsystem.o or ftsystempure.o # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or -# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h). +# FT_DEBUG_LEVEL_TRACE in include/freetype2/config/ftoption.h). OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfntfmt.o ftfstype.o \ ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o \ diff --git a/builds/amiga/src/base/ftdebug.c b/builds/amiga/src/base/ftdebug.c index 891a597ae..f48910af4 100644 --- a/builds/amiga/src/base/ftdebug.c +++ b/builds/amiga/src/base/ftdebug.c @@ -176,8 +176,8 @@ /* the memory and stream components which are set to 7 and 5, */ /* respectively. */ /* */ - /* See the file for details of the */ - /* available toggle names. */ + /* See the file for details of */ + /* the available toggle names. */ /* */ /* The level must be between 0 and 7; 0 means quiet (except for serious */ /* runtime errors), and 7 means _very_ verbose. */ diff --git a/builds/freetype.mk b/builds/freetype.mk index 5ea13f058..7f9e056be 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base # Other derived directories. # -PUBLIC_DIR := $(TOP_DIR)/include +PUBLIC_DIR := $(TOP_DIR)/include/freetype2 INTERNAL_DIR := $(PUBLIC_DIR)/internal SERVICES_DIR := $(INTERNAL_DIR)/services CONFIG_DIR := $(PUBLIC_DIR)/config @@ -175,7 +175,7 @@ OBJECTS_LIST := # Define $(PUBLIC_H) as the list of all public header files located in -# `$(TOP_DIR)/include/freetype'. $(INTERNAL_H), and $(CONFIG_H) are defined +# `$(TOP_DIR)/include/freetype2'. $(INTERNAL_H), and $(CONFIG_H) are defined # similarly. # # This is used to simplify the dependency rules -- if one of these files diff --git a/builds/symbian/bld.inf b/builds/symbian/bld.inf index d3637f238..4480d5037 100644 --- a/builds/symbian/bld.inf +++ b/builds/symbian/bld.inf @@ -18,49 +18,49 @@ PRJ_MMPFILES freetype.mmp PRJ_EXPORTS -../../include/ft2build.h -../../include/config/ftconfig.h config/ftconfig.h -../../include/config/ftheader.h config/ftheader.h -../../include/config/ftmodule.h config/ftmodule.h -../../include/config/ftoption.h config/ftoption.h -../../include/config/ftstdlib.h config/ftstdlib.h -../../include/freetype.h freetype.h -../../include/ftbbox.h ftbbox.h -../../include/ftbdf.h ftbdf.h -../../include/ftbitmap.h ftbitmap.h -../../include/ftcache.h ftcache.h -../../include/ftcid.h ftcid.h -../../include/fterrdef.h fterrdef.h -../../include/fterrors.h fterrors.h -../../include/ftfntfmt.h ftfntfmt.h -../../include/ftgasp.h ftgasp.h -../../include/ftglyph.h ftglyph.h -../../include/ftgxval.h ftgxval.h -../../include/ftgzip.h ftgzip.h -../../include/ftbzip2.h ftbzip2.h -../../include/ftimage.h ftimage.h -../../include/ftincrem.h ftincrem.h -../../include/ftlcdfil.h ftlcdfil.h -../../include/ftlist.h ftlist.h -../../include/ftlzw.h ftlzw.h -../../include/ftmac.h ftmac.h -../../include/ftmm.h ftmm.h -../../include/ftmodapi.h ftmodapi.h -../../include/ftmoderr.h ftmoderr.h -../../include/ftotval.h ftotval.h -../../include/ftoutln.h ftoutln.h -../../include/ftpfr.h ftpfr.h -../../include/ftrender.h ftrender.h -../../include/ftsizes.h ftsizes.h -../../include/ftsnames.h ftsnames.h -../../include/ftstroke.h ftstroke.h -../../include/ftsynth.h ftsynth.h -../../include/ftsystem.h ftsystem.h -../../include/fttrigon.h fttrigon.h -../../include/fttypes.h fttypes.h -../../include/ftwinfnt.h ftwinfnt.h -../../include/t1tables.h t1tables.h -../../include/ttnameid.h ttnameid.h -../../include/tttables.h tttables.h -../../include/tttags.h tttags.h -../../include/ttunpat.h ttunpat.h +../../include/freetype2/ft2build.h +../../include/freetype2/config/ftconfig.h config/ftconfig.h +../../include/freetype2/config/ftheader.h config/ftheader.h +../../include/freetype2/config/ftmodule.h config/ftmodule.h +../../include/freetype2/config/ftoption.h config/ftoption.h +../../include/freetype2/config/ftstdlib.h config/ftstdlib.h +../../include/freetype2/freetype.h freetype.h +../../include/freetype2/ftbbox.h ftbbox.h +../../include/freetype2/ftbdf.h ftbdf.h +../../include/freetype2/ftbitmap.h ftbitmap.h +../../include/freetype2/ftcache.h ftcache.h +../../include/freetype2/ftcid.h ftcid.h +../../include/freetype2/fterrdef.h fterrdef.h +../../include/freetype2/fterrors.h fterrors.h +../../include/freetype2/ftfntfmt.h ftfntfmt.h +../../include/freetype2/ftgasp.h ftgasp.h +../../include/freetype2/ftglyph.h ftglyph.h +../../include/freetype2/ftgxval.h ftgxval.h +../../include/freetype2/ftgzip.h ftgzip.h +../../include/freetype2/ftbzip2.h ftbzip2.h +../../include/freetype2/ftimage.h ftimage.h +../../include/freetype2/ftincrem.h ftincrem.h +../../include/freetype2/ftlcdfil.h ftlcdfil.h +../../include/freetype2/ftlist.h ftlist.h +../../include/freetype2/ftlzw.h ftlzw.h +../../include/freetype2/ftmac.h ftmac.h +../../include/freetype2/ftmm.h ftmm.h +../../include/freetype2/ftmodapi.h ftmodapi.h +../../include/freetype2/ftmoderr.h ftmoderr.h +../../include/freetype2/ftotval.h ftotval.h +../../include/freetype2/ftoutln.h ftoutln.h +../../include/freetype2/ftpfr.h ftpfr.h +../../include/freetype2/ftrender.h ftrender.h +../../include/freetype2/ftsizes.h ftsizes.h +../../include/freetype2/ftsnames.h ftsnames.h +../../include/freetype2/ftstroke.h ftstroke.h +../../include/freetype2/ftsynth.h ftsynth.h +../../include/freetype2/ftsystem.h ftsystem.h +../../include/freetype2/fttrigon.h fttrigon.h +../../include/freetype2/fttypes.h fttypes.h +../../include/freetype2/ftwinfnt.h ftwinfnt.h +../../include/freetype2/t1tables.h t1tables.h +../../include/freetype2/ttnameid.h ttnameid.h +../../include/freetype2/tttables.h tttables.h +../../include/freetype2/tttags.h tttags.h +../../include/freetype2/ttunpat.h ttunpat.h diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 9fe364db5..05d7ec8dc 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -172,7 +172,7 @@ include $(TOP_DIR)/builds/modules.mk # get FreeType version string, using a # poor man's `sed' emulation with make's built-in string functions # -work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype.h)) +work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype2/freetype.h)) work := $(subst |,x,$(work)) work := $(subst $(space),|,$(work)) work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work)) diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in index 269356c96..912d77965 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -137,8 +137,9 @@ if test "$echo_ft_version" = "yes" ; then fi if test "$echo_cflags" = "yes" ; then - cflags="-I${SYSROOT}$includedir/freetype2" - echo $cflags + if test "${SYSROOT}$includedir" != "/usr/include"; then + echo -I${SYSROOT}$includedir + fi fi if test "$echo_libs" = "yes" ; then diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in index a488d9609..49541b540 100644 --- a/builds/unix/freetype2.in +++ b/builds/unix/freetype2.in @@ -1,7 +1,7 @@ prefix=%prefix% exec_prefix=%exec_prefix% libdir=%libdir% -includedir=%includedir%/freetype2 +includedir=%includedir% Name: FreeType 2 URL: http://freetype.org diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index f6d459f2e..c97c06ed7 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -86,7 +86,7 @@ FT_BEGIN_HEADER #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */ /* Following cpp computation of the bit length of int and long */ - /* is copied from default include/config/ftconfig.h. */ + /* is copied from default include/freetype2/config/ftconfig.h. */ /* If any improvement is required for this file, it should be */ /* applied to the original header file for the builders that */ /* do not use configure script. */ diff --git a/builds/unix/install.mk b/builds/unix/install.mk index 35cff2021..5b4a19ea0 100644 --- a/builds/unix/install.mk +++ b/builds/unix/install.mk @@ -45,10 +45,13 @@ install: $(PROJECT_LIBRARY) $(INSTALL_DATA) \ $$P $(DESTDIR)$(includedir)/freetype2/config ; \ done + $(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \ + $(DESTDIR)$(includedir)/ft2build.h -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/* -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/* -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype + -$(DELETE) $(DESTDIR)$(includedir)/freetype2/ft2build.h $(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \ $(DESTDIR)$(includedir)/freetype2/config/ftconfig.h $(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \ @@ -69,6 +72,7 @@ uninstall: -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/config -$(DELETE) $(DESTDIR)$(includedir)/freetype2/* -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 + -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h -$(DELETE) $(DESTDIR)$(bindir)/freetype-config -$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4 -$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index a1993b4e6..210296667 100644 --- a/builds/wince/vc2005-ce/freetype.vcproj +++ b/builds/wince/vc2005-ce/freetype.vcproj @@ -3822,15 +3822,15 @@ - + - + - + - + - + diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index 4faf5b400..70fa5176a 100644 --- a/builds/wince/vc2008-ce/freetype.vcproj +++ b/builds/wince/vc2008-ce/freetype.vcproj @@ -13469,23 +13469,23 @@ > diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj index eb52ab556..6cd6cffdc 100644 --- a/builds/windows/vc2005/freetype.vcproj +++ b/builds/windows/vc2005/freetype.vcproj @@ -629,15 +629,15 @@ - + - + - + - + - + diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj index 738fe7ccf..15dce3dfd 100644 --- a/builds/windows/vc2008/freetype.vcproj +++ b/builds/windows/vc2008/freetype.vcproj @@ -2154,23 +2154,23 @@ > diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index 3fa8cd2d0..5fef864b6 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -1706,11 +1706,11 @@ - - - - - + + + + + diff --git a/builds/windows/vc2010/freetype.vcxproj.filters b/builds/windows/vc2010/freetype.vcxproj.filters index f762b0b54..9b7c0615c 100644 --- a/builds/windows/vc2010/freetype.vcxproj.filters +++ b/builds/windows/vc2010/freetype.vcxproj.filters @@ -136,19 +136,19 @@ Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index 6f0310538..f41296549 100644 --- a/builds/windows/visualc/freetype.dsp +++ b/builds/windows/visualc/freetype.dsp @@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftconfig.h +SOURCE=..\..\..\include\freetype2\config\ftconfig.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftheader.h +SOURCE=..\..\..\include\freetype2\config\ftheader.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftmodule.h +SOURCE=..\..\..\include\freetype2\config\ftmodule.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftoption.h +SOURCE=..\..\..\include\freetype2\config\ftoption.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftstdlib.h +SOURCE=..\..\..\include\freetype2\config\ftstdlib.h # End Source File # End Group # End Target diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index f43496494..d5baa4b6d 100644 --- a/builds/windows/visualc/freetype.vcproj +++ b/builds/windows/visualc/freetype.vcproj @@ -2153,23 +2153,23 @@ > diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index 6f0310538..f41296549 100644 --- a/builds/windows/visualce/freetype.dsp +++ b/builds/windows/visualce/freetype.dsp @@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftconfig.h +SOURCE=..\..\..\include\freetype2\config\ftconfig.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftheader.h +SOURCE=..\..\..\include\freetype2\config\ftheader.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftmodule.h +SOURCE=..\..\..\include\freetype2\config\ftmodule.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftoption.h +SOURCE=..\..\..\include\freetype2\config\ftoption.h # End Source File # Begin Source File -SOURCE=..\..\..\include\config\ftstdlib.h +SOURCE=..\..\..\include\freetype2\config\ftstdlib.h # End Source File # End Group # End Target diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index 69a9e97e8..dcd384b20 100644 --- a/builds/windows/visualce/freetype.vcproj +++ b/builds/windows/visualce/freetype.vcproj @@ -13859,23 +13859,23 @@ > diff --git a/devel/ft2build.h b/devel/ft2build.h index 8e9653dbd..67aaa948e 100644 --- a/devel/ft2build.h +++ b/devel/ft2build.h @@ -32,7 +32,7 @@ #define FT_CONFIG_OPTIONS_H -#include +#include #endif /* __FT2BUILD_H__ */ diff --git a/devel/ftoption.h b/devel/ftoption.h index ed63aa0cf..0bfc24bc4 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -38,9 +38,9 @@ FT_BEGIN_HEADER /* library from a single source directory. */ /* */ /* - You can put a copy of this file in your build directory, more */ - /* precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the */ - /* name of a directory that is included _before_ the FreeType include */ - /* path during compilation. */ + /* precisely in `$BUILD/freetype2/config/ftoption.h', where `$BUILD' */ + /* is the name of a directory that is included _before_ the FreeType */ + /* include path during compilation. */ /* */ /* The default FreeType Makefiles and Jamfiles use the build */ /* directory `builds/' by default, but you can easily change */ @@ -51,7 +51,7 @@ FT_BEGIN_HEADER /* locate this file during the build. For example, */ /* */ /* #define FT_CONFIG_OPTIONS_H */ - /* #include */ + /* #include */ /* */ /* will use `$BUILD/myftoptions.h' instead of this file for macro */ /* definitions. */ @@ -59,7 +59,7 @@ FT_BEGIN_HEADER /* Note also that you can similarly pre-define the macro */ /* FT_CONFIG_MODULES_H used to locate the file listing of the modules */ /* that are statically linked to the library at compile time. By */ - /* default, this file is . */ + /* default, this file is . */ /* */ /* We highly recommend using the third method whenever possible. */ /* */ diff --git a/docs/CHANGES b/docs/CHANGES index bc177cff6..fe5ebd51f 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,3 +1,30 @@ +CHANGES BETWEEN 2.6 and 2.6.1 + + I. IMPORTANT CHANGES + + - The header file layout has been slightly changed (again). After + installation, the file `ft2build.h' is now located in + `/include'. Additionally, the header directory include + path has changed from `/include/freetype2' to simply + `/include'. + + Doing so reduces the possibility of header file name clashes + (e.g., FTGL's `FTGlyph.h' with FreeType's `ftglyph.h' on case + insensitive file systems like Mac OS X or Windows). + + Applications that use (a) `freetype-config' or FreeType's + `freetype2.pc' file pkg-config to get the include directory for + the compiler, and (b) the documented way for header inclusion + like + + #include + #include FT_FREETYPE_H + ... + + don't need any change to the source code. + + +====================================================================== CHANGES BETWEEN 2.5.5 and 2.6 diff --git a/docs/CUSTOMIZE b/docs/CUSTOMIZE index 831edf679..612beb793 100644 --- a/docs/CUSTOMIZE +++ b/docs/CUSTOMIZE @@ -8,7 +8,7 @@ How to customize the compilation of the library I. Configuration macros - The file found in `include/config/ftoption.h' contains a list of + The file `include/freetype2/config/ftoption.h' contains a list of commented configuration macros that can be toggled by developers to indicate which features should be active while building the library. @@ -35,9 +35,9 @@ II. Modules list can keep the source files `clean'. If you don't use GNU make you have to manually edit the file - `include/config/ftmodule.h' (which is *not* used with if compiled - with GNU make) to add or remove the drivers and components you want - to compile into the library. See `INSTALL.ANY' for more + `include/freetype2/config/ftmodule.h' (which is *not* used with if + compiled with GNU make) to add or remove the drivers and components + you want to compile into the library. See `INSTALL.ANY' for more information. @@ -95,8 +95,9 @@ IV. Overriding default configuration and module headers #include FT_CONFIG_OPTIONS_H #include FT_CONFIG_MODULES_H - are compiled. Their default values being and - , you can do something like: + are compiled. Their default values being + and , + you can do something like: custom/ config/ @@ -122,7 +123,7 @@ IV. Overriding default configuration and module headers #define FT_CONFIG_OPTIONS_H #define FT_CONFIG_MODULES_H - #include + #include #endif /* __FT2_BUILD_MY_PLATFORM_H__ */ diff --git a/docs/INSTALL.ANY b/docs/INSTALL.ANY index e7d6ddd18..aa0bbb767 100644 --- a/docs/INSTALL.ANY +++ b/docs/INSTALL.ANY @@ -16,8 +16,8 @@ I. Standard procedure which are not correctly supported by this compiler while being ISO C compliant! - * You need to add the directories `freetype2/include' to your - include path when compiling the library. + * You need to add the directory `include' to your include path when + compiling the library. * FreeType 2 is made of several components; each of them is located in a subdirectory of `freetype2/src'. For example, @@ -103,7 +103,7 @@ I. Standard procedure `type1cid.c' needs `psaux.c', `pshinter.c', and `psnames.c' `type42.c' needs `truetype.c' - Please consult the central `include/config/ftoption.h' + Please consult the central `include/freetype2/config/ftoption.h' configuration file for details on additional libraries necessary for some optional features. @@ -132,10 +132,10 @@ II. Support for flat-directory compilation 2. Compile sources - cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftsystem.c - cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftinit.c - cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftdebug.c - cc -c -Ifreetype2/include -DFT2_BUILD_LIBRARY ftbase.c + cc -c -Iinclude -DFT2_BUILD_LIBRARY ftsystem.c + cc -c -Iinclude -DFT2_BUILD_LIBRARY ftinit.c + cc -c -Iinclude -DFT2_BUILD_LIBRARY ftdebug.c + cc -c -Iinclude -DFT2_BUILD_LIBRARY ftbase.c etc. You don't need to define the FT_FLAT_COMPILATION macro (as this diff --git a/docs/release b/docs/release index bd92b23f9..7fe45477c 100644 --- a/docs/release +++ b/docs/release @@ -1,7 +1,7 @@ How to prepare a new release ---------------------------- -. include/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR, +. include/freetype2/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR, and FREETYPE_PATCH. . Update version numbers in all files where necessary (for example, do diff --git a/include/config/ftconfig.h b/include/freetype2/config/ftconfig.h similarity index 100% rename from include/config/ftconfig.h rename to include/freetype2/config/ftconfig.h diff --git a/include/config/ftheader.h b/include/freetype2/config/ftheader.h similarity index 89% rename from include/config/ftheader.h rename to include/freetype2/config/ftheader.h index 4906bc1f2..f9419f5e0 100644 --- a/include/config/ftheader.h +++ b/include/freetype2/config/ftheader.h @@ -107,7 +107,7 @@ * */ #ifndef FT_CONFIG_CONFIG_H -#define FT_CONFIG_CONFIG_H +#define FT_CONFIG_CONFIG_H #endif @@ -122,7 +122,7 @@ * */ #ifndef FT_CONFIG_STANDARD_LIBRARY_H -#define FT_CONFIG_STANDARD_LIBRARY_H +#define FT_CONFIG_STANDARD_LIBRARY_H #endif @@ -137,7 +137,7 @@ * */ #ifndef FT_CONFIG_OPTIONS_H -#define FT_CONFIG_OPTIONS_H +#define FT_CONFIG_OPTIONS_H #endif @@ -153,7 +153,7 @@ * */ #ifndef FT_CONFIG_MODULES_H -#define FT_CONFIG_MODULES_H +#define FT_CONFIG_MODULES_H #endif /* */ @@ -170,7 +170,7 @@ * base FreeType~2 API. * */ -#define FT_FREETYPE_H +#define FT_FREETYPE_H /************************************************************************* @@ -185,7 +185,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_ERRORS_H +#define FT_ERRORS_H /************************************************************************* @@ -198,7 +198,7 @@ * list of FreeType~2 module error offsets (and messages). * */ -#define FT_MODULE_ERRORS_H +#define FT_MODULE_ERRORS_H /************************************************************************* @@ -214,7 +214,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_SYSTEM_H +#define FT_SYSTEM_H /************************************************************************* @@ -230,7 +230,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_IMAGE_H +#define FT_IMAGE_H /************************************************************************* @@ -245,7 +245,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_TYPES_H +#define FT_TYPES_H /************************************************************************* @@ -260,7 +260,7 @@ * (Most applications will never need to include this file.) * */ -#define FT_LIST_H +#define FT_LIST_H /************************************************************************* @@ -273,7 +273,7 @@ * scalable outline management API of FreeType~2. * */ -#define FT_OUTLINE_H +#define FT_OUTLINE_H /************************************************************************* @@ -286,7 +286,7 @@ * API which manages multiple @FT_Size objects per face. * */ -#define FT_SIZES_H +#define FT_SIZES_H /************************************************************************* @@ -299,7 +299,7 @@ * module management API of FreeType~2. * */ -#define FT_MODULE_H +#define FT_MODULE_H /************************************************************************* @@ -312,7 +312,7 @@ * renderer module management API of FreeType~2. * */ -#define FT_RENDER_H +#define FT_RENDER_H /************************************************************************* @@ -325,7 +325,7 @@ * structures and macros related to the auto-hinting module. * */ -#define FT_AUTOHINTER_H +#define FT_AUTOHINTER_H /************************************************************************* @@ -338,7 +338,7 @@ * structures and macros related to the CFF driver module. * */ -#define FT_CFF_DRIVER_H +#define FT_CFF_DRIVER_H /************************************************************************* @@ -351,7 +351,7 @@ * structures and macros related to the TrueType driver module. * */ -#define FT_TRUETYPE_DRIVER_H +#define FT_TRUETYPE_DRIVER_H /************************************************************************* @@ -364,7 +364,7 @@ * types and API specific to the Type~1 format. * */ -#define FT_TYPE1_TABLES_H +#define FT_TYPE1_TABLES_H /************************************************************************* @@ -379,7 +379,7 @@ * definitions, taken from the TrueType and OpenType specifications. * */ -#define FT_TRUETYPE_IDS_H +#define FT_TRUETYPE_IDS_H /************************************************************************* @@ -392,7 +392,7 @@ * types and API specific to the TrueType (as well as OpenType) format. * */ -#define FT_TRUETYPE_TABLES_H +#define FT_TRUETYPE_TABLES_H /************************************************************************* @@ -406,7 +406,7 @@ * SFNT-based font formats (i.e., TrueType and OpenType). * */ -#define FT_TRUETYPE_TAGS_H +#define FT_TRUETYPE_TAGS_H /************************************************************************* @@ -420,7 +420,7 @@ * face. * */ -#define FT_BDF_H +#define FT_BDF_H /************************************************************************* @@ -434,7 +434,7 @@ * face. * */ -#define FT_CID_H +#define FT_CID_H /************************************************************************* @@ -447,7 +447,7 @@ * definitions of an API which supports gzip-compressed files. * */ -#define FT_GZIP_H +#define FT_GZIP_H /************************************************************************* @@ -460,7 +460,7 @@ * definitions of an API which supports LZW-compressed files. * */ -#define FT_LZW_H +#define FT_LZW_H /************************************************************************* @@ -473,7 +473,7 @@ * definitions of an API which supports bzip2-compressed files. * */ -#define FT_BZIP2_H +#define FT_BZIP2_H /************************************************************************* @@ -486,7 +486,7 @@ * definitions of an API which supports Windows FNT files. * */ -#define FT_WINFONTS_H +#define FT_WINFONTS_H /************************************************************************* @@ -499,7 +499,7 @@ * API of the optional glyph management component. * */ -#define FT_GLYPH_H +#define FT_GLYPH_H /************************************************************************* @@ -512,7 +512,7 @@ * API of the optional bitmap conversion component. * */ -#define FT_BITMAP_H +#define FT_BITMAP_H /************************************************************************* @@ -525,7 +525,7 @@ * API of the optional exact bounding box computation routines. * */ -#define FT_BBOX_H +#define FT_BBOX_H /************************************************************************* @@ -538,7 +538,7 @@ * API of the optional FreeType~2 cache sub-system. * */ -#define FT_CACHE_H +#define FT_CACHE_H /************************************************************************* @@ -612,7 +612,7 @@ * compiled on the Mac (note that the base API still works though). * */ -#define FT_MAC_H +#define FT_MAC_H /************************************************************************* @@ -625,7 +625,7 @@ * optional multiple-masters management API of FreeType~2. * */ -#define FT_MULTIPLE_MASTERS_H +#define FT_MULTIPLE_MASTERS_H /************************************************************************* @@ -639,7 +639,7 @@ * SFNT-based font formats (i.e., TrueType and OpenType). * */ -#define FT_SFNT_NAMES_H +#define FT_SFNT_NAMES_H /************************************************************************* @@ -653,7 +653,7 @@ * GPOS, GSUB, JSTF). * */ -#define FT_OPENTYPE_VALIDATE_H +#define FT_OPENTYPE_VALIDATE_H /************************************************************************* @@ -667,7 +667,7 @@ * mort, morx, bsln, just, kern, opbd, trak, prop). * */ -#define FT_GX_VALIDATE_H +#define FT_GX_VALIDATE_H /************************************************************************* @@ -680,7 +680,7 @@ * FreeType~2 API which accesses PFR-specific data. * */ -#define FT_PFR_H +#define FT_PFR_H /************************************************************************* @@ -692,7 +692,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which provides functions to stroke outline paths. */ -#define FT_STROKER_H +#define FT_STROKER_H /************************************************************************* @@ -704,7 +704,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs artificial obliquing and emboldening. */ -#define FT_SYNTHESIS_H +#define FT_SYNTHESIS_H /************************************************************************* @@ -716,7 +716,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which provides functions specific to font formats. */ -#define FT_FONT_FORMATS_H +#define FT_FONT_FORMATS_H /* deprecated */ #define FT_XFREE86_H FT_FONT_FORMATS_H @@ -732,7 +732,7 @@ * FreeType~2 API which performs trigonometric computations (e.g., * cosines and arc tangents). */ -#define FT_TRIGONOMETRY_H +#define FT_TRIGONOMETRY_H /************************************************************************* @@ -744,7 +744,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_LCD_FILTER_H +#define FT_LCD_FILTER_H /************************************************************************* @@ -756,7 +756,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_UNPATENTED_HINTING_H +#define FT_UNPATENTED_HINTING_H /************************************************************************* @@ -768,7 +768,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_INCREMENTAL_H +#define FT_INCREMENTAL_H /************************************************************************* @@ -780,7 +780,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which returns entries from the TrueType GASP table. */ -#define FT_GASP_H +#define FT_GASP_H /************************************************************************* @@ -792,30 +792,30 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which returns individual and ranged glyph advances. */ -#define FT_ADVANCES_H +#define FT_ADVANCES_H /* */ -#define FT_ERROR_DEFINITIONS_H +#define FT_ERROR_DEFINITIONS_H /* The internals of the cache sub-system are no longer exposed. We */ /* default to FT_CACHE_H at the moment just in case, but we know of */ /* no rogue client that uses them. */ /* */ -#define FT_CACHE_MANAGER_H -#define FT_CACHE_INTERNAL_MRU_H -#define FT_CACHE_INTERNAL_MANAGER_H -#define FT_CACHE_INTERNAL_CACHE_H -#define FT_CACHE_INTERNAL_GLYPH_H -#define FT_CACHE_INTERNAL_IMAGE_H -#define FT_CACHE_INTERNAL_SBITS_H +#define FT_CACHE_MANAGER_H +#define FT_CACHE_INTERNAL_MRU_H +#define FT_CACHE_INTERNAL_MANAGER_H +#define FT_CACHE_INTERNAL_CACHE_H +#define FT_CACHE_INTERNAL_GLYPH_H +#define FT_CACHE_INTERNAL_IMAGE_H +#define FT_CACHE_INTERNAL_SBITS_H -#define FT_INCREMENTAL_H +#define FT_INCREMENTAL_H -#define FT_TRUETYPE_UNPATENTED_H +#define FT_TRUETYPE_UNPATENTED_H /* @@ -823,7 +823,7 @@ * only when building the library. */ #ifdef FT2_BUILD_LIBRARY -#define FT_INTERNAL_INTERNAL_H +#define FT_INTERNAL_INTERNAL_H #include FT_INTERNAL_INTERNAL_H #endif /* FT2_BUILD_LIBRARY */ diff --git a/include/config/ftmodule.h b/include/freetype2/config/ftmodule.h similarity index 100% rename from include/config/ftmodule.h rename to include/freetype2/config/ftmodule.h diff --git a/include/config/ftoption.h b/include/freetype2/config/ftoption.h similarity index 99% rename from include/config/ftoption.h rename to include/freetype2/config/ftoption.h index 1536c7236..390464517 100644 --- a/include/config/ftoption.h +++ b/include/freetype2/config/ftoption.h @@ -38,9 +38,9 @@ FT_BEGIN_HEADER /* library from a single source directory. */ /* */ /* - You can put a copy of this file in your build directory, more */ - /* precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the */ - /* name of a directory that is included _before_ the FreeType include */ - /* path during compilation. */ + /* precisely in `$BUILD/freetype2/config/ftoption.h', where `$BUILD' */ + /* is the name of a directory that is included _before_ the FreeType */ + /* include path during compilation. */ /* */ /* The default FreeType Makefiles and Jamfiles use the build */ /* directory `builds/' by default, but you can easily change */ @@ -51,7 +51,7 @@ FT_BEGIN_HEADER /* locate this file during the build. For example, */ /* */ /* #define FT_CONFIG_OPTIONS_H */ - /* #include */ + /* #include */ /* */ /* will use `$BUILD/myftoptions.h' instead of this file for macro */ /* definitions. */ @@ -59,7 +59,7 @@ FT_BEGIN_HEADER /* Note also that you can similarly pre-define the macro */ /* FT_CONFIG_MODULES_H used to locate the file listing of the modules */ /* that are statically linked to the library at compile time. By */ - /* default, this file is . */ + /* default, this file is . */ /* */ /* We highly recommend using the third method whenever possible. */ /* */ diff --git a/include/config/ftstdlib.h b/include/freetype2/config/ftstdlib.h similarity index 100% rename from include/config/ftstdlib.h rename to include/freetype2/config/ftstdlib.h diff --git a/include/freetype.h b/include/freetype2/freetype.h similarity index 100% rename from include/freetype.h rename to include/freetype2/freetype.h diff --git a/include/ftadvanc.h b/include/freetype2/ftadvanc.h similarity index 100% rename from include/ftadvanc.h rename to include/freetype2/ftadvanc.h diff --git a/include/ftautoh.h b/include/freetype2/ftautoh.h similarity index 100% rename from include/ftautoh.h rename to include/freetype2/ftautoh.h diff --git a/include/ftbbox.h b/include/freetype2/ftbbox.h similarity index 100% rename from include/ftbbox.h rename to include/freetype2/ftbbox.h diff --git a/include/ftbdf.h b/include/freetype2/ftbdf.h similarity index 100% rename from include/ftbdf.h rename to include/freetype2/ftbdf.h diff --git a/include/ftbitmap.h b/include/freetype2/ftbitmap.h similarity index 100% rename from include/ftbitmap.h rename to include/freetype2/ftbitmap.h diff --git a/include/ftbzip2.h b/include/freetype2/ftbzip2.h similarity index 100% rename from include/ftbzip2.h rename to include/freetype2/ftbzip2.h diff --git a/include/ftcache.h b/include/freetype2/ftcache.h similarity index 100% rename from include/ftcache.h rename to include/freetype2/ftcache.h diff --git a/include/ftcffdrv.h b/include/freetype2/ftcffdrv.h similarity index 100% rename from include/ftcffdrv.h rename to include/freetype2/ftcffdrv.h diff --git a/include/ftchapters.h b/include/freetype2/ftchapters.h similarity index 100% rename from include/ftchapters.h rename to include/freetype2/ftchapters.h diff --git a/include/ftcid.h b/include/freetype2/ftcid.h similarity index 100% rename from include/ftcid.h rename to include/freetype2/ftcid.h diff --git a/include/fterrdef.h b/include/freetype2/fterrdef.h similarity index 100% rename from include/fterrdef.h rename to include/freetype2/fterrdef.h diff --git a/include/fterrors.h b/include/freetype2/fterrors.h similarity index 100% rename from include/fterrors.h rename to include/freetype2/fterrors.h diff --git a/include/ftfntfmt.h b/include/freetype2/ftfntfmt.h similarity index 100% rename from include/ftfntfmt.h rename to include/freetype2/ftfntfmt.h diff --git a/include/ftgasp.h b/include/freetype2/ftgasp.h similarity index 100% rename from include/ftgasp.h rename to include/freetype2/ftgasp.h diff --git a/include/ftglyph.h b/include/freetype2/ftglyph.h similarity index 100% rename from include/ftglyph.h rename to include/freetype2/ftglyph.h diff --git a/include/ftgxval.h b/include/freetype2/ftgxval.h similarity index 100% rename from include/ftgxval.h rename to include/freetype2/ftgxval.h diff --git a/include/ftgzip.h b/include/freetype2/ftgzip.h similarity index 100% rename from include/ftgzip.h rename to include/freetype2/ftgzip.h diff --git a/include/ftimage.h b/include/freetype2/ftimage.h similarity index 100% rename from include/ftimage.h rename to include/freetype2/ftimage.h diff --git a/include/ftincrem.h b/include/freetype2/ftincrem.h similarity index 100% rename from include/ftincrem.h rename to include/freetype2/ftincrem.h diff --git a/include/ftlcdfil.h b/include/freetype2/ftlcdfil.h similarity index 100% rename from include/ftlcdfil.h rename to include/freetype2/ftlcdfil.h diff --git a/include/ftlist.h b/include/freetype2/ftlist.h similarity index 100% rename from include/ftlist.h rename to include/freetype2/ftlist.h diff --git a/include/ftlzw.h b/include/freetype2/ftlzw.h similarity index 100% rename from include/ftlzw.h rename to include/freetype2/ftlzw.h diff --git a/include/ftmac.h b/include/freetype2/ftmac.h similarity index 100% rename from include/ftmac.h rename to include/freetype2/ftmac.h diff --git a/include/ftmm.h b/include/freetype2/ftmm.h similarity index 100% rename from include/ftmm.h rename to include/freetype2/ftmm.h diff --git a/include/ftmodapi.h b/include/freetype2/ftmodapi.h similarity index 100% rename from include/ftmodapi.h rename to include/freetype2/ftmodapi.h diff --git a/include/ftmoderr.h b/include/freetype2/ftmoderr.h similarity index 100% rename from include/ftmoderr.h rename to include/freetype2/ftmoderr.h diff --git a/include/ftotval.h b/include/freetype2/ftotval.h similarity index 100% rename from include/ftotval.h rename to include/freetype2/ftotval.h diff --git a/include/ftoutln.h b/include/freetype2/ftoutln.h similarity index 100% rename from include/ftoutln.h rename to include/freetype2/ftoutln.h diff --git a/include/ftpfr.h b/include/freetype2/ftpfr.h similarity index 100% rename from include/ftpfr.h rename to include/freetype2/ftpfr.h diff --git a/include/ftrender.h b/include/freetype2/ftrender.h similarity index 100% rename from include/ftrender.h rename to include/freetype2/ftrender.h diff --git a/include/ftsizes.h b/include/freetype2/ftsizes.h similarity index 100% rename from include/ftsizes.h rename to include/freetype2/ftsizes.h diff --git a/include/ftsnames.h b/include/freetype2/ftsnames.h similarity index 100% rename from include/ftsnames.h rename to include/freetype2/ftsnames.h diff --git a/include/ftstroke.h b/include/freetype2/ftstroke.h similarity index 100% rename from include/ftstroke.h rename to include/freetype2/ftstroke.h diff --git a/include/ftsynth.h b/include/freetype2/ftsynth.h similarity index 100% rename from include/ftsynth.h rename to include/freetype2/ftsynth.h diff --git a/include/ftsystem.h b/include/freetype2/ftsystem.h similarity index 100% rename from include/ftsystem.h rename to include/freetype2/ftsystem.h diff --git a/include/fttrigon.h b/include/freetype2/fttrigon.h similarity index 100% rename from include/fttrigon.h rename to include/freetype2/fttrigon.h diff --git a/include/ftttdrv.h b/include/freetype2/ftttdrv.h similarity index 100% rename from include/ftttdrv.h rename to include/freetype2/ftttdrv.h diff --git a/include/fttypes.h b/include/freetype2/fttypes.h similarity index 100% rename from include/fttypes.h rename to include/freetype2/fttypes.h diff --git a/include/ftwinfnt.h b/include/freetype2/ftwinfnt.h similarity index 100% rename from include/ftwinfnt.h rename to include/freetype2/ftwinfnt.h diff --git a/include/internal/autohint.h b/include/freetype2/internal/autohint.h similarity index 100% rename from include/internal/autohint.h rename to include/freetype2/internal/autohint.h diff --git a/include/internal/ftcalc.h b/include/freetype2/internal/ftcalc.h similarity index 100% rename from include/internal/ftcalc.h rename to include/freetype2/internal/ftcalc.h diff --git a/include/internal/ftdebug.h b/include/freetype2/internal/ftdebug.h similarity index 100% rename from include/internal/ftdebug.h rename to include/freetype2/internal/ftdebug.h diff --git a/include/internal/ftdriver.h b/include/freetype2/internal/ftdriver.h similarity index 100% rename from include/internal/ftdriver.h rename to include/freetype2/internal/ftdriver.h diff --git a/include/internal/ftgloadr.h b/include/freetype2/internal/ftgloadr.h similarity index 100% rename from include/internal/ftgloadr.h rename to include/freetype2/internal/ftgloadr.h diff --git a/include/internal/ftmemory.h b/include/freetype2/internal/ftmemory.h similarity index 100% rename from include/internal/ftmemory.h rename to include/freetype2/internal/ftmemory.h diff --git a/include/internal/ftobjs.h b/include/freetype2/internal/ftobjs.h similarity index 100% rename from include/internal/ftobjs.h rename to include/freetype2/internal/ftobjs.h diff --git a/include/internal/ftpic.h b/include/freetype2/internal/ftpic.h similarity index 100% rename from include/internal/ftpic.h rename to include/freetype2/internal/ftpic.h diff --git a/include/internal/ftrfork.h b/include/freetype2/internal/ftrfork.h similarity index 100% rename from include/internal/ftrfork.h rename to include/freetype2/internal/ftrfork.h diff --git a/include/internal/ftserv.h b/include/freetype2/internal/ftserv.h similarity index 96% rename from include/internal/ftserv.h rename to include/freetype2/internal/ftserv.h index 8f837e475..b0b9e1063 100644 --- a/include/internal/ftserv.h +++ b/include/freetype2/internal/ftserv.h @@ -734,24 +734,24 @@ FT_BEGIN_HEADER * The header files containing the services. */ -#define FT_SERVICE_BDF_H -#define FT_SERVICE_CID_H -#define FT_SERVICE_GLYPH_DICT_H -#define FT_SERVICE_GX_VALIDATE_H -#define FT_SERVICE_KERNING_H -#define FT_SERVICE_MULTIPLE_MASTERS_H -#define FT_SERVICE_OPENTYPE_VALIDATE_H -#define FT_SERVICE_PFR_H -#define FT_SERVICE_POSTSCRIPT_CMAPS_H -#define FT_SERVICE_POSTSCRIPT_INFO_H -#define FT_SERVICE_POSTSCRIPT_NAME_H -#define FT_SERVICE_PROPERTIES_H -#define FT_SERVICE_SFNT_H -#define FT_SERVICE_TRUETYPE_ENGINE_H -#define FT_SERVICE_TT_CMAP_H -#define FT_SERVICE_WINFNT_H -#define FT_SERVICE_FONT_FORMAT_H -#define FT_SERVICE_TRUETYPE_GLYF_H +#define FT_SERVICE_BDF_H +#define FT_SERVICE_CID_H +#define FT_SERVICE_GLYPH_DICT_H +#define FT_SERVICE_GX_VALIDATE_H +#define FT_SERVICE_KERNING_H +#define FT_SERVICE_MULTIPLE_MASTERS_H +#define FT_SERVICE_OPENTYPE_VALIDATE_H +#define FT_SERVICE_PFR_H +#define FT_SERVICE_POSTSCRIPT_CMAPS_H +#define FT_SERVICE_POSTSCRIPT_INFO_H +#define FT_SERVICE_POSTSCRIPT_NAME_H +#define FT_SERVICE_PROPERTIES_H +#define FT_SERVICE_SFNT_H +#define FT_SERVICE_TRUETYPE_ENGINE_H +#define FT_SERVICE_TT_CMAP_H +#define FT_SERVICE_WINFNT_H +#define FT_SERVICE_FONT_FORMAT_H +#define FT_SERVICE_TRUETYPE_GLYF_H /* */ diff --git a/include/internal/ftstream.h b/include/freetype2/internal/ftstream.h similarity index 100% rename from include/internal/ftstream.h rename to include/freetype2/internal/ftstream.h diff --git a/include/internal/fttrace.h b/include/freetype2/internal/fttrace.h similarity index 100% rename from include/internal/fttrace.h rename to include/freetype2/internal/fttrace.h diff --git a/include/internal/ftvalid.h b/include/freetype2/internal/ftvalid.h similarity index 100% rename from include/internal/ftvalid.h rename to include/freetype2/internal/ftvalid.h diff --git a/include/internal/internal.h b/include/freetype2/internal/internal.h similarity index 61% rename from include/internal/internal.h rename to include/freetype2/internal/internal.h index 1c1fd0ee1..a3f93a153 100644 --- a/include/internal/internal.h +++ b/include/freetype2/internal/internal.h @@ -24,28 +24,28 @@ /*************************************************************************/ -#define FT_INTERNAL_OBJECTS_H -#define FT_INTERNAL_PIC_H -#define FT_INTERNAL_STREAM_H -#define FT_INTERNAL_MEMORY_H -#define FT_INTERNAL_DEBUG_H -#define FT_INTERNAL_CALC_H -#define FT_INTERNAL_DRIVER_H -#define FT_INTERNAL_TRACE_H -#define FT_INTERNAL_GLYPH_LOADER_H -#define FT_INTERNAL_SFNT_H -#define FT_INTERNAL_SERVICE_H -#define FT_INTERNAL_RFORK_H -#define FT_INTERNAL_VALIDATE_H +#define FT_INTERNAL_OBJECTS_H +#define FT_INTERNAL_PIC_H +#define FT_INTERNAL_STREAM_H +#define FT_INTERNAL_MEMORY_H +#define FT_INTERNAL_DEBUG_H +#define FT_INTERNAL_CALC_H +#define FT_INTERNAL_DRIVER_H +#define FT_INTERNAL_TRACE_H +#define FT_INTERNAL_GLYPH_LOADER_H +#define FT_INTERNAL_SFNT_H +#define FT_INTERNAL_SERVICE_H +#define FT_INTERNAL_RFORK_H +#define FT_INTERNAL_VALIDATE_H -#define FT_INTERNAL_TRUETYPE_TYPES_H -#define FT_INTERNAL_TYPE1_TYPES_H +#define FT_INTERNAL_TRUETYPE_TYPES_H +#define FT_INTERNAL_TYPE1_TYPES_H -#define FT_INTERNAL_POSTSCRIPT_AUX_H -#define FT_INTERNAL_POSTSCRIPT_HINTS_H -#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H +#define FT_INTERNAL_POSTSCRIPT_AUX_H +#define FT_INTERNAL_POSTSCRIPT_HINTS_H +#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H -#define FT_INTERNAL_AUTOHINT_H +#define FT_INTERNAL_AUTOHINT_H #if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */ diff --git a/include/internal/psaux.h b/include/freetype2/internal/psaux.h similarity index 100% rename from include/internal/psaux.h rename to include/freetype2/internal/psaux.h diff --git a/include/internal/pshints.h b/include/freetype2/internal/pshints.h similarity index 100% rename from include/internal/pshints.h rename to include/freetype2/internal/pshints.h diff --git a/include/internal/services/svbdf.h b/include/freetype2/internal/services/svbdf.h similarity index 100% rename from include/internal/services/svbdf.h rename to include/freetype2/internal/services/svbdf.h diff --git a/include/internal/services/svcid.h b/include/freetype2/internal/services/svcid.h similarity index 100% rename from include/internal/services/svcid.h rename to include/freetype2/internal/services/svcid.h diff --git a/include/internal/services/svfntfmt.h b/include/freetype2/internal/services/svfntfmt.h similarity index 100% rename from include/internal/services/svfntfmt.h rename to include/freetype2/internal/services/svfntfmt.h diff --git a/include/internal/services/svgldict.h b/include/freetype2/internal/services/svgldict.h similarity index 100% rename from include/internal/services/svgldict.h rename to include/freetype2/internal/services/svgldict.h diff --git a/include/internal/services/svgxval.h b/include/freetype2/internal/services/svgxval.h similarity index 100% rename from include/internal/services/svgxval.h rename to include/freetype2/internal/services/svgxval.h diff --git a/include/internal/services/svkern.h b/include/freetype2/internal/services/svkern.h similarity index 100% rename from include/internal/services/svkern.h rename to include/freetype2/internal/services/svkern.h diff --git a/include/internal/services/svmm.h b/include/freetype2/internal/services/svmm.h similarity index 100% rename from include/internal/services/svmm.h rename to include/freetype2/internal/services/svmm.h diff --git a/include/internal/services/svotval.h b/include/freetype2/internal/services/svotval.h similarity index 100% rename from include/internal/services/svotval.h rename to include/freetype2/internal/services/svotval.h diff --git a/include/internal/services/svpfr.h b/include/freetype2/internal/services/svpfr.h similarity index 100% rename from include/internal/services/svpfr.h rename to include/freetype2/internal/services/svpfr.h diff --git a/include/internal/services/svpostnm.h b/include/freetype2/internal/services/svpostnm.h similarity index 100% rename from include/internal/services/svpostnm.h rename to include/freetype2/internal/services/svpostnm.h diff --git a/include/internal/services/svprop.h b/include/freetype2/internal/services/svprop.h similarity index 100% rename from include/internal/services/svprop.h rename to include/freetype2/internal/services/svprop.h diff --git a/include/internal/services/svpscmap.h b/include/freetype2/internal/services/svpscmap.h similarity index 100% rename from include/internal/services/svpscmap.h rename to include/freetype2/internal/services/svpscmap.h diff --git a/include/internal/services/svpsinfo.h b/include/freetype2/internal/services/svpsinfo.h similarity index 100% rename from include/internal/services/svpsinfo.h rename to include/freetype2/internal/services/svpsinfo.h diff --git a/include/internal/services/svsfnt.h b/include/freetype2/internal/services/svsfnt.h similarity index 100% rename from include/internal/services/svsfnt.h rename to include/freetype2/internal/services/svsfnt.h diff --git a/include/internal/services/svttcmap.h b/include/freetype2/internal/services/svttcmap.h similarity index 100% rename from include/internal/services/svttcmap.h rename to include/freetype2/internal/services/svttcmap.h diff --git a/include/internal/services/svtteng.h b/include/freetype2/internal/services/svtteng.h similarity index 100% rename from include/internal/services/svtteng.h rename to include/freetype2/internal/services/svtteng.h diff --git a/include/internal/services/svttglyf.h b/include/freetype2/internal/services/svttglyf.h similarity index 100% rename from include/internal/services/svttglyf.h rename to include/freetype2/internal/services/svttglyf.h diff --git a/include/internal/services/svwinfnt.h b/include/freetype2/internal/services/svwinfnt.h similarity index 100% rename from include/internal/services/svwinfnt.h rename to include/freetype2/internal/services/svwinfnt.h diff --git a/include/internal/sfnt.h b/include/freetype2/internal/sfnt.h similarity index 100% rename from include/internal/sfnt.h rename to include/freetype2/internal/sfnt.h diff --git a/include/internal/t1types.h b/include/freetype2/internal/t1types.h similarity index 100% rename from include/internal/t1types.h rename to include/freetype2/internal/t1types.h diff --git a/include/internal/tttypes.h b/include/freetype2/internal/tttypes.h similarity index 100% rename from include/internal/tttypes.h rename to include/freetype2/internal/tttypes.h diff --git a/include/t1tables.h b/include/freetype2/t1tables.h similarity index 100% rename from include/t1tables.h rename to include/freetype2/t1tables.h diff --git a/include/ttnameid.h b/include/freetype2/ttnameid.h similarity index 100% rename from include/ttnameid.h rename to include/freetype2/ttnameid.h diff --git a/include/tttables.h b/include/freetype2/tttables.h similarity index 100% rename from include/tttables.h rename to include/freetype2/tttables.h diff --git a/include/tttags.h b/include/freetype2/tttags.h similarity index 100% rename from include/tttags.h rename to include/freetype2/tttags.h diff --git a/include/ttunpat.h b/include/freetype2/ttunpat.h similarity index 100% rename from include/ttunpat.h rename to include/freetype2/ttunpat.h diff --git a/include/ft2build.h b/include/ft2build.h index 09c19d42a..9483d3307 100644 --- a/include/ft2build.h +++ b/include/ft2build.h @@ -34,7 +34,7 @@ #ifndef __FT2BUILD_H__ #define __FT2BUILD_H__ -#include +#include #endif /* __FT2BUILD_H__ */ diff --git a/modules.cfg b/modules.cfg index 9ba66dfc8..3d70a7c72 100644 --- a/modules.cfg +++ b/modules.cfg @@ -19,7 +19,7 @@ # activate a module, remove the comment character. # # Note that many modules and components are further controlled with macros -# in the file `include/config/ftoption.h'. +# in the file `include/freetype2/config/ftoption.h'. #### @@ -85,7 +85,7 @@ HINTING_MODULES += autofit HINTING_MODULES += pshinter # The TrueType hinting engine doesn't have a module of its own but is -# controlled in file include/config/ftoption.h +# controlled in file include/freetype2/config/ftoption.h # (TT_CONFIG_OPTION_BYTECODE_INTERPRETER and friends). @@ -106,7 +106,7 @@ RASTER_MODULES += smooth # FreeType's cache sub-system (quite stable but still in beta -- this means # that its public API is subject to change if necessary). See -# include/ftcache.h. Needs ftglyph.c. +# include/freetype2/ftcache.h. Needs ftglyph.c. AUX_MODULES += cache # TrueType GX/AAT table validation. Needs ftgxval.c below. @@ -114,17 +114,17 @@ AUX_MODULES += cache # Support for streams compressed with gzip (files with suffix .gz). # -# See include/ftgzip.h for the API. +# See include/freetype2/ftgzip.h for the API. AUX_MODULES += gzip # Support for streams compressed with LZW (files with suffix .Z). # -# See include/ftlzw.h for the API. +# See include/freetype2/ftlzw.h for the API. AUX_MODULES += lzw # Support for streams compressed with bzip2 (files with suffix .bz2). # -# See include/ftbzip2.h for the API. +# See include/freetype2/ftbzip2.h for the API. AUX_MODULES += bzip2 # OpenType table validation. Needs ftotval.c below. @@ -149,95 +149,95 @@ AUX_MODULES += psnames # Exact bounding box calculation. # -# See include/ftbbox.h for the API. +# See include/freetype2/ftbbox.h for the API. BASE_EXTENSIONS += ftbbox.c # Access BDF-specific strings. Needs BDF font driver. # -# See include/ftbdf.h for the API. +# See include/freetype2/ftbdf.h for the API. BASE_EXTENSIONS += ftbdf.c # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into # 8bpp format, and for emboldening of bitmap glyphs. # -# See include/ftbitmap.h for the API. +# See include/freetype2/ftbitmap.h for the API. BASE_EXTENSIONS += ftbitmap.c # Access CID font information. # -# See include/ftcid.h for the API. +# See include/freetype2/ftcid.h for the API. BASE_EXTENSIONS += ftcid.c # Support functions for font formats. # -# See include/ftfntfmt.h for the API. +# See include/freetype2/ftfntfmt.h for the API. BASE_EXTENSIONS += ftfntfmt.c # Access FSType information. Needs fttype1.c. # -# See include/freetype.h for the API. +# See include/freetype2/freetype.h for the API. BASE_EXTENSIONS += ftfstype.c # Support for GASP table queries. # -# See include/ftgasp.h for the API. +# See include/freetype2/ftgasp.h for the API. BASE_EXTENSIONS += ftgasp.c # Convenience functions to handle glyphs. Needs ftbitmap.c. # -# See include/ftglyph.h for the API. +# See include/freetype2/ftglyph.h for the API. BASE_EXTENSIONS += ftglyph.c # Interface for gxvalid module. # -# See include/ftgxval.h for the API. +# See include/freetype2/ftgxval.h for the API. BASE_EXTENSIONS += ftgxval.c # Support for LCD color filtering of subpixel bitmaps. # -# See include/ftlcdfil.h for the API. +# See include/freetype2/ftlcdfil.h for the API. BASE_EXTENSIONS += ftlcdfil.c # Multiple Master font interface. # -# See include/ftmm.h for the API. +# See include/freetype2/ftmm.h for the API. BASE_EXTENSIONS += ftmm.c # Interface for otvalid module. # -# See include/ftotval.h for the API. +# See include/freetype2/ftotval.h for the API. BASE_EXTENSIONS += ftotval.c # Support for FT_Face_CheckTrueTypePatents. # -# See include/freetype.h for the API. +# See include/freetype2/freetype.h for the API. BASE_EXTENSIONS += ftpatent.c # Interface for accessing PFR-specific data. Needs PFR font driver. # -# See include/ftpfr.h for the API. +# See include/freetype2/ftpfr.h for the API. BASE_EXTENSIONS += ftpfr.c # Path stroker. Needs ftglyph.c. # -# See include/ftstroke.h for the API. +# See include/freetype2/ftstroke.h for the API. BASE_EXTENSIONS += ftstroke.c # Support for synthetic embolding and slanting of fonts. Needs ftbitmap.c. # -# See include/ftsynth.h for the API. +# See include/freetype2/ftsynth.h for the API. BASE_EXTENSIONS += ftsynth.c # Interface to access data specific to PostScript Type 1 and Type 2 (CFF) # fonts. # -# See include/t1tables.h for the API. +# See include/freetype2/t1tables.h for the API. BASE_EXTENSIONS += fttype1.c # Interface for accessing data specific to Windows FNT files. Needs winfnt # driver. # -# See include/ftwinfnt.h for the API. +# See include/freetype2/ftwinfnt.h for the API. BASE_EXTENSIONS += ftwinfnt.c #### diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c index 2cdb7c242..bbbcca8dd 100644 --- a/src/base/ftdebug.c +++ b/src/base/ftdebug.c @@ -152,8 +152,8 @@ /* the memory and stream components which are set to 7 and 5, */ /* respectively. */ /* */ - /* See the file for details of the */ - /* available toggle names. */ + /* See the file for details of */ + /* the available toggle names. */ /* */ /* The level must be between 0 and 7; 0 means quiet (except for serious */ /* runtime errors), and 7 means _very_ verbose. */ diff --git a/src/base/ftinit.c b/src/base/ftinit.c index cc95e6a6a..72d4dc9c2 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -23,8 +23,8 @@ /* FT_Add_Default_Modules(): */ /* This function is used to add the set of default modules to a */ /* fresh new library object. The set is taken from the header file */ - /* `config/ftmodule.h'. See the document `FreeType 2.0 Build */ - /* System' for more information. */ + /* `freetype2/config/ftmodule.h'. See the document `FreeType 2.0 */ + /* Build System' for more information. */ /* */ /* FT_Init_FreeType(): */ /* This function creates a system object for the current platform, */ diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index eeab14352..73ab05537 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -24,8 +24,8 @@ /* */ /* - copy `src/raster/ftraster.c' (this file) to your current directory */ /* */ - /* - copy `include/ftimage.h' and `src/raster/ftmisc.h' to your current */ - /* directory */ + /* - copy `include/freetype2/ftimage.h' and `src/raster/ftmisc.h' to */ + /* your current directory */ /* */ /* - compile `ftraster' with the _STANDALONE_ macro defined, as in */ /* */ diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 77b58f25f..cc14a0578 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -24,8 +24,8 @@ /* */ /* - copy `src/smooth/ftgrays.c' (this file) to your current directory */ /* */ - /* - copy `include/ftimage.h' and `src/smooth/ftgrays.h' to the same */ - /* directory */ + /* - copy `include/freetype2/ftimage.h' and `src/smooth/ftgrays.h' to */ + /* the same directory */ /* */ /* - compile `ftgrays' with the _STANDALONE_ macro defined, as in */ /* */ diff --git a/src/tools/chktrcmp.py b/src/tools/chktrcmp.py index ce6500c7e..802cb2475 100755 --- a/src/tools/chktrcmp.py +++ b/src/tools/chktrcmp.py @@ -15,7 +15,7 @@ USED_COMPONENT = {} KNOWN_COMPONENT = {} SRC_FILE_DIRS = [ "src" ] -TRACE_DEF_FILES = [ "include/internal/fttrace.h" ] +TRACE_DEF_FILES = [ "include/freetype2/internal/fttrace.h" ] # -------------------------------------------------------------- diff --git a/src/tools/docmaker/content.py b/src/tools/docmaker/content.py index 6887f0b84..322477ef0 100644 --- a/src/tools/docmaker/content.py +++ b/src/tools/docmaker/content.py @@ -53,9 +53,10 @@ re_identifier = re.compile( r'((?:\w|-)*)' ) # # We collect macro names ending in `_H' (group 1), as defined in -# `config/ftheader.h'. While outputting the object data, we use this info -# together with the object's file location (group 2) to emit the appropriate -# header file macro and its associated file name before the object itself. +# `freetype2/config/ftheader.h'. While outputting the object data, we use +# this info together with the object's file location (group 2) to emit the +# appropriate header file macro and its associated file name before the +# object itself. # # Example: #