/**
- * \file lyxfont.C
+ * \file src/lyxfont.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
#include "support/lstrings.h"
-#include "support/std_sstream.h"
+#include <sstream>
using lyx::support::ascii_lowercase;
using lyx::support::bformat;
using lyx::support::subst;
using std::endl;
-
+using std::string;
using std::ostream;
using std::ostringstream;
}
-EnumLColor LyXFont::color() const
+LColor_color LyXFont::color() const
{
return LColor::color(bits.color);
}
}
-void LyXFont::setColor(EnumLColor c)
+void LyXFont::setColor(LColor_color c)
{
bits.color = int(c);
}
string const s = ascii_lowercase(fam);
int i = 0;
- while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error")
+ while (LyXFamilyNames[i] != s &&
+ LyXFamilyNames[i] != string("error"))
++i;
if (s == LyXFamilyNames[i])
setFamily(LyXFont::FONT_FAMILY(i));
string const s = ascii_lowercase(ser);
int i = 0;
- while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i;
+ while (LyXSeriesNames[i] != s &&
+ LyXSeriesNames[i] != string("error")) ++i;
if (s == LyXSeriesNames[i]) {
setSeries(LyXFont::FONT_SERIES(i));
} else
string const s = ascii_lowercase(sha);
int i = 0;
- while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
+ while (LyXShapeNames[i] != s &&
+ LyXShapeNames[i] != string("error")) ++i;
if (s == LyXShapeNames[i]) {
setShape(LyXFont::FONT_SHAPE(i));
} else
{
string const s = ascii_lowercase(siz);
int i = 0;
- while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
+ while (LyXSizeNames[i] != s &&
+ LyXSizeNames[i] != string("error")) ++i;
if (s == LyXSizeNames[i]) {
setSize(LyXFont::FONT_SIZE(i));
} else
{
string const s = ascii_lowercase(siz);
int i = 0;
- while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
+ while (LyXMiscNames[i] != s &&
+ LyXMiscNames[i] != string("error")) ++i;
if (s == LyXMiscNames[i])
return FONT_MISC_STATE(i);
lyxerr << "LyXFont::setLyXMisc: Unknown misc flag `"
{
os << "\n";
if (orgfont.family() != family()) {
- os << "\\family " << LyXFamilyNames[family()] << " \n";
+ os << "\\family " << LyXFamilyNames[family()] << "\n";
}
if (orgfont.series() != series()) {
- os << "\\series " << LyXSeriesNames[series()] << " \n";
+ os << "\\series " << LyXSeriesNames[series()] << "\n";
}
if (orgfont.shape() != shape()) {
- os << "\\shape " << LyXShapeNames[shape()] << " \n";
+ os << "\\shape " << LyXShapeNames[shape()] << "\n";
}
if (orgfont.size() != size()) {
- os << "\\size " << LyXSizeNames[size()] << " \n";
+ os << "\\size " << LyXSizeNames[size()] << "\n";
}
if (orgfont.emph() != emph()) {
- os << "\\emph " << LyXMiscNames[emph()] << " \n";
+ os << "\\emph " << LyXMiscNames[emph()] << "\n";
}
if (orgfont.number() != number()) {
- os << "\\numeric " << LyXMiscNames[number()] << " \n";
+ os << "\\numeric " << LyXMiscNames[number()] << "\n";
}
if (orgfont.underbar() != underbar()) {
// This is only for backwards compatibility
switch (underbar()) {
- case OFF: os << "\\bar no \n"; break;
- case ON: os << "\\bar under \n"; break;
+ case OFF: os << "\\bar no\n"; break;
+ case ON: os << "\\bar under\n"; break;
case TOGGLE: lyxerr << "LyXFont::lyxWriteFontChanges: "
"TOGGLE should not appear here!"
<< endl;
break;
- case INHERIT: os << "\\bar default \n"; break;
+ case INHERIT: os << "\\bar default\n"; break;
case IGNORE: lyxerr << "LyXFont::lyxWriteFontChanges: "
"IGNORE should not appear here!"
<< endl;
}
}
if (orgfont.noun() != noun()) {
- os << "\\noun " << LyXMiscNames[noun()] << " \n";
+ os << "\\noun " << LyXMiscNames[noun()] << "\n";
}
if (orgfont.color() != color()) {
// To make us file compatible with older
}
-EnumLColor LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
{
if (color() == LColor::none)
return LColor::foreground;
}
-ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
+ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
+{
+ return os << int(fms);
+}
+
+
+std::ostream & operator<<(std::ostream & os, LyXFont const & font)
{
- return o << int(fms);
+ return os << "font:"
+ << " family " << font.bits.family
+ << " series " << font.bits.series
+ << " shape " << font.bits.shape
+ << " size " << font.bits.size
+ << " color " << font.bits.color
+ << " emph " << font.bits.emph
+ << " underbar " << font.bits.underbar
+ << " noun " << font.bits.noun
+ << " number " << font.bits.number
+ << " lang: " << (font.lang ? font.lang->lang() : 0);
}