#include "Color.h"
#include "Counters.h"
-#include "support/debug.h"
-#include "support/gettext.h"
#include "Floating.h"
#include "FloatList.h"
#include "Layout.h"
#include "frontends/alert.h"
+#include "support/debug.h"
#include "support/ExceptionMessage.h"
-#include "support/lstrings.h"
#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
#include "support/os.h"
#include <sstream>
-#include <strstream>
using namespace std;
using namespace lyx::support;
docstring const TextClass::emptylayout_ = from_ascii("PlainLayout");
+InsetLayout TextClass::empty_insetlayout_;
+
+
bool TextClass::isTeXClassAvailable() const
{
return texClassAvail_;
bool TextClass::readStyle(Lexer & lexrc, Layout & lay)
{
LYXERR(Debug::TCLASS, "Reading style " << to_utf8(lay.name()));
- if (lay.read(lexrc, *this)) {
+ if (!lay.read(lexrc, *this)) {
lyxerr << "Error parsing style `" << to_utf8(lay.name()) << '\'' << endl;
return false;
}
"AlignPossible Left, Right, Center\n"
"LabelType No_Label\n"
"End";
- istrstream ss(s);
+ istringstream ss(s);
Lexer lex(textClassTags, sizeof(textClassTags) / sizeof(textClassTags[0]));
lex.setStream(ss);
Layout lay;
// Here add element to list if getout == true
if (getout) {
InsetLayout il;
- il.name = to_ascii(name);
- il.lyxtype = lyxtype;
- il.labelstring = labelstring;
- il.decoration = decoration;
- il.latextype = latextype;
- il.latexname = latexname;
- il.latexparam = latexparam;
- il.multipar = multipar;
- il.passthru = passthru;
- il.needprotect = needprotect;
- il.freespacing = freespacing;
- il.forceltr = forceltr;
- il.keepempty = keepempty;
- il.font = font;
+ il.name_ = to_ascii(name);
+ il.lyxtype_ = lyxtype;
+ il.labelstring_ = labelstring;
+ il.decoration_ = decoration;
+ il.latextype_ = latextype;
+ il.latexname_ = latexname;
+ il.latexparam_ = latexparam;
+ il.multipar_ = multipar;
+ il.passthru_ = passthru;
+ il.needprotect_ = needprotect;
+ il.freespacing_ = freespacing;
+ il.forceltr_ = forceltr;
+ il.keepempty_ = keepempty;
+ il.font_ = font;
// The label font is generally used as-is without
// any realization against a given context.
labelfont.realize(sane_font);
- il.labelfont = labelfont;
- il.bgcolor = bgcolor;
- il.preamble = preamble;
- il.requires = requires;
+ il.labelfont_ = labelfont;
+ il.bgcolor_ = bgcolor;
+ il.preamble_ = preamble;
+ il.requires_ = requires;
insetlayoutlist_[name] = il;
}
break;
n = n.substr(0,i);
}
- static InsetLayout empty;
- empty.labelstring = from_utf8("UNDEFINED");
- empty.labelfont = sane_font;
- empty.labelfont.setColor(Color_error);
- empty.bgcolor = Color_error;
- return empty;
+ return empty_insetlayout_;
}