#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/lstrings.h"
+#include "support/debug.h"
+#include "support/ExceptionMessage.h"
#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
#include "support/os.h"
#include <sstream>
titletype_ = TITLE_COMMAND_AFTER;
titlename_ = "maketitle";
loaded_ = false;
+ // a hack to make this available for translation
+ // i'm sure there must be a better way (rgh)
+ _("PlainLayout");
}
+docstring const TextClass::emptylayout_ = from_ascii("PlainLayout");
+
+
+InsetLayout TextClass::empty_insetlayout_;
+
+
bool TextClass::isTeXClassAvailable() const
{
return texClassAvail_;
{
LYXERR(Debug::TCLASS, "Reading style " << to_utf8(lay.name()));
if (!lay.read(lexrc, *this)) {
- // Resolve fonts
- lay.resfont = lay.font;
- lay.resfont.realize(defaultfont());
- lay.reslabelfont = lay.labelfont;
- lay.reslabelfont.realize(defaultfont());
- return false; // no errors
+ lyxerr << "Error parsing style `" << to_utf8(lay.name()) << '\'' << endl;
+ return false;
}
- lyxerr << "Error parsing style `" << to_utf8(lay.name()) << '\'' << endl;
- return true;
+ // Resolve fonts
+ lay.resfont = lay.font;
+ lay.resfont.realize(defaultfont());
+ lay.reslabelfont = lay.labelfont;
+ lay.reslabelfont.realize(defaultfont());
+ return true; // no errors
}
if (!filename.isReadableFile()) {
lyxerr << "Cannot read layout file `" << filename << "'."
<< endl;
- return true;
+ return false;
}
keyword_item textClassTags[] = {
LYXERR(Debug::TCLASS, "Reading " + translateRT(rt) + ": " +
to_utf8(makeDisplayPath(filename.absFilename())));
+ // Define the `empty' layout used in table cells, ert, etc. Note that
+ // we do this before loading any layout file, so that classes can
+ // override features of this layout if they should choose to do so.
+ if (rt == BASECLASS) {
+ static char const * s = "Margin Static\n"
+ "LatexType Paragraph\n"
+ "LatexName dummy\n"
+ "Align Block\n"
+ "AlignPossible Left, Right, Center\n"
+ "LabelType No_Label\n"
+ "End";
+ istringstream ss(s);
+ Lexer lex(textClassTags, sizeof(textClassTags) / sizeof(textClassTags[0]));
+ lex.setStream(ss);
+ Layout lay;
+ lay.setName(emptylayout_);
+ if (!readStyle(lex, lay)) {
+ // The only way this happens is because the hardcoded layout above
+ // is wrong.
+ BOOST_ASSERT(false);
+ }
+ layoutlist_.push_back(boost::shared_ptr<Layout>(new Layout(lay)));
+ }
+
Lexer lexrc(textClassTags,
sizeof(textClassTags) / sizeof(textClassTags[0]));
if (tmp.empty()) {
lexrc.printError("Could not find input file: " + inc);
error = true;
- } else if (read(tmp, MERGE)) {
+ } else if (!read(tmp, MERGE)) {
lexrc.printError("Error reading input"
"file: " + tmp.absFilename());
error = true;
+ lexrc.getString() + " is probably not valid UTF-8!";
lexrc.printError(s.c_str());
Layout lay;
- error = readStyle(lexrc, lay);
+ //FIXME If we're just dropping this layout, do we really
+ //care whether there's an error?? Or should we just set
+ //error to true, since we couldn't even read the name?
+ error = !readStyle(lexrc, lay);
} else if (hasLayout(name)) {
Layout * lay = operator[](name).get();
- error = readStyle(lexrc, *lay);
+ error = !readStyle(lexrc, *lay);
} else {
Layout lay;
lay.setName(name);
if (le == TC_ENVIRONMENT)
lay.is_environment = true;
- error = readStyle(lexrc, lay);
+ error = !readStyle(lexrc, lay);
if (!error)
- layoutlist_.push_back(
- boost::shared_ptr<Layout>(new Layout(lay))
- );
+ layoutlist_.push_back(boost::shared_ptr<Layout>(new Layout(lay)));
if (defaultlayout_.empty()) {
- // We do not have a default
- // layout yet, so we choose
- // the first layout we
- // encounter.
+ // We do not have a default layout yet, so we choose
+ // the first layout we encounter.
defaultlayout_ = name;
}
}
}
else {
+ //FIXME Should we also eat the style here? viz:
+ //Layout lay;
+ //readStyle(lexrc, lay);
+ //as above...
lexrc.printError("No name given for style: `$$Token'.");
error = true;
}
if (!deleteLayout(style))
lyxerr << "Cannot delete style `"
<< to_utf8(style) << '\'' << endl;
-// lexrc.printError("Cannot delete style"
-// " `$$Token'");
}
break;
tocdepth_ = lexrc.getInteger();
break;
- // First step to support options
+ // First step to support options
case TC_CLASSOPTIONS:
readClassOptions(lexrc);
break;
if (lexrc.next())
rightmargin_ = lexrc.getDocString();
break;
+
case TC_INSETLAYOUT:
if (lexrc.next()) {
docstring const name = subst(lexrc.getDocString(), '_', ' ');
readInsetLayout(lexrc, name);
}
break;
+
case TC_FLOAT:
readFloat(lexrc);
break;
+
case TC_COUNTER:
readCounter(lexrc);
break;
+
case TC_TITLELATEXTYPE:
readTitleType(lexrc);
break;
+
case TC_TITLELATEXNAME:
if (lexrc.next())
titlename_ = lexrc.getString();
break;
+
case TC_NOFLOAT:
if (lexrc.next()) {
string const nofloat = lexrc.getString();
}
break;
}
+
+ //Note that this is triggered the first time through the loop unless
+ //we hit a format tag.
if (format != FORMAT)
break;
}
if (!error)
error = read(tempfile, rt);
tempfile.removeFile();
- return error;
+ return !error;
}
LYXERR(Debug::TCLASS, "Finished reading " + translateRT(rt) + ": " +
to_utf8(makeDisplayPath(filename.absFilename())));
if (rt != BASECLASS)
- return error;
+ return !error;
if (defaultlayout_.empty()) {
lyxerr << "Error: Textclass '" << name_
FileName tmp = libFileSearch("layouts", "stdinsets.inc");
if (tmp.empty()) {
- frontend::Alert::warning(_("Missing File"),
- _("Could not find stdinsets.inc! This may lead to data loss!"));
+ throw ExceptionMessage(WarningException, _("Missing File"),
+ _("Could not find stdinsets.inc! This may lead to data loss!"));
error = true;
- } else if (read(tmp, MERGE)) {
- frontend::Alert::warning(_("Corrupt File"),
- _("Could not read stdinsets.inc! This may lead to data loss!"));
+ } else if (!read(tmp, MERGE)) {
+ throw ExceptionMessage(WarningException, _("Corrupt File"),
+ _("Could not read stdinsets.inc! This may lead to data loss!"));
error = true;
}
}
LYXERR(Debug::TCLASS, "Minimum TocLevel is " << min_toclevel_
<< ", maximum is " << max_toclevel_);
- return error;
+ return !error;
}
// 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;
}
bool TextClass::deleteLayout(docstring const & name)
{
- if (name == defaultLayoutName())
+ if (name == defaultLayoutName() || name == emptyLayoutName())
return false;
LayoutList::iterator it =
layout_file = FileName(addName(path, name_ + ".layout"));
if (layout_file.empty() || !layout_file.exists())
layout_file = libFileSearch("layouts", name_, "layout");
- loaded_ = const_cast<TextClass*>(this)->read(layout_file) == 0;
+ loaded_ = const_cast<TextClass*>(this)->read(layout_file);
if (!loaded_) {
lyxerr << "Error reading `"
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_;
}
projects / lyx.git / blobdiff