#include "support/lstrings.h"
#include "support/RefChanger.h"
+#include <algorithm>
#include <ostream>
#include <sstream>
FONT_OFF,
FONT_OFF,
FONT_OFF,
+ FONT_OFF,
+ FONT_OFF,
FONT_OFF);
FontInfo const inherit_font(
FONT_INHERIT,
FONT_INHERIT,
FONT_INHERIT,
- FONT_OFF);
+ FONT_INHERIT,
+ FONT_OFF,
+ FONT_INHERIT);
FontInfo const ignore_font(
IGNORE_FAMILY,
FONT_IGNORE,
FONT_IGNORE,
FONT_IGNORE,
+ FONT_IGNORE,
+ FONT_IGNORE,
FONT_IGNORE);
underbar_ = FONT_INHERIT;
if (strikeout_ == tmplt.strikeout_)
strikeout_ = FONT_INHERIT;
+ if (xout_ == tmplt.xout_)
+ xout_ = FONT_INHERIT;
if (uuline_ == tmplt.uuline_)
uuline_ = FONT_INHERIT;
if (uwave_ == tmplt.uwave_)
color_ = Color_inherit;
if (background_ == tmplt.background_)
background_ = Color_inherit;
+ if (nospellcheck_ == tmplt.nospellcheck_)
+ nospellcheck_ = FONT_INHERIT;
}
if (strikeout_ == FONT_INHERIT)
strikeout_ = tmplt.strikeout_;
+ if (xout_ == FONT_INHERIT)
+ xout_ = tmplt.xout_;
+
if (uuline_ == FONT_INHERIT)
uuline_ = tmplt.uuline_;
if (background_ == Color_inherit)
background_ = tmplt.background_;
+ if (nospellcheck_ == FONT_INHERIT)
+ nospellcheck_ = tmplt.nospellcheck_;
+
return *this;
}
-Changer FontInfo::changeColor(ColorCode const color, bool cond)
+Changer FontInfo::changeColor(ColorCode const color)
{
- return make_change(color_, color, cond);
+ return make_change(color_, color);
}
-Changer FontInfo::changeShape(FontShape const shape, bool cond)
+Changer FontInfo::changeShape(FontShape const shape)
{
- return make_change(shape_, shape, cond);
+ return make_change(shape_, shape);
}
-Changer FontInfo::changeStyle(MathStyle const new_style, bool cond)
+Changer FontInfo::changeStyle(MathStyle const new_style)
{
- return make_change(style_, new_style, cond);
+ return make_change(style_, new_style);
}
-Changer FontInfo::change(FontInfo font, bool realiz, bool cond)
+Changer FontInfo::change(FontInfo font, bool realiz)
{
if (realiz)
font.realize(*this);
- return make_change(*this, font, cond);
+ return make_change(*this, font);
}
setEmph(setMisc(newfont.emph_, emph_));
setUnderbar(setMisc(newfont.underbar_, underbar_));
setStrikeout(setMisc(newfont.strikeout_, strikeout_));
+ setXout(setMisc(newfont.xout_, xout_));
setUuline(setMisc(newfont.uuline_, uuline_));
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'
&& shape_ != INHERIT_SHAPE && size_ != FONT_SIZE_INHERIT
&& emph_ != FONT_INHERIT && underbar_ != FONT_INHERIT
&& uuline_ != FONT_INHERIT && uwave_ != FONT_INHERIT
- && strikeout_ != FONT_INHERIT && noun_ != FONT_INHERIT
- && color_ != Color_inherit
- && background_ != Color_inherit);
+ && strikeout_ != FONT_INHERIT && xout_ != FONT_INHERIT
+ && noun_ != FONT_INHERIT && color_ != Color_inherit
+ && background_ != Color_inherit && nospellcheck_ != FONT_INHERIT);
}
}
return "";
}
-
-} // namespace anonymous
+
+} // namespace
// FIXME This does not yet handle color
-docstring FontInfo::asCSS() const
+docstring FontInfo::asCSS() const
{
string retval;
string tmp = getFamilyCSS(family_);
tmp = getSizeCSS(size_);
if (!tmp.empty())
appendSep(retval, makeCSSTag("font-size", tmp));
- return from_ascii(retval);
+ return from_ascii(retval);
}
f.setUnderbar(FONT_OFF);
} else if (ttok == "no_strikeout") {
f.setStrikeout(FONT_OFF);
+ } else if (ttok == "no_xout") {
+ f.setXout(FONT_OFF);
} else if (ttok == "no_uuline") {
f.setUuline(FONT_OFF);
} else if (ttok == "no_uwave") {
f.setUnderbar(FONT_ON);
} else if (ttok == "strikeout") {
f.setStrikeout(FONT_ON);
+ } else if (ttok == "xout") {
+ f.setXout(FONT_ON);
} else if (ttok == "uuline") {
f.setUuline(FONT_ON);
} else if (ttok == "uwave") {
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");
}
oss << indent << "\tMisc Strikeout\n";
else if (f.strikeout() == FONT_OFF)
oss << indent << "\tMisc No_Strikeout\n";
+ if (f.xout() == FONT_ON)
+ oss << indent << "\tMisc Xout\n";
+ else if (f.xout() == FONT_OFF)
+ oss << indent << "\tMisc No_Xout\n";
if (f.uuline() == FONT_ON)
oss << indent << "\tMisc Uuline\n";
else if (f.uuline() == 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';