Index: third_party/freetype/src/sfnt/ttpost.c |
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttpost.c b/third_party/freetype/src/sfnt/ttpost.c |
similarity index 96% |
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttpost.c |
rename to third_party/freetype/src/sfnt/ttpost.c |
index 37688f22c5ae7ff35445d47907b01f4ecb19029e..99d800549fcadf480c2a54f84015ee2f694e449c 100644 |
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttpost.c |
+++ b/third_party/freetype/src/sfnt/ttpost.c |
@@ -5,7 +5,7 @@ |
/* Postcript name table processing for TrueType and OpenType fonts */ |
/* (body). */ |
/* */ |
-/* Copyright 1996-2003, 2006-2010, 2013 by */ |
+/* Copyright 1996-2003, 2006-2010, 2013, 2014 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -25,10 +25,10 @@ |
/*************************************************************************/ |
-#include "../../include/ft2build.h" |
-#include "../../include/freetype/internal/ftdebug.h" |
-#include "../../include/freetype/internal/ftstream.h" |
-#include "../../include/freetype/tttags.h" |
+#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
+#include FT_INTERNAL_STREAM_H |
+#include FT_TRUETYPE_TAGS_H |
#include "ttpost.h" |
#include "sferrors.h" |
@@ -50,7 +50,7 @@ |
#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES |
-#include "../../include/freetype/internal/services/svpscmap.h" |
+#include FT_SERVICE_POSTSCRIPT_CMAPS_H |
#define MAC_NAME( x ) ( (FT_String*)psnames->macintosh_name( x ) ) |
@@ -64,12 +64,12 @@ |
#define MAC_NAME( x ) ( (FT_String*)tt_post_default_names[x] ) |
- /* the 258 default Mac PS glyph names */ |
+ /* the 258 default Mac PS glyph names; see file `tools/glnames.py' */ |
static const FT_String* const tt_post_default_names[258] = |
{ |
/* 0 */ |
- ".notdef", ".null", "CR", "space", "exclam", |
+ ".notdef", ".null", "nonmarkingreturn", "space", "exclam", |
"quotedbl", "numbersign", "dollar", "percent", "ampersand", |
/* 10 */ |
"quotesingle", "parenleft", "parenright", "asterisk", "plus", |
@@ -120,7 +120,7 @@ |
"ae", "oslash", "questiondown", "exclamdown", "logicalnot", |
"radical", "florin", "approxequal", "Delta", "guillemotleft", |
/* 170 */ |
- "guillemotright", "ellipsis", "nbspace", "Agrave", "Atilde", |
+ "guillemotright", "ellipsis", "nonbreakingspace", "Agrave", "Atilde", |
"Otilde", "OE", "oe", "endash", "emdash", |
/* 180 */ |
"quotedblleft", "quotedblright", "quoteleft", "quoteright", "divide", |
@@ -144,8 +144,8 @@ |
"multiply", "onesuperior", "twosuperior", "threesuperior", "onehalf", |
"onequarter", "threequarters", "franc", "Gbreve", "gbreve", |
/* 250 */ |
- "Idot", "Scedilla", "scedilla", "Cacute", "cacute", |
- "Ccaron", "ccaron", "dmacron", |
+ "Idotaccent", "Scedilla", "scedilla", "Cacute", "cacute", |
+ "Ccaron", "ccaron", "dcroat", |
}; |