Fix toggling of 'misc' font options (bug #8764)

This commit is contained in:
Juergen Spitzmueller 2013-07-17 08:30:42 +02:00
parent c89a42682d
commit 6f9a272ca3

View File

@ -307,30 +307,38 @@ static void setBar(FontInfo & fi, FontState val)
fi.setEmph(FONT_IGNORE); fi.setEmph(FONT_IGNORE);
fi.setUnderbar(FONT_IGNORE); fi.setUnderbar(FONT_IGNORE);
fi.setStrikeout(FONT_IGNORE); fi.setStrikeout(FONT_IGNORE);
fi.setUuline(FONT_IGNORE);
fi.setUwave(FONT_IGNORE);
fi.setNoun(FONT_IGNORE); fi.setNoun(FONT_IGNORE);
break; break;
case EMPH_TOGGLE: case EMPH_TOGGLE:
setBar(fi, INHERIT);
fi.setEmph(FONT_TOGGLE); fi.setEmph(FONT_TOGGLE);
break; break;
case UNDERBAR_TOGGLE: case UNDERBAR_TOGGLE:
setBar(fi, INHERIT);
fi.setUnderbar(FONT_TOGGLE); fi.setUnderbar(FONT_TOGGLE);
break; break;
case STRIKEOUT_TOGGLE: case STRIKEOUT_TOGGLE:
setBar(fi, INHERIT);
fi.setStrikeout(FONT_TOGGLE); fi.setStrikeout(FONT_TOGGLE);
break; break;
case UULINE_TOGGLE: case UULINE_TOGGLE:
setBar(fi, INHERIT);
fi.setUuline(FONT_TOGGLE); fi.setUuline(FONT_TOGGLE);
break; break;
case UWAVE_TOGGLE: case UWAVE_TOGGLE:
setBar(fi, INHERIT);
fi.setUwave(FONT_TOGGLE); fi.setUwave(FONT_TOGGLE);
break; break;
case NOUN_TOGGLE: case NOUN_TOGGLE:
setBar(fi, INHERIT);
fi.setNoun(FONT_TOGGLE); fi.setNoun(FONT_TOGGLE);
break; break;