- string token;
-
- if (lex.IsOK()) {
- lex.next();
- token = lex.GetString();
- if (token == "position") {
- lex.next();
- pos_ = static_cast<Position>(lex.GetInteger());
- token = string();
- } else {
- lyxerr << "InsetMinipage::Read: Missing 'position'-tag!"
- << endl;
- }
- }
- if (lex.IsOK()) {
- if (token.empty()) {
- lex.next();
- token = lex.GetString();
- }
- if (token == "inner_position") {
- lex.next();
- inner_pos_ = static_cast<InnerPosition>(lex.GetInteger());
- token = string();
- } else {
- lyxerr << "InsetMinipage::Read: Missing 'inner_position'-tag!"
- << endl;
- }
- }
- if (lex.IsOK()) {
- if (token.empty()) {
- lex.next();
- token = lex.GetString();
- }
- if (token == "height") {
- lex.next();
- height_ = lex.GetString();
- token = string();
- } else {
- lyxerr << "InsetMinipage::Read: Missing 'height'-tag!"
- << endl;
- }
- }
- if (lex.IsOK()) {
- if (token.empty()) {
- lex.next();
- token = lex.GetString();
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token == "position") {
+ lex.next();
+ pos_ = static_cast<Position>(lex.getInteger());
+ } else {
+ lyxerr << "InsetMinipage::Read: Missing 'position'-tag!"
+ << endl;
+ // take countermeasures
+ lex.pushToken(token);
+ }