From: Po Lu <luangruo@yahoo.com>
Date: Wed, 13 Sep 2023 05:42:29 +0000 (+0800)
Subject: Exclude ``regular'' from font adstyle
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ef5f10b1904c84e606bbe5baa8f7cf2ed8b6899;p=emacs.git

Exclude ``regular'' from font adstyle

* src/sfntfont.c (sfnt_parse_style): Disregard tokens matching
Regular entirely.
---

diff --git a/src/sfntfont.c b/src/sfntfont.c
index fb0a2546864..d6dfa8b6f0d 100644
--- a/src/sfntfont.c
+++ b/src/sfntfont.c
@@ -468,6 +468,12 @@ sfnt_parse_style (Lisp_Object style_name, struct sfnt_font_desc *desc)
     {
       style = NULL;
 
+      if (!strcmp (single, "regular"))
+	/* ``Regular'' within a font family can represent either the
+	   weight, slant or width of the font.  Leave each value as
+	   its default, but never append it to the adstyle.  */
+	goto next;
+
       if (desc->weight == 80)
 	{
 	  /* Weight hasn't been found yet.  Scan through the weight