* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
* \author Angus Leeming
- * \author André Pönitz
+ * \author André Pönitz
* \author Dekel Tsur
*
* Full author contact details are available in file CREDITS.
#include "FontInfo.h"
-#include "debug.h"
-
-using std::endl;
-using std::ostream;
-using std::ostringstream;
-using std::istringstream;
-using std::pair;
-
-#ifndef CXX_GLOBAL_CSTD
-using std::strlen;
-#endif
+#include "support/debug.h"
+using namespace std;
namespace lyx {
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);
case FONT_SIZE_SCRIPT: size_ = FONT_SIZE_TINY; break;
case FONT_SIZE_TINY: break;
case FONT_SIZE_INCREASE:
- lyxerr << "Can't FontInfo::decSize on FONT_SIZE_INCREASE" << endl;
+ LYXERR0("Can't FontInfo::decSize on FONT_SIZE_INCREASE");
break;
case FONT_SIZE_DECREASE:
- lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_DECREASE" << endl;
+ LYXERR0("Can't FontInfo::decSize on FONT_SIZE_DECREASE");
break;
case FONT_SIZE_INHERIT:
- lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_INHERIT" << endl;
+ LYXERR0("Can't FontInfo::decSize on FONT_SIZE_INHERIT");
break;
case FONT_SIZE_IGNORE:
- lyxerr <<"Can't FontInfo::decSize on FONT_SIZE_IGNORE" << endl;
+ LYXERR0("Can't FontInfo::decSize on FONT_SIZE_IGNORE");
break;
}
return *this;
case FONT_SIZE_SCRIPT: size_ = FONT_SIZE_FOOTNOTE; break;
case FONT_SIZE_TINY: size_ = FONT_SIZE_SCRIPT; break;
case FONT_SIZE_INCREASE:
- lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_INCREASE" << endl;
+ LYXERR0("Can't FontInfo::incSize on FONT_SIZE_INCREASE");
break;
case FONT_SIZE_DECREASE:
- lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_DECREASE" << endl;
+ LYXERR0("Can't FontInfo::incSize on FONT_SIZE_DECREASE");
break;
case FONT_SIZE_INHERIT:
- lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_INHERIT" << endl;
+ LYXERR0("Can't FontInfo::incSize on FONT_SIZE_INHERIT");
break;
case FONT_SIZE_IGNORE:
- lyxerr <<"Can't FontInfo::incSize on FONT_SIZE_IGNORE" << endl;
+ LYXERR0("Can't FontInfo::incSize on FONT_SIZE_IGNORE");
break;
}
return *this;
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_;
else if (org == FONT_OFF)
return FONT_ON;
else {
- lyxerr <<"Font::setMisc: Need state"
- " FONT_ON or FONT_OFF to toggle. Setting to FONT_ON" << endl;
+ LYXERR0("Font::setMisc: Need state"
+ " FONT_ON or FONT_OFF to toggle. Setting to FONT_ON");
return FONT_ON;
}
} else if (newfont == FONT_IGNORE)
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_;
}
-} // namespace lyx
\ No newline at end of file
+} // namespace lyx