os << _(GUIShapeNames[f.shape()]) << ", ";
if (f.size() != FONT_SIZE_INHERIT && (!terse || f.size() != FONT_SIZE_IGNORE))
os << _(GUISizeNames[f.size()]) << ", ";
+ // FIXME: shall style be handled there? Probably not.
if (f.color() != Color_inherit && (!terse || f.color() != Color_ignore))
os << lcolor.getGUIName(f.color()) << ", ";
// FIXME: uncomment this when we support background.
if (f.strikeout() != FONT_INHERIT && (!terse || f.strikeout() == FONT_ON))
os << bformat(_("Strike out %1$s, "),
_(GUIMiscNames[f.strikeout()]));
- if (f.xout() != FONT_INHERIT && (!terse || f.strikeout() == FONT_ON))
+ if (f.xout() != FONT_INHERIT && (!terse || f.xout() == FONT_ON))
os << bformat(_("Cross out %1$s, "),
_(GUIMiscNames[f.xout()]));
if (f.noun() != FONT_INHERIT && (!terse || f.noun() != FONT_IGNORE))
os << "\\shape " << LyXShapeNames[bits_.shape()] << "\n";
if (orgfont.fontInfo().size() != bits_.size())
os << "\\size " << LyXSizeNames[bits_.size()] << "\n";
+ // FIXME: shall style be handled there? Probably not.
if (orgfont.fontInfo().emph() != bits_.emph())
os << "\\emph " << LyXMiscNames[bits_.emph()] << "\n";
if (orgfont.fontInfo().number() != bits_.number())
} else if (token == "size") {
int const next = lex.getInteger();
bits_.setSize(FontSize(next));
-
+ // FIXME: shall style be handled there? Probably not.
} else if (token == "emph" || token == "underbar"
|| token == "noun" || token == "number"
|| token == "uuline" || token == "uwave"
<< " series " << f.series()
<< " shape " << f.shape()
<< " size " << f.size()
+ << " style " << f.style()
<< " color " << f.color()
// FIXME: uncomment this when we support background.
//<< " background " << f.background()