#include "Layout.h"
#include "TextClass.h"
#include "Lexer.h"
-#include "debug.h"
+#include "Font.h"
+#include "support/debug.h"
-#include "support/lstrings.h"
-using std::endl;
-using std::string;
+#include "support/lstrings.h"
-namespace lyx {
+#include <ostream>
-using support::subst;
-using support::trim;
+using namespace std;
+using namespace lyx::support;
-extern FontInfo lyxRead(Lexer &);
+namespace lyx {
/// Special value of toclevel for layouts that to not belong in a TOC
const int Layout::NOT_IN_TOC = -1000;
LT_PARSKIP,
//LT_PLAIN,
LT_PREAMBLE,
+ LT_REQUIRES,
LT_RIGHTMARGIN,
LT_SPACING,
LT_TOPSEP,
{ "parskip", LT_PARSKIP },
{ "passthru", LT_PASS_THRU },
{ "preamble", LT_PREAMBLE },
+ { "requires", LT_REQUIRES },
{ "rightmargin", LT_RIGHTMARGIN },
{ "spacing", LT_SPACING },
{ "textfont", LT_TEXTFONT },
break;
case LT_FONT:
- font = lyxRead(lexrc);
+ font = lyxRead(lexrc, font);
labelfont = font;
break;
case LT_TEXTFONT:
- font = lyxRead(lexrc);
+ font = lyxRead(lexrc, font);
break;
case LT_LABELFONT:
- labelfont = lyxRead(lexrc);
+ labelfont = lyxRead(lexrc, labelfont);
break;
case LT_NEXTNOINDENT: // Indent next paragraph?
case LT_SPACING: // setspace.sty
readSpacing(lexrc);
break;
+
+ case LT_REQUIRES:
+ if (lexrc.eatLine())
+ requires_ = getVectorFromString(lexrc.getString());
+ break;
+
}
}
lexrc.popTable();