diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-01-06 12:59:08 +0000 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-01-06 12:59:08 +0000 |
| commit | fb4defa5019dd62f802ee97d91841d92c798d399 (patch) | |
| tree | 095e40b5146abe58b9da9361956978f2f4b1eef7 /Build/source/texk/web2c/xetexdir/XeTeX_ext.c | |
| parent | ef3c2e4fe8fbfde3c1be55e647db7c99fe2f8238 (diff) | |
Some missed XeTeX changes and misc. fixes
git-svn-id: svn://tug.org/texlive/trunk@28745 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeX_ext.c')
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index baf8ff5e3c1..df7b1d19b13 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -146,10 +146,15 @@ void initversionstring(char **versions) int fc_version = FcGetVersion(); #endif FT_Int ftMajor, ftMinor, ftPatch; - int grMajor, grMinor, grBugfix; + int grMajor, grMinor, grBugfix; + UVersionInfo icuVersion; + char icu_version[U_MAX_VERSION_STRING_LENGTH] = ""; + + u_getVersion(icuVersion); + u_versionToString(icuVersion, icu_version); const_string fmt = - "Compiled with ICU version %s\n" + "Compiled with ICU version %s; using %s\n" "Compiled with zlib version %s; using %s\n" "Compiled with FreeType2 version %d.%d.%d; using %d.%d.%d\n" "Compiled with Graphite2 version %d.%d.%d; using %d.%d.%d\n" @@ -165,6 +170,7 @@ void initversionstring(char **versions) int len = strlen(fmt) + strlen(U_ICU_VERSION) + + strlen(icu_version) + strlen(ZLIB_VERSION) + strlen(zlib_version) + strlen(HB_VERSION_STRING) @@ -187,10 +193,11 @@ void initversionstring(char **versions) exit(9); } FT_Library_Version(gFreeTypeLibrary, &ftMajor, &ftMinor, &ftPatch); + gr_engine_version(&grMajor, &grMinor, &grBugfix); (void)sprintf(*versions, fmt, - U_ICU_VERSION, + U_ICU_VERSION, icu_version, ZLIB_VERSION, zlib_version, FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH, ftMajor, ftMinor, ftPatch, |