more latin1..utf8 schanges. all of src/* should be utf8 now

[lyx.git] / src / tex2lyx / Font.h

diff --git a/src/tex2lyx/Font.h b/src/tex2lyx/Font.h
index e9335593cc6e5a10e4b44eca5af67114058e364e..b77ead7383a6e2a43cd37ee177c7ec779ba5b030 100644 (file)
--- a/src/tex2lyx/Font.h
+++ b/src/tex2lyx/Font.h
@@ -17,26 +17,37 @@
 #ifndef TEX2LYX_FONT_H
 #define TEX2LYX_FONT_H
 
+//#include "FontInfo.h"
+
 namespace lyx {
 
 class Lexer;
 
-class Font {
+class FontInfo
+{
 public:
-       /// Trick to overload constructor and make it megafast
-       enum FONT_INIT1 { ALL_INHERIT };
-       enum FONT_INIT3 { ALL_SANE };
-
-       Font() {}
-       explicit Font(Font::FONT_INIT1) {}
-       explicit Font(Font::FONT_INIT3) {}
+       FontInfo() {}
+       FontInfo & realize(FontInfo const &) { return *this; }
+       void setColor(int) {}
+       bool resolved() const { return true; }
+};
 
-       Font & lyxRead(Lexer &);
+/// Sane font.
+extern FontInfo const sane_font;
+/// All inherit font.
+extern FontInfo const inherit_font;
+/// All ignore font.
+extern FontInfo const ignore_font;
 
-       Font & realize(Font const &) { return *this; }
-       bool resolved() const { return true; }
+class Font
+{
+public:
+       Font() {}
+       Font(FontInfo const &) {}
 };
 
+/// Read a font specification from Lexer. Used for layout files.
+FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
 
 } // namespace lyx