From 4e3170fc0e18249d1d6f4aa9952c5701e8df031a Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:32:18 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- data.h | 2 +- hash.c | 2 +- hash.h | 2 +- ident.c | 2 +- ident.h | 2 +- list.c | 2 +- list.h | 2 +- mkfontscale.c | 36 ++++++++++++++++++++++++++++-------- mkfontscale.man | 2 +- 9 files changed, 36 insertions(+), 16 deletions(-) diff --git a/data.h b/data.h index e006271..59521ac 100644 --- a/data.h +++ b/data.h @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/data.h,v 1.4 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86: xc/programs/mkfontscale/data.h,v 1.3 2003/04/30 20:39:43 herrb Exp $ */ #ifndef _MKS_DATA_H_ #define _MKS_DATA_H_ 1 diff --git a/hash.c b/hash.c index 97d1f1b..36c95a9 100644 --- a/hash.c +++ b/hash.c @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/hash.c,v 1.3 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86$ */ #include #include diff --git a/hash.h b/hash.h index d8dcf4d..a2ed339 100644 --- a/hash.h +++ b/hash.h @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/hash.h,v 1.3 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86$ */ #ifndef _MKS_HASH_H_ #define _MKS_HASH_H_ 1 diff --git a/ident.c b/ident.c index cfbe6c1..18402d2 100644 --- a/ident.c +++ b/ident.c @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/ident.c,v 1.4 2003/10/24 20:38:13 tsi Exp $ */ +/* $XFree86: xc/programs/mkfontscale/ident.c,v 1.3tsi Exp $ */ /* The function identifyBitmap returns -1 if filename is definitively not a font file, 1 if it is a single-face bitmap font with a XLFD name, diff --git a/ident.h b/ident.h index ebe5866..03933a3 100644 --- a/ident.h +++ b/ident.h @@ -20,7 +20,7 @@ THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/ident.h,v 1.2 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86$ */ #ifndef _MKS_IDENT_H_ #define _MKS_IDENT_H_ 1 diff --git a/list.c b/list.c index ff33a0e..2f5bc2b 100644 --- a/list.c +++ b/list.c @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/list.c,v 1.6 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86: xc/programs/mkfontscale/list.c,v 1.5 2003/07/04 16:24:30 eich Exp $ */ #include #include diff --git a/list.h b/list.h index 6c1ed35..68fa35f 100644 --- a/list.h +++ b/list.h @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/list.h,v 1.3 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86: xc/programs/mkfontscale/list.h,v 1.2 2003/06/20 15:49:52 eich Exp $ */ #ifndef _MKS_LIST_H_ #define _MKS_LIST_H_ 1 diff --git a/mkfontscale.c b/mkfontscale.c index 3036752..e891b59 100644 --- a/mkfontscale.c +++ b/mkfontscale.c @@ -19,7 +19,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.17 2003/11/21 05:22:08 dawes Exp $ */ +/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.1.4.3.4.2 2004/03/04 19:49:27 kaleb Exp $ */ +/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.21 2003/12/10 02:58:07 dawes Exp $ */ #include #include @@ -30,6 +31,7 @@ #include #include +#include #include #include #include FT_FREETYPE_H @@ -45,6 +47,12 @@ #include "data.h" #include "ident.h" +#ifdef NEED_SNPRINTF +#undef SCOPE +#define SCOPE static +#include "snprintf.c" +#endif + #define NPREFIX 1024 #ifndef MAXFONTFILENAMELEN @@ -56,15 +64,19 @@ char *encodings_array[] = { "iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5", - "iso8859-6", "iso8859-7", "iso8859-8", "iso8859-9", "iso8859-10", - "iso8859-11", "iso8859-12", "iso8859-13", "iso8859-14", "iso8859-15", - "koi8-r", "koi8-u", "koi8-ru", "koi8-e", "koi8-uni", + "iso8859-6", "iso8859-6.8", "iso8859-6.8x", "iso8859-6.16", + "iso8859-7", "iso8859-8", "iso8859-9", "iso8859-10", + "iso8859-11", "iso8859-12", "iso8859-13", "iso8859-14", + "iso8859-15", "iso8859-16", + "ansi-1251", "koi8-r", "koi8-u", "koi8-ru", "koi8-e", "koi8-uni", "tis620-2", + "sun.unicode.india-0", "adobe-standard", "adobe-symbol", - "ibm-cp437", "microsoft-cp1252", + "ibm-cp437", "ibm-cp850", "ibm-cp852", "ibm-cp866", "microsoft-cp1252", /* But not "adobe-dingbats", as it uses generic glyph names. */ "jisx0201.1976-0", "jisx0208.1983-0", "jisx0208.1990-0", - "jisx0212.1990-0", "big5-0", "gb2312.1980-0", + "jisx0212.1990-0", "big5-0", "big5.eten-0", "big5hkscs-0", + "gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1", "ksc5601.1987-0", "ksc5601.1992-3"}; char *extra_encodings_array[] = @@ -91,6 +103,7 @@ static float bigEncodingFuzz = 0.02; static int relative; static int doScalable; static int doBitmaps; +static int doISO10646_1_encoding; static int onlyEncodings; static ListPtr encodingsToDo; static int reencodeLegacy; @@ -104,7 +117,7 @@ usage(void) "mkfontscale [ -b ] [ -s ] [ -o filename ] [-x suffix ]\n" " [ -a encoding ] [ -f fuzz ] [ -l ] " " [ -e directory ] [ -p prefix ] [ -n ] [ -r ] \n" - " [ directory ]...\n"); + " [-u] [-U] [ directory ]...\n"); } int @@ -134,6 +147,7 @@ main(int argc, char **argv) countof(extra_encodings_array), NULL, 0); doBitmaps = 0; + doISO10646_1_encoding = 1; doScalable = 1; onlyEncodings = 0; relative = 0; @@ -185,6 +199,12 @@ main(int argc, char **argv) } else if(strcmp(argv[argn], "-b") == 0) { doBitmaps = 1; argn++; + } else if(strcmp(argv[argn], "-u") == 0) { + doISO10646_1_encoding = 0; + argn++; + } else if(strcmp(argv[argn], "-U") == 0) { + doISO10646_1_encoding = 1; + argn++; } else if(strcmp(argv[argn], "-s") == 0) { doScalable = 0; argn++; @@ -1137,7 +1157,7 @@ checkExtraEncoding(FT_Face face, char *encoding_name, int found) int c; if(strcasecmp(encoding_name, "iso10646-1") == 0) { - if(find_cmap(FONT_ENCODING_UNICODE, -1, -1, face)) { + if(doISO10646_1_encoding && find_cmap(FONT_ENCODING_UNICODE, -1, -1, face)) { int found = 0; /* Export as Unicode if there are at least 15 BMP characters that are not a space or ignored. */ diff --git a/mkfontscale.man b/mkfontscale.man index 5882a97..5b42eb9 100644 --- a/mkfontscale.man +++ b/mkfontscale.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/mkfontscale/mkfontscale.man,v 1.5 2003/07/04 16:24:30 eich Exp $ +.\" $XFree86: xc/programs/mkfontscale/mkfontscale.man,v 1.4 2003/06/20 15:49:52 eich Exp $ .\" .TH MKFONTSCALE 1 __vendorversion__ .SH NAME -- cgit v1.2.3