Fix up the InsetMathGrid output: detect better if we have a table, and

[lyx.git] / src / Font.h

diff --git a/src/Font.h b/src/Font.h
index c306daa75ca0a138763d5972d5cd8e7a199bc9c2..7c0b61134fdcd00d7abd5e79de58520a26c6374d 100644 (file)
--- a/src/Font.h
+++ b/src/Font.h
@@ -4,7 +4,7 @@
  * 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 Dekel Tsur
@@ -15,19 +15,14 @@
 #ifndef FONT_H
 #define FONT_H
 
-#ifdef TEX2LYX
-#include "tex2lyx/Font.h"
-#else
-
 #include "ColorCode.h"
 #include "FontInfo.h"
 
-#include "support/docstream.h"
+#include "support/strfwd.h"
 
 
 namespace lyx {
 
-class Lexer;
 class BufferParams;
 class Language;
 class LaTeXFeatures;
@@ -47,16 +42,16 @@ public:
        ///
        Language const * language() const { return lang_; }
        ///
+       void setMisspelled(bool misspelled) { misspelled_ = misspelled; }
+       ///
+       bool isMisspelled() const { return misspelled_; }
+       ///
        bool isRightToLeft() const;
        ///
        bool isVisibleRightToLeft() const;
        ///
        void setLanguage(Language const * l);
 
-       /// Returns misc flag after LyX text format
-       FontState setLyXMisc(std::string const &);
-
-
        /// Returns size of font in LaTeX text notation
        std::string const latexSize() const;
 
@@ -121,6 +116,8 @@ private:
        FontInfo bits_;
        ///
        Language const * lang_;
+       ///
+       bool misspelled_;
 
        /// Did latexWriteStartChanges open an encoding environment?
        mutable bool open_encoding_;
@@ -131,7 +128,8 @@ private:
 inline
 bool operator==(Font const & font1, Font const & font2)
 {
-       return font1.bits_ == font2.bits_ && font1.lang_ == font2.lang_;
+       return font1.bits_ == font2.bits_ && font1.lang_ == font2.lang_
+           && font1.misspelled_ == font2.misspelled_;
 }
 
 ///
@@ -146,26 +144,6 @@ bool operator!=(Font const & font1, Font const & font2)
  */
 std::string const freefont2string();
 
-
-/// Set family after LyX text format
-void setLyXFamily(std::string const &, FontInfo &);
-
-/// Set series after LyX text format
-void setLyXSeries(std::string const &, FontInfo &);
-
-/// Set shape after LyX text format
-void setLyXShape(std::string const &, FontInfo &);
-
-/// Set size after LyX text format
-void setLyXSize(std::string const &, FontInfo &);
-
-/// Sets color after LyX text format
-void setLyXColor(std::string const &, FontInfo &);
-
-/// Read a font specification from Lexer. Used for layout files.
-FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
-
 } // namespace lyx
 
-#endif // TEX2LYX
 #endif