* Copyright 2001 The LyX Team.
* See the file COPYING.
*
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
*/
#include <vector>
LyXFont::FONT_FAMILY ControlCharacter::getFamily() const
{
- if (font_.get())
- return font_->family();
- return LyXFont::IGNORE_FAMILY;
+ if (!font_.get())
+ return LyXFont::IGNORE_FAMILY;
+ return font_->family();
}
LyXFont::FONT_SERIES ControlCharacter::getSeries() const
{
- if (font_.get())
- return font_->series();
- return LyXFont::IGNORE_SERIES;
+ if (!font_.get())
+ return LyXFont::IGNORE_SERIES;
+ return font_->series();
}
LyXFont::FONT_SHAPE ControlCharacter::getShape() const
{
- if (font_.get())
- return font_->shape();
- return LyXFont::IGNORE_SHAPE;
+ if (!font_.get())
+ return LyXFont::IGNORE_SHAPE;
+ return font_->shape();
}
LyXFont::FONT_SIZE ControlCharacter::getSize() const
{
- if (font_.get())
- return font_->size();
- return LyXFont::IGNORE_SIZE;
+ if (!font_.get())
+ return LyXFont::IGNORE_SIZE;
+ return font_->size();
}
character::FONT_STATE ControlCharacter::getBar() const
{
- if (font_.get()) {
- if (font_->emph() != LyXFont::IGNORE)
- return character::EMPH_TOGGLE;
-
- else if (font_->underbar() != LyXFont::IGNORE)
- return character::UNDERBAR_TOGGLE;
-
- else if (font_->noun() != LyXFont::IGNORE)
- return character::NOUN_TOGGLE;
-#ifndef NO_LATEX
- else if (font_->latex() != LyXFont::IGNORE)
- return character::LATEX_TOGGLE;
-#endif
- }
- return character::IGNORE;
+ if (!font_.get())
+ return character::IGNORE;
+
+ if (font_->emph() == LyXFont::TOGGLE)
+ return character::EMPH_TOGGLE;
+
+ if (font_->underbar() == LyXFont::TOGGLE)
+ return character::UNDERBAR_TOGGLE;
+
+ if (font_->noun() == LyXFont::TOGGLE)
+ return character::NOUN_TOGGLE;
+
+ if (font_->emph() == LyXFont::IGNORE &&
+ font_->underbar() == LyXFont::IGNORE &&
+ font_->noun() == LyXFont::IGNORE)
+ return character::IGNORE;
+
+ return character::INHERIT;
}
font_->setEmph(LyXFont::IGNORE);
font_->setUnderbar(LyXFont::IGNORE);
font_->setNoun(LyXFont::IGNORE);
-#ifndef NO_LATEX
- font_->setLatex(LyXFont::IGNORE);
-#endif
break;
case character::EMPH_TOGGLE:
font_->setNoun(LyXFont::TOGGLE);
break;
-#ifndef NO_LATEX
- case character::LATEX_TOGGLE:
- font_->setLatex(LyXFont::TOGGLE);
- break;
-#endif
-
case character::INHERIT:
font_->setEmph(LyXFont::INHERIT);
font_->setUnderbar(LyXFont::INHERIT);
font_->setNoun(LyXFont::INHERIT);
-#ifndef NO_LATEX
- font_->setLatex(LyXFont::INHERIT);
-#endif
break;
}
}
LColor::color ControlCharacter::getColor() const
{
- LColor::color col = LColor::ignore;
-
- if (font_.get()) {
- switch (font_->color()) {
- case LColor::ignore:
- case LColor::none:
- case LColor::black:
- case LColor::white:
- case LColor::red:
- case LColor::green:
- case LColor::blue:
- case LColor::cyan:
- case LColor::magenta:
- case LColor::yellow:
- case LColor::inherit:
- break;
- default:
- col = font_->color();
- break;
- }
- }
+ if (!font_.get())
+ return LColor::ignore;
- return col;
+ return font_->color();
}