#include "InsetBox.h"
#include "BufferView.h"
-#include "LCursor.h"
+#include "Cursor.h"
#include "DispatchResult.h"
#include "debug.h"
#include "FuncStatus.h"
#include "FuncRequest.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
-#include "LColor.h"
-#include "LyXLex.h"
+#include "Color.h"
+#include "Lexer.h"
#include "MetricsInfo.h"
#include "Paragraph.h"
#include "TextMetrics.h"
-#include "support/translator.h"
+#include "support/Translator.h"
#include <sstream>
}
-void InsetBox::read(Buffer const & buf, LyXLex & lex)
+void InsetBox::read(Buffer const & buf, Lexer & lex)
{
params_.read(lex);
InsetCollapsable::read(buf, lex);
setLabel(label);
- font.setColor(LColor::foreground);
- setBackgroundColor(LColor::background);
+ font.setColor(Color::foreground);
+ setBackgroundColor(Color::background);
setLabelFont(font);
}
}
-void InsetBox::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
}
-bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
switch (cmd.action) {
return;
istringstream data(in);
- LyXLex lex(0,0);
+ Lexer lex(0,0);
lex.setStream(data);
string name;
: type(label),
use_parbox(false),
inner_box(true),
- width(LyXLength("100col%")),
+ width(Length("100col%")),
special("none"),
pos('t'),
hor_pos('c'),
inner_pos('t'),
- height(LyXLength("1in")),
+ height(Length("1in")),
height_special("totalheight") // default is 1\\totalheight
{}
}
-void InsetBoxParams::read(LyXLex & lex)
+void InsetBoxParams::read(Lexer & lex)
{
if (!lex.isOK())
return;
return;
if (token == "width") {
lex.next();
- width = LyXLength(lex.getString());
+ width = Length(lex.getString());
} else {
lyxerr << "InsetBox::Read: Missing 'width'-tag!" << endl;
lex.pushToken(token);
return;
if (token == "height") {
lex.next();
- height = LyXLength(lex.getString());
+ height = Length(lex.getString());
} else {
lyxerr << "InsetBox::Read: Missing 'height'-tag!" << endl;
lex.pushToken(token);