Mercurial > hg > xemacs-beta
comparison src/fontcolor-xlike-inc.c @ 5922:4b055de36bb9 cygwin
merging heads 2
author | Henry Thompson <ht@markup.co.uk> |
---|---|
date | Fri, 27 Feb 2015 17:47:15 +0000 |
parents | 15b0715c204d |
children |
comparison
equal
deleted
inserted
replaced
5921:68639fb08af8 | 5922:4b055de36bb9 |
---|---|
503 */ | 503 */ |
504 { | 504 { |
505 FcPattern *p = FcFontRenderPrepare (fcc, fontxft, fontxft); | 505 FcPattern *p = FcFontRenderPrepare (fcc, fontxft, fontxft); |
506 Extbyte *name; | 506 Extbyte *name; |
507 | 507 |
508 /* full name, including language coverage and repertoire */ | 508 /* full name, including language coverage and repertoire |
509 we delete 'charset' here because FcNameUnparse chokes on it */ | |
510 FcPatternDel (p, FC_CHARSET); | |
509 name = (Extbyte *) FcNameUnparse (p); | 511 name = (Extbyte *) FcNameUnparse (p); |
510 eicpy_ext (eistr_fullname, | 512 eicpy_ext (eistr_fullname, |
511 (name ? name : "NOT FOUND"), | 513 (name ? name : "NOT FOUND"), |
512 Qfc_font_name_encoding); | 514 Qfc_font_name_encoding); |
513 if (name) free (name); | 515 if (name) free (name); |
514 | 516 |
515 /* long name, omitting coverage and repertoire, plus a number | 517 /* long name, omitting coverage and repertoire, plus a number |
516 of rarely useful properties */ | 518 of rarely useful properties */ |
517 FcPatternDel (p, FC_CHARSET); | |
518 FcPatternDel (p, FC_LANG); | 519 FcPatternDel (p, FC_LANG); |
519 #ifdef FC_WIDTH | 520 #ifdef FC_WIDTH |
520 FcPatternDel (p, FC_WIDTH); | 521 FcPatternDel (p, FC_WIDTH); |
521 #endif | 522 #endif |
522 FcPatternDel (p, FC_SPACING); | 523 FcPatternDel (p, FC_SPACING); |