Support more font weight values on MS-Windows

* src/w32font.c (w32_to_fc_weight): Support a few more weight
values, for compatibility with the GTK font selection widget
(see gtkutil.c:XG_WEIGHT_TO_SYMBOL).  (Bug#24226)

diff --git a/src/w32font.c b/src/w32font.c
index 9a334717c12fbc2f02fb2e6035497d9f32ba2daf..60020eab4a08c63a1f337a279b742843dddc365e 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2000,11 +2000,14 @@ w32_encode_weight (int n)
 static Lisp_Object
 w32_to_fc_weight (int n)
 {
-  if (n >= FW_EXTRABOLD) return intern ("black");
+  if (n >= FW_HEAVY)     return intern ("black");
+  if (n >= FW_EXTRABOLD) return Qextra_bold;
   if (n >= FW_BOLD)      return Qbold;
   if (n >= FW_SEMIBOLD)  return intern ("demibold");
   if (n >= FW_NORMAL)    return intern ("medium");
-  return Qlight;
+  if (n >= FW_LIGHT)     return Qlight;
+  if (n >= FW_EXTRALIGHT) return Qextra_light;
+  return intern ("thin");
 }
 
 /* Fill in all the available details of LOGFONT from FONT_SPEC.  */