master 3ef5f10b190: Exclude ``regular'' from font adstyle

[Po Lu]

branch: master
commit 3ef5f10b1904c84e606bbe5baa8f7cf2ed8b6899
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Exclude ``regular'' from font adstyle
    
    * src/sfntfont.c (sfnt_parse_style): Disregard tokens matching
    Regular entirely.
---
 src/sfntfont.c | 6 ++++++
 1 file changed, 6 insertions(+)

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