tex2lyx/text.cpp: take care of the brace pair after comment environments that are...

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

diff --git a/src/tex2lyx/Font.cpp b/src/tex2lyx/Font.cpp
index 4e6ca6ed9e2b8cbb69894b064229e1fa19a009e5..a5a3042683d0c84724b6430f9bbf4ba7ab0074ee 100644 (file)
--- a/src/tex2lyx/Font.cpp
+++ b/src/tex2lyx/Font.cpp
@@ -14,15 +14,20 @@
 #include "Lexer.h"
 #include "support/lstrings.h"
 
+using namespace std;
 
 namespace lyx {
 
 using lyx::support::ascii_lowercase;
 
-using std::string;
+/// Sane font.
+FontInfo const sane_font;
+/// All inherit font.
+FontInfo const inherit_font;
+/// All ignore font.
+FontInfo const ignore_font;
 
-
-Font & Font::lyxRead(Lexer & lex)
+FontInfo lyxRead(Lexer & lex, FontInfo const &)
 {
        bool error = false;
        bool finished = false;
@@ -51,7 +56,7 @@ Font & Font::lyxRead(Lexer & lex)
                        error = true;
                }
        }
-       return *this;
+       return FontInfo();
 }