}
Lisp_Object
-font_style_symbolic_from_value (prop, val, for_face)
+font_style_symbolic (font, prop, for_face)
+ Lisp_Object font;
enum font_property_index prop;
- Lisp_Object val;
int for_face;
{
+ Lisp_Object val = AREF (font, prop);
Lisp_Object table, elt;
int i;
return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1));
}
-Lisp_Object
-font_style_symbolic (font, prop, for_face)
- Lisp_Object font;
- enum font_property_index prop;
- int for_face;
-{
- Lisp_Object val = AREF (font, prop);
- return font_style_symbolic_from_value (prop, val, for_face);
-}
-
extern Lisp_Object Vface_alternative_font_family_alist;
extern Lisp_Object find_font_encoding P_ ((Lisp_Object));
return 0;
}
+/* Convert a Windows font weight into one of the weights supported
+ by fontconfig (see font.c:font_parse_fcname). */
+static Lisp_Object
+w32_to_fc_weight (n)
+ int n;
+{
+ if (n >= FW_EXTRABOLD) return intern ("black");
+ if (n >= FW_BOLD) return intern ("bold");
+ if (n >= FW_SEMIBOLD) return intern ("demibold");
+ if (n >= FW_NORMAL) return intern ("medium");
+ return intern ("light");
+}
+
/* Fill in all the available details of LOGFONT from FONT_SPEC. */
static void
fill_in_logfont (f, logfont, font_spec)
if (font->lfWeight && font->lfWeight != FW_NORMAL)
{
- weight = FONT_WEIGHT_SYMBOLIC (font_obj);
- len += 8 + SBYTES (SYMBOL_NAME (weight)); /* :weight=NAME */
+ weight = w32_to_fc_weight (font->lfWeight);
+ len += 1 + SBYTES (SYMBOL_NAME (weight)); /* :WEIGHT */
}
antialiasing = lispy_antialias_type (font->lfQuality);
p += sprintf (p, ":pixelsize=%d", height);
}
+ if (SYMBOLP (weight) && ! NILP (weight))
+ p += sprintf (p, ":%s", SDATA (SYMBOL_NAME (weight)));
+
if (font->lfItalic)
p += sprintf (p, ":italic");
- if (SYMBOLP (weight) && ! NILP (weight))
- p += sprintf (p, ":weight=%s", SDATA (SYMBOL_NAME (weight)));
-
if (SYMBOLP (antialiasing) && ! NILP (antialiasing))
p += sprintf (p, ":antialias=%s", SDATA (SYMBOL_NAME (antialiasing)));
len += 7; /* :italic */
if (font->lfWeight && font->lfWeight != FW_NORMAL)
{
- int fc_weight = w32_decode_weight (font->lfWeight);
- weight = font_style_symbolic_from_value (FONT_WEIGHT_INDEX,
- make_number (fc_weight), 0);
- len += 8; /* :weight= */
- if (SYMBOLP (weight))
- len += SBYTES (SYMBOL_NAME (weight));
- else
- {
- weight = make_number (fc_weight);
- len++;
- while (fc_weight /= 10)
- len++;
- }
+ weight = w32_to_fc_weight (font->lfWeight);
+ len += SBYTES (SYMBOL_NAME (weight)) + 1;
}
if (len > size)
if (pointsize % 10)
p += sprintf (p, ".%d", pointsize % 10);
+ if (SYMBOLP (weight) && !NILP (weight))
+ p += sprintf (p, ":%s", SDATA (SYMBOL_NAME (weight)));
+
if (font->lfItalic)
p += sprintf (p, ":italic");
- if (SYMBOLP (weight) && !NILP (weight))
- p += sprintf (p, "weight=%s", SDATA (SYMBOL_NAME (weight)));
- else if (INTEGERP (weight))
- p += sprintf (p, "weight=%d", XINT (weight));
-
return (p - fcname);
}