MEDIUM_SERIES,
UP_SHAPE,
FONT_SIZE_NORMAL,
+ LM_ST_TEXT,
Color_none,
Color_background,
FONT_OFF,
FONT_OFF,
FONT_OFF,
FONT_OFF,
+ FONT_OFF,
FONT_OFF);
FontInfo const inherit_font(
INHERIT_SERIES,
INHERIT_SHAPE,
FONT_SIZE_INHERIT,
+ LM_ST_INHERIT,
Color_inherit,
Color_inherit,
FONT_INHERIT,
FONT_INHERIT,
FONT_INHERIT,
FONT_INHERIT,
- FONT_OFF);
+ FONT_OFF,
+ FONT_INHERIT);
FontInfo const ignore_font(
IGNORE_FAMILY,
IGNORE_SERIES,
IGNORE_SHAPE,
FONT_SIZE_IGNORE,
+ LM_ST_IGNORE,
Color_ignore,
Color_ignore,
FONT_IGNORE,
FONT_IGNORE,
FONT_IGNORE,
FONT_IGNORE,
+ FONT_IGNORE,
FONT_IGNORE);
switch (style()) {
case LM_ST_DISPLAY:
case LM_ST_TEXT:
+ case LM_ST_INHERIT:
+ case LM_ST_IGNORE:
break;
case LM_ST_SCRIPT:
d *= .73;
shape_ = INHERIT_SHAPE;
if (size_ == tmplt.size_)
size_ = FONT_SIZE_INHERIT;
+ if (style_ == tmplt.style_)
+ style_ = LM_ST_INHERIT;
if (emph_ == tmplt.emph_)
emph_ = FONT_INHERIT;
if (underbar_ == tmplt.underbar_)
color_ = Color_inherit;
if (background_ == tmplt.background_)
background_ = Color_inherit;
+ if (nospellcheck_ == tmplt.nospellcheck_)
+ nospellcheck_ = FONT_INHERIT;
}
if (size_ == FONT_SIZE_INHERIT)
size_ = tmplt.size_;
+ if (style_ == LM_ST_INHERIT)
+ style_ = tmplt.style_;
+
if (emph_ == FONT_INHERIT)
emph_ = tmplt.emph_;
if (background_ == Color_inherit)
background_ = tmplt.background_;
+ if (nospellcheck_ == FONT_INHERIT)
+ nospellcheck_ = tmplt.nospellcheck_;
+
return *this;
}
size_ = newfont.size_;
}
+ if (newfont.style_ != LM_ST_IGNORE) {
+ style_ = newfont.style_;
+ }
+
setEmph(setMisc(newfont.emph_, emph_));
setUnderbar(setMisc(newfont.underbar_, underbar_));
setStrikeout(setMisc(newfont.strikeout_, strikeout_));
setUwave(setMisc(newfont.uwave_, uwave_));
setNoun(setMisc(newfont.noun_, noun_));
setNumber(setMisc(newfont.number_, number_));
+ setNoSpellcheck(setMisc(newfont.nospellcheck_, nospellcheck_));
if (newfont.color_ == color_ && toggleall)
setColor(Color_inherit); // toggle 'back'
{
return (family_ != INHERIT_FAMILY && series_ != INHERIT_SERIES
&& shape_ != INHERIT_SHAPE && size_ != FONT_SIZE_INHERIT
+ && style_ != LM_ST_INHERIT
&& emph_ != FONT_INHERIT && underbar_ != FONT_INHERIT
&& uuline_ != FONT_INHERIT && uwave_ != FONT_INHERIT
&& strikeout_ != FONT_INHERIT && xout_ != FONT_INHERIT
&& noun_ != FONT_INHERIT && color_ != Color_inherit
- && background_ != Color_inherit);
+ && background_ != Color_inherit && nospellcheck_ != FONT_INHERIT);
}
f.setUwave(FONT_ON);
} else if (ttok == "noun") {
f.setNoun(FONT_ON);
+ } else if (ttok == "nospellcheck") {
+ f.setNoSpellcheck(FONT_ON);
+ } else if (ttok == "no_nospellcheck") {
+ f.setNoSpellcheck(FONT_OFF);
} else {
lex.printError("Illegal misc type");
}
if (f.size() != FONT_SIZE_INHERIT)
oss << indent << "\tSize " << LyXSizeNames[f.size()]
<< '\n';
+ //FIXME: shall style be handled here? Probably not.
if (f.underbar() == FONT_ON)
oss << indent << "\tMisc Underbar\n";
else if (f.underbar() == FONT_OFF)
oss << indent << "\tMisc Noun\n";
else if (f.noun() == FONT_OFF)
oss << indent << "\tMisc No_Noun\n";
+ if (f.nospellcheck() == FONT_ON)
+ oss << indent << "\tMisc NoSpellcheck\n";
+ else if (f.nospellcheck() == FONT_OFF)
+ oss << indent << "\tMisc No_NoSpellcheck\n";
if (f.color() != Color_inherit && f.color() != Color_none)
oss << indent << "\tColor " << lcolor.getLyXName(f.color())
<< '\n';