- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 2c3b3c25d2fec7853e04137e726b6448823503a5..6416713986ec2acf17785e508873608a6ba96c5e 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -1,5 +1,5 @@
 /**
- * \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.
  *
@@ -26,7 +26,7 @@
 
 #include "support/lstrings.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::support::ascii_lowercase;
 using lyx::support::bformat;
@@ -545,7 +545,8 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
        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));
@@ -562,7 +563,8 @@ LyXFont & LyXFont::setLyXSeries(string const & 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
@@ -578,7 +580,8 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
        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
@@ -593,7 +596,8 @@ LyXFont & LyXFont::setLyXSize(string const & 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
@@ -608,7 +612,8 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & 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 `"
@@ -700,33 +705,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;
@@ -734,7 +739,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
@@ -946,7 +951,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 o << int(fms);
+       return os << int(fms);
+}
+
+
+std::ostream & operator<<(std::ostream & os, LyXFont const & font)
+{
+       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);
 }