From 314f35ad2e8931f9061566fa224f6fbec8dfdb41 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 4 Apr 2009 09:20:14 +0200 Subject: [PATCH] ftnames.c -> ftsnames.c * src/base/ftnames.c: Rename to... * src/base/ftsnames.c: This. * src/base/Jamfile, src/base/rules.mk, src/base/ftbase.c: Updated. --- ChangeLog | 8 ++++++++ devel/ftoption.h | 2 +- include/freetype/config/ftoption.h | 2 +- src/base/Jamfile | 2 +- src/base/ftbase.c | 4 ++-- src/base/{ftnames.c => ftsnames.c} | 8 ++++---- src/base/rules.mk | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-) rename src/base/{ftnames.c => ftsnames.c} (93%) diff --git a/ChangeLog b/ChangeLog index dfc0552a0..b48436c75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-04-04 Werner Lemberg + + ftnames.c -> ftsnames.c + + * src/base/ftnames.c: Rename to... + * src/base/ftsnames.c: This. + * src/base/Jamfile, src/base/rules.mk, src/base/ftbase.c: Updated. + 2009-04-04 Werner Lemberg Add support for cmap type 13. diff --git a/devel/ftoption.h b/devel/ftoption.h index d415e28a5..202101178 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -439,7 +439,7 @@ FT_BEGIN_HEADER /* does not contain any glyph name though. */ /* */ /* Accessing SFNT names is done through the functions declared in */ - /* `freetype/ftnames.h'. */ + /* `freetype/ftsnames.h'. */ /* */ #define TT_CONFIG_OPTION_SFNT_NAMES diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 9470f727d..b5bc76913 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -439,7 +439,7 @@ FT_BEGIN_HEADER /* does not contain any glyph name though. */ /* */ /* Accessing SFNT names is done through the functions declared in */ - /* `freetype/ftnames.h'. */ + /* `freetype/ftsnames.h'. */ /* */ #define TT_CONFIG_OPTION_SFNT_NAMES diff --git a/src/base/Jamfile b/src/base/Jamfile index aba60fbe0..de327bd1e 100644 --- a/src/base/Jamfile +++ b/src/base/Jamfile @@ -18,7 +18,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ; if $(FT2_MULTI) { _sources = ftadvanc ftcalc ftdbgmem ftgloadr - ftnames ftobjs ftoutln ftrfork + ftobjs ftoutln ftrfork ftsnames ftstream fttrigon ftutil ; } diff --git a/src/base/ftbase.c b/src/base/ftbase.c index d1fe6e608..b666c7d39 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -4,7 +4,7 @@ /* */ /* Single object library component (body only). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,10 +24,10 @@ #include "ftcalc.c" #include "ftdbgmem.c" #include "ftgloadr.c" -#include "ftnames.c" #include "ftobjs.c" #include "ftoutln.c" #include "ftrfork.c" +#include "ftsnames.c" #include "ftstream.c" #include "fttrigon.c" #include "ftutil.c" diff --git a/src/base/ftnames.c b/src/base/ftsnames.c similarity index 93% rename from src/base/ftnames.c rename to src/base/ftsnames.c index 6a6417a4f..3447888ca 100644 --- a/src/base/ftnames.c +++ b/src/base/ftsnames.c @@ -1,13 +1,13 @@ /***************************************************************************/ /* */ -/* ftnames.c */ +/* ftsnames.c */ /* */ /* Simple interface to access SFNT name tables (which are used */ /* to hold font names, copyright info, notices, etc.) (body). */ /* */ /* This is _not_ used to retrieve glyph names! */ /* */ -/* Copyright 1996-2001, 2002 by */ +/* Copyright 1996-2001, 2002, 2009 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -28,7 +28,7 @@ #ifdef TT_CONFIG_OPTION_SFNT_NAMES - /* documentation is in ftnames.h */ + /* documentation is in ftsnames.h */ FT_EXPORT_DEF( FT_UInt ) FT_Get_Sfnt_Name_Count( FT_Face face ) @@ -37,7 +37,7 @@ } - /* documentation is in ftnames.h */ + /* documentation is in ftsnames.h */ FT_EXPORT_DEF( FT_Error ) FT_Get_Sfnt_Name( FT_Face face, diff --git a/src/base/rules.mk b/src/base/rules.mk index 66260e677..10f578abc 100644 --- a/src/base/rules.mk +++ b/src/base/rules.mk @@ -37,10 +37,10 @@ BASE_SRC := $(BASE_DIR)/ftadvanc.c \ $(BASE_DIR)/ftcalc.c \ $(BASE_DIR)/ftdbgmem.c \ $(BASE_DIR)/ftgloadr.c \ - $(BASE_DIR)/ftnames.c \ $(BASE_DIR)/ftobjs.c \ $(BASE_DIR)/ftoutln.c \ $(BASE_DIR)/ftrfork.c \ + $(BASE_DIR)/ftsnames.c \ $(BASE_DIR)/ftstream.c \ $(BASE_DIR)/fttrigon.c \ $(BASE_DIR)/ftutil.c