Don try to be smart and always protect the preamble with \makeatletter

[lyx.git] / src / FontInfo.cpp

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index 2623f2ea232f1eb9a0fda85a84b93a1ae2ac1a61..c549ff54d4ae5abb6d15c11f3a8f6c2f06228d0b 100644 (file)
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -3,10 +3,10 @@
  * 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.
@@ -18,8 +18,6 @@
 
 #include "support/debug.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
@@ -34,6 +32,9 @@ FontInfo const sane_font(
        FONT_OFF,
        FONT_OFF,
        FONT_OFF,
+       FONT_OFF,
+       FONT_OFF,
+       FONT_OFF,
        FONT_OFF);
 
 FontInfo const inherit_font(
@@ -46,6 +47,9 @@ FontInfo const inherit_font(
        FONT_INHERIT,
        FONT_INHERIT,
        FONT_INHERIT,
+       FONT_INHERIT,
+       FONT_INHERIT,
+       FONT_INHERIT,
        FONT_OFF);
 
 FontInfo const ignore_font(
@@ -58,6 +62,9 @@ FontInfo const ignore_font(
        FONT_IGNORE,
        FONT_IGNORE,
        FONT_IGNORE,
+       FONT_IGNORE,
+       FONT_IGNORE,
+       FONT_IGNORE,
        FONT_IGNORE);
 
 
@@ -81,16 +88,16 @@ FontInfo & FontInfo::decSize()
        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;
@@ -112,16 +119,16 @@ FontInfo & FontInfo::incSize()
        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;
@@ -143,6 +150,12 @@ void FontInfo::reduce(FontInfo const & tmplt)
                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_)
@@ -178,6 +191,15 @@ FontInfo & FontInfo::realize(FontInfo const & tmplt)
        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_;
 
@@ -254,6 +276,9 @@ void FontInfo::update(FontInfo const & newfont, bool toggleall)
 
        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_));
 
@@ -274,14 +299,17 @@ bool FontInfo::resolved() const
        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_;