rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[autofit] s/DFLT/NONE/, s/dflt/none/.

This commit is contained in:
Werner Lemberg 2013-12-10 13:24:07 +01:00
parent 45244f8043
commit 9193259cf2
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-12-10 Werner Lemberg <wl@gnu.org>
[autofit] s/DFLT/NONE/, s/dflt/none/.
2013-12-10 Werner Lemberg <wl@gnu.org>
[autofit] s/AF_SCRIPT_NONE/AF_SCRIPT_UNASSIGNED/.

4
src/autofit/afdummy.c
View File

@ -69,9 +69,9 @@
AF_DEFINE_SCRIPT_CLASS(
af_dflt_script_class,
af_none_script_class,
AF_SCRIPT_DFLT,
AF_SCRIPT_NONE,
(AF_Blue_Stringset)0,
AF_WRITING_SYSTEM_DUMMY,

2
src/autofit/afdummy.h
View File

@ -31,7 +31,7 @@ FT_BEGIN_HEADER
AF_DECLARE_WRITING_SYSTEM_CLASS( af_dummy_writing_system_class )
AF_DECLARE_SCRIPT_CLASS( af_dflt_script_class )
AF_DECLARE_SCRIPT_CLASS( af_none_script_class )
/* */

2
src/autofit/afglobal.c
View File

@ -276,7 +276,7 @@
/* if we have a forced script (via `options'), use it, */
/* otherwise look into `glyph_scripts' array */
if ( script == AF_SCRIPT_DFLT || script + 1 >= AF_SCRIPT_MAX )
if ( script == AF_SCRIPT_NONE || script + 1 >= AF_SCRIPT_MAX )
script = (AF_Script)( globals->glyph_scripts[gindex] &
AF_SCRIPT_UNASSIGNED );

2
src/autofit/afglobal.h
View File

@ -48,7 +48,7 @@ FT_BEGIN_HEADER
#ifdef AF_CONFIG_OPTION_CJK
#define AF_SCRIPT_FALLBACK AF_SCRIPT_HANI
#else
#define AF_SCRIPT_FALLBACK AF_SCRIPT_DFLT
#define AF_SCRIPT_FALLBACK AF_SCRIPT_NONE
#endif
/* a bit mask indicating an uncovered glyph */
#define AF_SCRIPT_UNASSIGNED 0x7F

2
src/autofit/afloader.c
View File

@ -530,7 +530,7 @@
if ( !error )
{
AF_ScriptMetrics metrics;
FT_UInt options = AF_SCRIPT_DFLT;
FT_UInt options = AF_SCRIPT_NONE;
#ifdef FT_OPTION_AUTOFIT2

2
src/autofit/afscript.h
View File

@ -24,7 +24,7 @@
SCRIPT( cyrl, CYRL, "Cyrillic" )
SCRIPT( deva, DEVA, "Indic scripts" )
SCRIPT( dflt, DFLT, "no script" )
SCRIPT( none, NONE, "no script" )
SCRIPT( grek, GREK, "Greek" )
SCRIPT( hani, HANI, "CJKV ideographs" )
SCRIPT( hebr, HEBR, "Hebrew" )