FONT_OFF,
FONT_OFF,
FONT_OFF,
+ FONT_OFF,
+ FONT_OFF,
+ FONT_OFF,
FONT_OFF);
FontInfo const inherit_font(
FONT_INHERIT,
FONT_INHERIT,
FONT_INHERIT,
+ FONT_INHERIT,
+ FONT_INHERIT,
+ FONT_INHERIT,
FONT_OFF);
FontInfo const ignore_font(
FONT_IGNORE,
FONT_IGNORE,
FONT_IGNORE,
+ FONT_IGNORE,
+ FONT_IGNORE,
+ FONT_IGNORE,
FONT_IGNORE);
emph_ = FONT_INHERIT;
if (underbar_ == tmplt.underbar_)
underbar_ = FONT_INHERIT;
+ if (strikeout_ == tmplt.strikeout_)
+ strikeout_ = FONT_INHERIT;
+ if (uuline_ == tmplt.uuline_)
+ uuline_ = FONT_INHERIT;
+ if (uwave_ == tmplt.uwave_)
+ uwave_ = FONT_INHERIT;
if (noun_ == tmplt.noun_)
noun_ = FONT_INHERIT;
if (color_ == tmplt.color_)
if (underbar_ == FONT_INHERIT)
underbar_ = tmplt.underbar_;
+ if (strikeout_ == FONT_INHERIT)
+ strikeout_ = tmplt.strikeout_;
+
+ if (uuline_ == FONT_INHERIT)
+ uuline_ = tmplt.uuline_;
+
+ if (uwave_ == FONT_INHERIT)
+ uwave_ = tmplt.uwave_;
+
if (noun_ == FONT_INHERIT)
noun_ = tmplt.noun_;
setEmph(setMisc(newfont.emph_, emph_));
setUnderbar(setMisc(newfont.underbar_, underbar_));
+ setStrikeout(setMisc(newfont.strikeout_, strikeout_));
+ setUuline(setMisc(newfont.uuline_, uuline_));
+ setUwave(setMisc(newfont.uwave_, uwave_));
setNoun(setMisc(newfont.noun_, noun_));
setNumber(setMisc(newfont.number_, number_));
return (family_ != INHERIT_FAMILY && series_ != INHERIT_SERIES
&& shape_ != INHERIT_SHAPE && size_ != FONT_SIZE_INHERIT
&& emph_ != FONT_INHERIT && underbar_ != FONT_INHERIT
- && noun_ != FONT_INHERIT
+ && uuline_ != FONT_INHERIT && uwave_ != FONT_INHERIT
+ && strikeout_ != FONT_INHERIT && noun_ != FONT_INHERIT
&& color_ != Color_inherit
&& background_ != Color_inherit);
}
-ColorCode FontInfo::realColor() const
+Color FontInfo::realColor() const
{
+ if (paint_color_ != Color_none)
+ return paint_color_;
if (color_ == Color_none)
return Color_foreground;
return color_;