diff options
author | Werner Lemberg <wl@gnu.org> | 2015-03-11 07:32:58 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2015-03-11 08:54:08 +0100 |
commit | f4d1c11faa116daad655b50828a434babbdaed2a (patch) | |
tree | 7e6dfcd6b37d46833a425450d96c1c367d0e81e7 | |
parent | 3e587796755dbb6be2756b5cd82884feb7da9159 (diff) | |
download | freetype2-f4d1c11faa116daad655b50828a434babbdaed2a.tar.gz |
Rename `FT_Get_X11_Font_Format' to `FT_Get_Font_Format'.
* include/ftfntfmt.h, src/base/ftfntfmt.c: Implement it.
* docs/CHANGES: Updated.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | docs/CHANGES | 9 | ||||
-rw-r--r-- | include/ftfntfmt.h | 26 | ||||
-rw-r--r-- | modules.cfg | 2 | ||||
-rw-r--r-- | src/base/ftfntfmt.c | 17 |
5 files changed, 49 insertions, 13 deletions
@@ -1,5 +1,13 @@ 2015-03-11 Werner Lemberg <wl@gnu.org> + [base] Rename `FT_Get_X11_Font_Format' to `FT_Get_Font_Format'. + + * include/ftfntfmt.h, src/base/ftfntfmt.c: Implement it. + + * docs/CHANGES: Updated. + +2015-03-11 Werner Lemberg <wl@gnu.org> + Fix automatic copyright updating. * src/tools/update-copyright: Make scanning of `no-copyright' diff --git a/docs/CHANGES b/docs/CHANGES index 02dd5bdae..17fe4bcb1 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -34,10 +34,15 @@ CHANGES BETWEEN 2.5.5 and 2.6 This change doesn't break the ABI; however, it might cause compiler warnings. - - Function `FT_Bitmap_New' has been renamed to `FT_Bitmap_Init', - since this name better reflects its function. For backwards + - Function `FT_Bitmap_New' has been renamed to `FT_Bitmap_Init', + since this name better reflects its function. For backwards compatibility, the old function name is still available. + - Function `FT_Get_X11_Font_Format' has been renamed to + `FT_Get_Font_Format', since this name better reflects its + function. For backwards compatibility, the old function name is + still available. + ====================================================================== diff --git a/include/ftfntfmt.h b/include/ftfntfmt.h index c1bf146d1..b3e65e30d 100644 --- a/include/ftfntfmt.h +++ b/include/ftfntfmt.h @@ -2,7 +2,7 @@ /* */ /* ftfntfmt.h */ /* */ -/* Support functions for X11. */ +/* Support functions for font formats. */ /* */ /* Copyright 2002-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ @@ -49,22 +49,20 @@ FT_BEGIN_HEADER /* however, there are special cases (like in PDF devices) where it is */ /* important to differentiate, in spite of FreeType's uniform API. */ /* */ - /* This function is in the X11/xf86 namespace for historical reasons */ - /* and in no way depends on that windowing system. */ - /* */ /*************************************************************************/ /*************************************************************************/ /* */ /* <Function> */ - /* FT_Get_X11_Font_Format */ + /* FT_Get_Font_Format */ /* */ /* <Description> */ - /* Return a string describing the format of a given face, using values */ - /* that can be used as an X11 FONT_PROPERTY. Possible values are */ - /* `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */ - /* `PFR', and `Windows~FNT'. */ + /* Return a string describing the format of a given face. Possible */ + /* values are `TrueType', `Type~1', `BDF', `PCF', `Type~42', */ + /* `CID~Type~1', `CFF', `PFR', and `Windows~FNT'. */ + /* */ + /* The return value is suitable to be used as an X11 FONT_PROPERTY. */ /* */ /* <Input> */ /* face :: */ @@ -73,9 +71,19 @@ FT_BEGIN_HEADER /* <Return> */ /* Font format string. NULL in case of error. */ /* */ + /* <Note> */ + /* A deprecated name for the same function is */ + /* `FT_Get_X11_Font_Format'. */ + /* */ + FT_EXPORT( const char* ) + FT_Get_Font_Format( FT_Face face ); + + + /* deprecated */ FT_EXPORT( const char* ) FT_Get_X11_Font_Format( FT_Face face ); + /* */ diff --git a/modules.cfg b/modules.cfg index 32f78c11e..9ba66dfc8 100644 --- a/modules.cfg +++ b/modules.cfg @@ -168,7 +168,7 @@ BASE_EXTENSIONS += ftbitmap.c # See include/ftcid.h for the API. BASE_EXTENSIONS += ftcid.c -# Support functions for X11. +# Support functions for font formats. # # See include/ftfntfmt.h for the API. BASE_EXTENSIONS += ftfntfmt.c diff --git a/src/base/ftfntfmt.c b/src/base/ftfntfmt.c index b9e9395f2..38a5b6054 100644 --- a/src/base/ftfntfmt.c +++ b/src/base/ftfntfmt.c @@ -2,7 +2,7 @@ /* */ /* ftfntfmt.c */ /* */ -/* FreeType utility file for X11 support (body). */ +/* FreeType utility file for font formats (body). */ /* */ /* Copyright 2002-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ @@ -25,6 +25,21 @@ /* documentation is in ftfntfmt.h */ FT_EXPORT_DEF( const char* ) + FT_Get_Font_Format( FT_Face face ) + { + const char* result = NULL; + + + if ( face ) + FT_FACE_FIND_SERVICE( face, result, XF86_NAME ); + + return result; + } + + + /* deprecated function name; retained for ABI compatibility */ + + FT_EXPORT_DEF( const char* ) FT_Get_X11_Font_Format( FT_Face face ) { const char* result = NULL; |