diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2009-05-13 21:33:32 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2009-05-13 21:33:32 (GMT) |
| commit | 79279ff1ca39daa66f69addece5c01fbfaae1d01 (patch) | |
| tree | 9a293d23d8a26d6e1a153b4d083bc0ee9206545a /generic/tkFont.c | |
| parent | 09b826d5ceae5932452b95e44dab0e169fdc0ddd (diff) | |
| download | tk-79279ff1ca39daa66f69addece5c01fbfaae1d01.zip tk-79279ff1ca39daa66f69addece5c01fbfaae1d01.tar.gz tk-79279ff1ca39daa66f69addece5c01fbfaae1d01.tar.bz2 | |
[Bug 2791352] handle parsing of type 5 font descriptions with hyphenated family name.
Diffstat (limited to 'generic/tkFont.c')
| -rw-r--r-- | generic/tkFont.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 21ff311..70240c6 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFont.c,v 1.53 2009/02/03 23:55:47 nijtmans Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.54 2009/05/13 21:33:32 patthoyts Exp $ */ #include "tkInt.h" @@ -3608,6 +3608,20 @@ ParseFontNameObj( if (result == TCL_OK) { return TCL_OK; } + + /* + * If the string failed to parse but was considered to be a XLFD + * then it may be a "-option value" string with a hyphenated family + * name as per bug 2791352 + */ + + if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) { + return TCL_ERROR; + } + + if (ConfigAttributesObj(interp, tkwin, objc, objv, faPtr) == TCL_OK) { + return TCL_OK; + } } /* |