+2003-03-10 Angus Leeming <leeming@lyx.org>
+
+ * insetcommand.C (string2params):
+ * insetexternal.C (string2params):
+ * insetfloat.C (string2params):
+ * insetgraphics.C (string2params):
+ * insetinclude.C (string2params):
+ * insetminipage.C (string2params):
+ * insettabular.C (string2params):
+ * insetwrap.C (string2params): cure warning message about missing
+ '\end_inset'.
+
2003-03-09 Angus Leeming <leeming@lyx.org>
* insettabular.[Ch]: define a new class InsetTabularMailer and use
string const name = lex.getString();
}
- params.read(lex);
+ // This is part of the inset proper that is usually swallowed
+ // by Buffer::readInset
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != "LatexCommand")
+ return;
+ }
+ if (lex.isOK()) {
+ params.read(lex);
+ }
}
return;
}
- InsetExternal inset;
- inset.read(0, lex);
- params = inset.params();
+ if (lex.isOK()) {
+ InsetExternal inset;
+ inset.read(0, lex);
+ params = inset.params();
+ }
}
return;
}
- params.read(lex);
+ if (lex.isOK()) {
+ params.read(lex);
+ }
}
return;
}
- InsetGraphics inset;
- inset.readInsetGraphics(lex);
- params = inset.params();
+ if (lex.isOK()) {
+ InsetGraphics inset;
+ inset.readInsetGraphics(lex);
+ params = inset.params();
+ }
}
return;
}
- InsetInclude inset(params);
- inset.read(0, lex);
- params = inset.params();
+ if (lex.isOK()) {
+ InsetInclude inset(params);
+ inset.read(0, lex);
+ params = inset.params();
+ }
}
return;
}
- params.read(lex);
+ if (lex.isOK()) {
+ params.read(lex);
+ }
}
return -1;
}
+ if (!lex.isOK())
+ return -1;
+
BufferView * const bv = inset.view();
Buffer const * const buffer = bv ? bv->buffer() : 0;
if (buffer)
return;
}
- params.read(lex);
+ if (lex.isOK()) {
+ params.read(lex);
+ }
}