Commit 866f5ba0 authored by Bill Medland's avatar Bill Medland Committed by Alexandre Julliard

Correct handling of font table when the font name is not the last

thing in the entry (i.e. is followed by the font altname in a group).
parent ff16b324
...@@ -1197,6 +1197,7 @@ char *fn = "ReadFontTbl"; ...@@ -1197,6 +1197,7 @@ char *fn = "ReadFontTbl";
/* ignore token but announce it */ /* ignore token but announce it */
RTFMsg ("%s: unknown token \"%s\"\n", RTFMsg ("%s: unknown token \"%s\"\n",
fn, rtfTextBuf); fn, rtfTextBuf);
break;
case rtfFontFamily: case rtfFontFamily:
fp->rtfFFamily = rtfMinor; fp->rtfFFamily = rtfMinor;
break; break;
...@@ -1239,9 +1240,8 @@ char *fn = "ReadFontTbl"; ...@@ -1239,9 +1240,8 @@ char *fn = "ReadFontTbl";
else if (rtfClass == rtfText) /* font name */ else if (rtfClass == rtfText) /* font name */
{ {
bp = buf; bp = buf;
while (rtfClass != rtfEOF while (rtfClass == rtfText
&& !RTFCheckCM (rtfText, ';') && !RTFCheckCM (rtfText, ';'))
&& !RTFCheckCM (rtfGroup, rtfEndGroup))
{ {
*bp++ = rtfMajor; *bp++ = rtfMajor;
(void) RTFGetToken (); (void) RTFGetToken ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment