procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Circumvent bug#70989

Browse source 
* src/ftfont.c (get_adstyle_property): Substitute a space for
unrepresentable adstyle characters.  (bug#70989)
This commit is contained in:
Po Lu 2024-05-20 20:59:32 +08:00
parent 45916eadae
commit 5957e57080
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ftfont.c
View file

@ -149,7 +149,8 @@ static Lisp_Object
get_adstyle_property (FcPattern *p)
{
FcChar8 *fcstr;
char *str, *end;
char *str, *end, *tmp;
size_t i;
Lisp_Object adstyle;
#ifdef FC_FONTFORMAT
@ -168,7 +169,18 @@ get_adstyle_property (FcPattern *p)
|| matching_prefix (str, end - str, "Oblique")
|| matching_prefix (str, end - str, "Italic"))
return Qnil;
adstyle = font_intern_prop (str, end - str, 1);
/* The characters `-', `?', `*', and `"' are not representable in XLFDs
and therefore must be replaced by substitutes. (bug#70989) */
USE_SAFE_ALLOCA;
tmp = SAFE_ALLOCA (end - str);
for (i = 0; i < end - str; ++i)
tmp[i] = ((end[i] != '?'
&& end[i] != '*'
&& end[i] != '"'
&& end[i] != '-')
? end[i] : ' ');
adstyle = font_intern_prop (tmp, end - str, 1);
SAFE_FREE ();
if (font_style_to_value (FONT_WIDTH_INDEX, adstyle, 0) >= 0)
return Qnil;
return adstyle;