]> git.lyx.org Git - lyx.git/commitdiff
Do not call InsetCommandParams::read in InsetInclude::read anymore, since
authorGeorg Baum <Georg.Baum@post.rwth-aachen.de>
Thu, 9 Nov 2006 17:45:42 +0000 (17:45 +0000)
committerGeorg Baum <Georg.Baum@post.rwth-aachen.de>
Thu, 9 Nov 2006 17:45:42 +0000 (17:45 +0000)
the syntax of InsetInclude did not change when the syntax of InsetCommand
changed. Therefore we need to implement our own read method.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15833 a592a061-630c-0410-9148-cb99ea01b6c8

src/insets/insetinclude.C

index 89247ce0a54d9ac40efc51e3777fc5e54c84c08d..3a4965eaa12aed8dbbeb2d5b1c571f120a95dca3 100644 (file)
@@ -273,7 +273,27 @@ void InsetInclude::read(Buffer const &, LyXLex & lex)
 
 void InsetInclude::read(LyXLex & lex)
 {
-       params_.read(lex);
+       if (lex.isOK()) {
+               lex.next();
+               string const command = lex.getString();
+               params_.scanCommand(command);
+       }
+       string token;
+       while (lex.isOK()) {
+               lex.next();
+               token = lex.getString();
+               if (token == "\\end_inset")
+                       break;
+               if (token == "preview") {
+                       lex.next();
+                       params_.preview(lex.getBool());
+               } else
+                       lex.printError("Unknown parameter name `$$Token' for command " + params_.getCmdName());
+       }
+       if (token != "\\end_inset") {
+               lex.printError("Missing \\end_inset at this point. "
+                              "Read: `$$Token'");
+       }
 }