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).
This commit is contained in:
Bill Medland 2004-01-12 21:07:03 +00:00 committed by Alexandre Julliard
parent ff16b32499
commit 866f5ba0ef
1 changed files with 3 additions and 3 deletions

View File

@ -1197,6 +1197,7 @@ char *fn = "ReadFontTbl";
/* ignore token but announce it */
RTFMsg ("%s: unknown token \"%s\"\n",
fn, rtfTextBuf);
break;
case rtfFontFamily:
fp->rtfFFamily = rtfMinor;
break;
@ -1239,9 +1240,8 @@ char *fn = "ReadFontTbl";
else if (rtfClass == rtfText) /* font name */
{
bp = buf;
while (rtfClass != rtfEOF
&& !RTFCheckCM (rtfText, ';')
&& !RTFCheckCM (rtfGroup, rtfEndGroup))
while (rtfClass == rtfText
&& !RTFCheckCM (rtfText, ';'))
{
*bp++ = rtfMajor;
(void) RTFGetToken ();