X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=2ffce829c8ea4c1039ad2fec9badbef58beb7f56;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=f3247513e27c2bb409622d7af27068da3ad65629;hpb=30aa0e30b6d0b0426550eab91cd2bcc168fa706f;p=lyx.git diff --git a/src/lyxfont.C b/src/lyxfont.C index f3247513e2..2ffce829c8 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -1,29 +1,42 @@ -/* This file is part of - * ====================================================== +/** + * \file src/lyxfont.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author Lars Gullik Bjønnes + * \author Jean-Marc Lasgouttes + * \author Angus Leeming + * \author André Pönitz + * \author Dekel Tsur * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * Full author contact details are available in file CREDITS. + */ #include -#include -#include -#include "gettext.h" #include "lyxfont.h" + +#include "bufferparams.h" // stateText #include "debug.h" -#include "lyxrc.h" -#include "lyxlex.h" +#include "gettext.h" #include "language.h" -#include "Lsstream.h" +#include "LColor.h" +#include "lyxlex.h" +#include "lyxrc.h" + #include "support/lstrings.h" -#include "bufferparams.h" // stateText -using std::ostream; +#include + +using lyx::support::ascii_lowercase; +using lyx::support::bformat; +using lyx::support::rtrim; +using lyx::support::subst; + using std::endl; +using std::string; +using std::ostream; +using std::ostringstream; #ifndef CXX_GLOBAL_CSTD using std::strlen; @@ -190,9 +203,9 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const } -LColor::color LyXFont::color() const +LColor_color LyXFont::color() const { - return bits.color; + return LColor::color(bits.color); } @@ -221,73 +234,63 @@ bool LyXFont::isVisibleRightToLeft() const } -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::setColor(LColor::color c) +void 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; } @@ -532,7 +535,7 @@ string const LyXFont::stateText(BufferParams * params) const os << bformat(_("Language: %1$s, "), _(language()->display())); if (number() != OFF) os << bformat(_(" Number %1$s"), _(GUIMiscNames[number()])); - return rtrim(STRCONV(os.str()), ", "); + return rtrim(os.str(), ", "); } @@ -697,33 +700,33 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, { 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; @@ -731,7 +734,7 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, } } 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 @@ -918,7 +921,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base, } -LColor::color LyXFont::realColor() const +LColor_color LyXFont::realColor() const { if (color() == LColor::none) return LColor::foreground; @@ -943,7 +946,23 @@ LyXFont::FONT_SHAPE LyXFont::realShape() const } -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); }