Stupid bug fix.

[lyx.git] / src / insets / InsetNewpage.cpp

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index e7b9b0523a2ac251187ef7da76a9a5a23b16de43..511fbfb6e7fe958c2081e15298f4272e8b898582 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -15,10 +15,10 @@
 
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "Text.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "Text.h"
 #include "TextMetrics.h"
 
 #include "frontends/FontMetrics.h"
@@ -65,27 +65,22 @@ void InsetNewpageParams::write(ostream & os) const
 
 void InsetNewpageParams::read(Lexer & lex)
 {
-       lex.next();
-       string const command = lex.getString();
+       lex.setContext("InsetNewpageParams::read");
+       string token;
+       lex >> token;
 
-       if (command == "newpage")
+       if (token == "newpage")
                kind = InsetNewpageParams::NEWPAGE;
-       else if (command == "pagebreak")
+       else if (token == "pagebreak")
                kind = InsetNewpageParams::PAGEBREAK;
-       else if (command == "clearpage")
+       else if (token == "clearpage")
                kind = InsetNewpageParams::CLEARPAGE;
-       else if (command == "cleardoublepage")
+       else if (token == "cleardoublepage")
                kind = InsetNewpageParams::CLEARDOUBLEPAGE;
        else
-               lex.printError("InsetNewpage: Unknown kind: `$$Token'");
+               lex.printError("Unknown kind");
 
-       string token;
-       lex >> token;
-       if (!lex)
-               return;
-       if (token != "\\end_inset")
-               lex.printError("Missing \\end_inset at this point. "
-                              "Read: `$$Token'");
+       lex >> "\\end_inset";
 }
 
 
@@ -168,9 +163,8 @@ bool InsetNewpage::getStatus(Cursor & cur, FuncRequest const & cmd,
                        InsetNewpageParams params;
                        string2params(to_utf8(cmd.argument()), params);
                        status.setOnOff(params_.kind == params.kind);
-               } else {
-                       status.enabled(true);
-               }
+               } 
+               status.setEnabled(true);
                return true;
        default:
                return Inset::getStatus(cur, cmd, status);
@@ -272,7 +266,7 @@ void InsetNewpage::string2params(string const & in, InsetNewpageParams & params)
                return;
 
        istringstream data(in);
-       Lexer lex(0,0);
+       Lexer lex;
        lex.setStream(data);
 
        string name;