-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
+/**
+ * \file src/lyxfont.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author André Pönitz
+ * \author Dekel Tsur
+ *
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
-#include <clocale>
-#include <cctype>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "gettext.h"
#include "lyxfont.h"
+
+#include "bufferparams.h" // stateText
#include "debug.h"
-#include "lyxrc.h"
+#include "gettext.h"
+#include "language.h"
+#include "LColor.h"
#include "lyxlex.h"
-#include "FontLoader.h"
+#include "lyxrc.h"
+
#include "support/lstrings.h"
-#include "bufferparams.h" // stateText
-using std::ostream;
+
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::bformat;
+using support::rtrim;
+using support::subst;
+
using std::endl;
+using std::string;
+using std::ostream;
+using std::ostringstream;
+
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
//
// Names for the GUI
namespace {
-char const * GUIFamilyNames[6] =
-{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"),
- N_("Ignore") };
+char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
+{ N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
+ N_("Inherit"), N_("Ignore") };
-char const * GUISeriesNames[4] =
+char const * GUISeriesNames[4] =
{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-char const * GUIShapeNames[6] =
+char const * GUIShapeNames[6] =
{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
N_("Ignore") };
-char const * GUISizeNames[14] =
+char const * GUISizeNames[14] =
{ N_("Tiny"), N_("Smallest"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"),
- N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
+ N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
N_("Inherit"), N_("Ignore") };
-
-char const * GUIMiscNames[5] =
+
+char const * GUIMiscNames[5] =
{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
//
// Strings used to read and write .lyx format files
//
-char const * LyXFamilyNames[6] =
-{ "roman", "sans", "typewriter", "symbol", "default", "error" };
+char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
+{ "roman", "sans", "typewriter", "symbol",
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
+ "default", "error" };
-char const * LyXSeriesNames[4] =
+char const * LyXSeriesNames[4] =
{ "medium", "bold", "default", "error" };
-char const * LyXShapeNames[6] =
+char const * LyXShapeNames[6] =
{ "up", "italic", "slanted", "smallcaps", "default", "error" };
-char const * LyXSizeNames[14] =
+char const * LyXSizeNames[14] =
{ "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
- "larger", "largest", "huge", "giant",
- "increase-error", "decrease-error", "default", "error" };
+ "larger", "largest", "huge", "giant",
+ "increase", "decrease", "default", "error" };
-char const * LyXMiscNames[5] =
+char const * LyXMiscNames[5] =
{ "off", "on", "toggle", "default", "error" };
//
// Strings used to write LaTeX files
//
-char const * LaTeXFamilyNames[6] =
+char const * LaTeXFamilyNames[6] =
{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
-char const * LaTeXSeriesNames[4] =
+char const * LaTeXSeriesNames[4] =
{ "textmd", "textbf", "error4", "error5" };
-char const * LaTeXShapeNames[6] =
+char const * LaTeXShapeNames[6] =
{ "textup", "textit", "textsl", "textsc", "error6", "error7" };
-char const * LaTeXSizeNames[14] =
+char const * LaTeXSizeNames[14] =
{ "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
"Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
OFF,
OFF,
OFF,
- OFF,
OFF };
// Initialize static member
INHERIT,
INHERIT,
INHERIT,
- INHERIT,
OFF };
// Initialize static member
IGNORE,
IGNORE,
IGNORE,
- IGNORE,
IGNORE };
-bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
+bool operator==(LyXFont::FontBits const & lhs,
+ LyXFont::FontBits const & rhs)
{
- return fb1.family == family &&
- fb1.series == series &&
- fb1.shape == shape &&
- fb1.size == size &&
- fb1.color == color &&
- fb1.emph == emph &&
- fb1.underbar == underbar &&
- fb1.noun == noun &&
- fb1.latex == latex &&
- fb1.number == number;
+ return lhs.family == rhs.family &&
+ lhs.series == rhs.series &&
+ lhs.shape == rhs.shape &&
+ lhs.size == rhs.size &&
+ lhs.color == rhs.color &&
+ lhs.emph == rhs.emph &&
+ lhs.underbar == rhs.underbar &&
+ lhs.noun == rhs.noun &&
+ lhs.number == rhs.number;
}
-bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
-{
- return !(fb1 == *this);
-}
+LyXFont::LyXFont()
+ : bits(sane), lang(default_language)
+{}
LyXFont::LyXFont(LyXFont::FONT_INIT1)
{}
-LyXFont::FONT_MISC_STATE LyXFont::underbar() const
-{
- return bits.underbar;
-}
-
-
-LyXFont::FONT_MISC_STATE LyXFont::latex() const
-{
- return bits.latex;
-}
-
-
-LColor::color LyXFont::color() const
-{
- return bits.color;
-}
-
-
-Language const * LyXFont::language() const
-{
- return lang;
-}
-
-LyXFont::FONT_MISC_STATE LyXFont::number() const
+LColor_color LyXFont::color() const
{
- return bits.number;
+ return LColor::color(bits.color);
}
-bool LyXFont::isRightToLeft() const
+bool LyXFont::isRightToLeft() const
{
- return lang->RightToLeft();
+ return lang->rightToLeft();
}
-bool LyXFont::isVisibleRightToLeft() const
+bool LyXFont::isVisibleRightToLeft() const
{
- return (lang->RightToLeft() && latex() != ON && number() != ON);
+ return (lang->rightToLeft() &&
+ number() != ON);
}
-LyXFont & LyXFont::setFamily(LyXFont::FONT_FAMILY f)
+void LyXFont::setFamily(LyXFont::FONT_FAMILY f)
{
bits.family = f;
- return *this;
}
-LyXFont & LyXFont::setSeries(LyXFont::FONT_SERIES s)
+void LyXFont::setSeries(LyXFont::FONT_SERIES s)
{
bits.series = s;
- return *this;
}
-LyXFont & LyXFont::setShape(LyXFont::FONT_SHAPE s)
+void LyXFont::setShape(LyXFont::FONT_SHAPE s)
{
bits.shape = s;
- return *this;
}
-LyXFont & LyXFont::setSize(LyXFont::FONT_SIZE s)
+void LyXFont::setSize(LyXFont::FONT_SIZE s)
{
bits.size = s;
- return *this;
}
-LyXFont & LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
+void LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
{
bits.emph = e;
- return *this;
}
-LyXFont & LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
+void LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
{
bits.underbar = u;
- return *this;
}
-LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
+void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
{
bits.noun = n;
- return *this;
}
-LyXFont & LyXFont::setLatex(LyXFont::FONT_MISC_STATE l)
+void LyXFont::setColor(LColor_color c)
{
- bits.latex = l;
- return *this;
-}
-
-
-LyXFont & LyXFont::setColor(LColor::color c)
-{
- bits.color = c;
- return *this;
+ bits.color = int(c);
}
-LyXFont & LyXFont::setLanguage(Language const * l)
+void LyXFont::setLanguage(Language const * l)
{
lang = l;
- return *this;
}
-LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
+void LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
{
bits.number = n;
- return *this;
}
/// Decreases font size by one
-LyXFont & LyXFont::decSize()
+LyXFont & LyXFont::decSize()
{
switch (size()) {
case SIZE_HUGER: setSize(SIZE_HUGE); break;
/// Increases font size by one
-LyXFont & LyXFont::incSize()
+LyXFont & LyXFont::incSize()
{
switch (size()) {
case SIZE_HUGER: break;
/// Updates a misc setting according to request
-LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
+LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
FONT_MISC_STATE org)
{
if (newfont == TOGGLE) {
}
} else if (newfont == IGNORE)
return org;
- else
+ else
return newfont;
}
/// Updates font settings according to request
void LyXFont::update(LyXFont const & newfont,
- Language const * document_language, bool toggleall)
+ Language const * document_language,
+ bool toggleall)
{
if (newfont.family() == family() && toggleall)
setFamily(INHERIT_FAMILY); // toggle 'back'
case INHERIT_SERIES:
setSeries(newfont.series());
break;
- case IGNORE_SERIES:
+ case IGNORE_SERIES:
break;
}
setEmph(setMisc(newfont.emph(), emph()));
setUnderbar(setMisc(newfont.underbar(), underbar()));
setNoun(setMisc(newfont.noun(), noun()));
- setLatex(setMisc(newfont.latex(), latex()));
setNumber(setMisc(newfont.number(), number()));
if (newfont.language() == language() && toggleall)
setUnderbar(INHERIT);
if (noun() == tmplt.noun())
setNoun(INHERIT);
- if (latex() == tmplt.latex())
- setLatex(INHERIT);
if (color() == tmplt.color())
setColor(LColor::inherit);
}
bits = tmplt.bits;
return *this;
}
-
- if (bits.family == INHERIT_FAMILY) {
+
+ if (bits.family == INHERIT_FAMILY)
bits.family = tmplt.bits.family;
- }
- if (bits.series == INHERIT_SERIES) {
+
+ if (bits.series == INHERIT_SERIES)
bits.series = tmplt.bits.series;
- }
- if (bits.shape == INHERIT_SHAPE) {
+
+ if (bits.shape == INHERIT_SHAPE)
bits.shape = tmplt.bits.shape;
- }
- if (bits.size == INHERIT_SIZE) {
+
+ if (bits.size == INHERIT_SIZE)
bits.size = tmplt.bits.size;
- }
- if (bits.emph == INHERIT) {
+
+ if (bits.emph == INHERIT)
bits.emph = tmplt.bits.emph;
- }
- if (bits.underbar == INHERIT) {
+
+ if (bits.underbar == INHERIT)
bits.underbar = tmplt.bits.underbar;
- }
- if (bits.noun == INHERIT) {
+
+ if (bits.noun == INHERIT)
bits.noun = tmplt.bits.noun;
- }
- if (bits.latex == INHERIT) {
- bits.latex = tmplt.bits.latex;
- }
- if (bits.color == LColor::inherit) {
+
+ if (bits.color == LColor::inherit)
bits.color = tmplt.bits.color;
- }
+
return *this;
}
{
return (family() != INHERIT_FAMILY && series() != INHERIT_SERIES &&
shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
- emph() != INHERIT && underbar() != INHERIT &&
- noun() != INHERIT && latex() != INHERIT &&
+ emph() != INHERIT && underbar() != INHERIT &&
+ noun() != INHERIT &&
color() != LColor::inherit);
}
/// Build GUI description of font state
string const LyXFont::stateText(BufferParams * params) const
{
- std::ostringstream ost;
+ ostringstream os;
if (family() != INHERIT_FAMILY)
- ost << _(GUIFamilyNames[family()]) << ", ";
+ os << to_utf8(_(GUIFamilyNames[family()])) << ", ";
if (series() != INHERIT_SERIES)
- ost << _(GUISeriesNames[series()]) << ", ";
+ os << to_utf8(_(GUISeriesNames[series()])) << ", ";
if (shape() != INHERIT_SHAPE)
- ost << _(GUIShapeNames[shape()]) << ", ";
+ os << to_utf8(_(GUIShapeNames[shape()])) << ", ";
if (size() != INHERIT_SIZE)
- ost << _(GUISizeNames[size()]) << ", ";
+ os << to_utf8(_(GUISizeNames[size()])) << ", ";
if (color() != LColor::inherit)
- ost << lcolor.getGUIName(color()) << ", ";
+ os << lcolor.getGUIName(color()) << ", ";
if (emph() != INHERIT)
- ost << _("Emphasis ")
- << _(GUIMiscNames[emph()]) << ", ";
+ os << to_utf8(bformat(_("Emphasis %1$s, "),
+ _(GUIMiscNames[emph()])));
if (underbar() != INHERIT)
- ost << _("Underline ")
- << _(GUIMiscNames[underbar()]) << ", ";
+ os << to_utf8(bformat(_("Underline %1$s, "),
+ _(GUIMiscNames[underbar()])));
if (noun() != INHERIT)
- ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
- if (latex() != INHERIT)
- ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
+ os << to_utf8(bformat(_("Noun %1$s, "),
+ _(GUIMiscNames[noun()])));
if (bits == inherit)
- ost << _("Default") << ", ";
+ os << to_utf8(_("Default")) << ", ";
if (!params || (language() != params->language))
- ost << _("Language: ") << _(language()->display()) << ", ";
+ os << to_utf8(bformat(_("Language: %1$s, "),
+ _(language()->display())));
if (number() != OFF)
- ost << _(" Number ") << _(GUIMiscNames[number()]);
-
- string buf(ost.str().c_str());
- buf = strip(buf, ' ');
- buf = strip(buf, ',');
- return buf;
+ os << to_utf8(bformat(_(" Number %1$s"),
+ _(GUIMiscNames[number()])));
+ return rtrim(os.str(), ", ");
}
// Set family according to lyx format string
LyXFont & LyXFont::setLyXFamily(string const & fam)
{
- string const s = lowercase(fam);
+ string const s = ascii_lowercase(fam);
int i = 0;
- while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
- if (s == LyXFamilyNames[i]) {
+ while (LyXFamilyNames[i] != s &&
+ LyXFamilyNames[i] != string("error"))
+ ++i;
+ if (s == LyXFamilyNames[i])
setFamily(LyXFont::FONT_FAMILY(i));
- } else
+ else
lyxerr << "LyXFont::setLyXFamily: Unknown family `"
<< s << '\'' << endl;
return *this;
// Set series according to lyx format string
LyXFont & LyXFont::setLyXSeries(string const & ser)
{
- string const s = lowercase(ser);
+ 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
// Set shape according to lyx format string
LyXFont & LyXFont::setLyXShape(string const & sha)
{
- string const s = lowercase(sha);
+ string const s = ascii_lowercase(sha);
int i = 0;
- while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
- if (s == LyXShapeNames[i]) {
+ while (LyXShapeNames[i] != s && LyXShapeNames[i] != string("error"))
+ ++i;
+ if (s == LyXShapeNames[i])
setShape(LyXFont::FONT_SHAPE(i));
- } else
+ else
lyxerr << "LyXFont::setLyXShape: Unknown shape `"
<< s << '\'' << endl;
return *this;
// Set size according to lyx format string
LyXFont & LyXFont::setLyXSize(string const & siz)
{
- string const s = lowercase(siz);
+ 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
// Set size according to lyx format string
LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
{
- string const s = lowercase(siz);
+ 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 `"
{
bool error = false;
bool finished = false;
- while (!finished && lex.IsOK() && !error) {
+ while (!finished && lex.isOK() && !error) {
lex.next();
- string const tok = lowercase(lex.GetString());
+ string const tok = ascii_lowercase(lex.getString());
if (tok.empty()) {
continue;
finished = true;
} else if (tok == "family") {
lex.next();
- string const ttok = lex.GetString();
+ string const ttok = lex.getString();
setLyXFamily(ttok);
} else if (tok == "series") {
lex.next();
- string const ttok = lex.GetString();
+ string const ttok = lex.getString();
setLyXSeries(ttok);
} else if (tok == "shape") {
lex.next();
- string const ttok = lex.GetString();
+ string const ttok = lex.getString();
setLyXShape(ttok);
} else if (tok == "size") {
lex.next();
- string const ttok = lex.GetString();
+ string const ttok = lex.getString();
setLyXSize(ttok);
- } else if (tok == "latex") {
- lex.next();
- string const ttok = lowercase(lex.GetString());
-
- if (ttok == "no_latex") {
- setLatex(OFF);
- } else if (ttok == "latex") {
- setLatex(ON);
- } else {
- lex.printError("Illegal LaTeX type`$$Token'");
- }
} else if (tok == "misc") {
lex.next();
- string const ttok = lowercase(lex.GetString());
+ string const ttok = ascii_lowercase(lex.getString());
if (ttok == "no_bar") {
setUnderbar(OFF);
}
} else if (tok == "color") {
lex.next();
- string const ttok = lex.GetString();
+ string const ttok = lex.getString();
setLyXColor(ttok);
} else {
lex.printError("Unknown tag `$$Token'");
/// Writes the changes from this font to orgfont in .lyx format in file
-void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
+void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
+ ostream & os) const
{
os << "\n";
- if (orgfont.family() != family()) {
- os << "\\family " << LyXFamilyNames[family()] << " \n";
- }
- if (orgfont.series() != series()) {
- os << "\\series " << LyXSeriesNames[series()] << " \n";
- }
- if (orgfont.shape() != shape()) {
- os << "\\shape " << LyXShapeNames[shape()] << " \n";
- }
- if (orgfont.size() != size()) {
- os << "\\size " << LyXSizeNames[size()] << " \n";
- }
- if (orgfont.emph() != emph()) {
- os << "\\emph " << LyXMiscNames[emph()] << " \n";
- }
- if (orgfont.number() != number()) {
- os << "\\numeric " << LyXMiscNames[number()] << " \n";
- }
+ if (orgfont.family() != family())
+ os << "\\family " << LyXFamilyNames[family()] << "\n";
+ if (orgfont.series() != series())
+ os << "\\series " << LyXSeriesNames[series()] << "\n";
+ if (orgfont.shape() != shape())
+ os << "\\shape " << LyXShapeNames[shape()] << "\n";
+ if (orgfont.size() != size())
+ os << "\\size " << LyXSizeNames[size()] << "\n";
+ if (orgfont.emph() != emph())
+ os << "\\emph " << LyXMiscNames[emph()] << "\n";
+ if (orgfont.number() != number())
+ 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";
- }
- if (orgfont.latex() != latex()) {
- // This is only for backwards compatibility
- switch (latex()) {
- case OFF: os << "\\latex no_latex \n"; break;
- case ON: os << "\\latex latex \n"; break;
- case TOGGLE: lyxerr << "LyXFont::lyxWriteFontChanges: "
- "TOGGLE should not appear here!"
- << endl;
- break;
- case INHERIT: os << "\\latex default \n"; break;
- case IGNORE: lyxerr << "LyXFont::lyxWriteFontChanges: "
- "IGNORE should not appear here!"
- << endl;
- break;
- }
+ os << "\\noun " << LyXMiscNames[noun()] << "\n";
}
- if (orgfont.color() != color()) {
- // To make us file compatible with older
- // lyx versions we emit "default" instead
- // of "inherit"
- string col_str(lcolor.getLyXName(color()));
- if (col_str == "inherit") col_str = "default";
- os << "\\color " << col_str << "\n";
- }
- if (orgfont.language() != language()) {
+ if (orgfont.color() != color())
+ os << "\\color " << lcolor.getLyXName(color()) << '\n';
+ if (orgfont.language() != language() &&
+ language() != latex_language) {
if (language())
os << "\\lang " << language()->lang() << "\n";
else
/// Writes the head of the LaTeX needed to impose this font
// Returns number of chars written.
-int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
+int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
LyXFont const & prev) const
{
int count = 0;
bool env = false;
if (language()->babel() != base.language()->babel() &&
- language()->babel() != prev.language()->babel()) {
+ language() != prev.language()) {
if (isRightToLeft() != prev.isRightToLeft()) {
if (isRightToLeft()) {
os << "\\R{";
string const tmp =
subst(lyxrc.language_command_local,
"$$lang", language()->babel());
- os << tmp;
+ os << from_ascii(tmp);
count += tmp.length();
}
}
LyXFont f = *this;
f.reduce(base);
-
+
if (f.family() != INHERIT_FAMILY) {
os << '\\'
<< LaTeXFamilyNames[f.family()]
}
if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
os << "\\textcolor{"
- << lcolor.getLaTeXName(f.color())
+ << from_ascii(lcolor.getLaTeXName(f.color()))
<< "}{";
count += lcolor.getLaTeXName(f.color()).length() + 13;
env = true; //We have opened a new environment
// \noun{} is a LyX special macro
if (f.noun() == ON) {
os << "\\noun{";
- count += 8;
+ count += 6;
env = true; //We have opened a new environment
}
if (f.size() != INHERIT_SIZE) {
/// Writes ending block of LaTeX needed to close use of this font
// Returns number of chars written
// This one corresponds to latexWriteStartChanges(). (Asger)
-int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
+int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
LyXFont const & next) const
{
int count = 0;
bool env = false;
- LyXFont f = *this; // why do you need this?
- f.reduce(base); // why isn't this just "reduce(base);" (Lgb)
- // Because this function is const. Everything breaks if this
- // method changes the font it represents. There is no speed penalty
- // by using the temporary. (Asger)
-
+ // reduce the current font to changes against the base
+ // font (of the layout). We use a temporary for this to
+ // avoid changing this font instance, as that would break
+ LyXFont f = *this;
+ f.reduce(base);
if (f.family() != INHERIT_FAMILY) {
os << '}';
}
if (language() != base.language() && language() != next.language()) {
- os << "}";
+ os << '}';
++count;
}
}
-LColor::color LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
{
- if (latex() == ON)
- return LColor::latex;
if (color() == LColor::none)
return LColor::foreground;
return color();
}
-// Convert logical attributes to concrete shape attribute
-LyXFont::FONT_SHAPE LyXFont::realShape() const
+ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
{
- register FONT_SHAPE s = shape();
-
- if (emph() == ON) {
- if (s == UP_SHAPE)
- s = ITALIC_SHAPE;
- else
- s = UP_SHAPE;
- }
- if (noun() == ON)
- s = SMALLCAPS_SHAPE;
- return s;
+ return os << int(fms);
}
-bool LyXFont::equalExceptLatex(LyXFont const & f) const
+std::ostream & operator<<(std::ostream & os, LyXFont const & font)
{
- LyXFont f1 = *this;
- f1.setLatex(f.latex());
- return f1 == f;
+ 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);
}
-ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
-{
- return o << int(fms);
-}
+} // namespace lyx
projects / lyx.git / blobdiff