*/
VSpace defskip;
PDFOptions pdfoptions;
- BaseClassIndex baseClass_;
+ LayoutFileIndex baseClass_;
};
string tcp;
BaseClassList & bcl = BaseClassList::get();
if (!filepath.empty())
- tcp = bcl.addTextClass(classname, filepath.absFilename());
+ tcp = bcl.addLayoutFile(classname, filepath.absFilename());
if (!tcp.empty())
setBaseClass(tcp);
else if (bcl.haveClass(classname)) {
// FIXME: this warning will be given even if there exists a local .cls
// file. Even worse, the .lyx file can not be compiled or exported
// because the textclass is marked as unavilable.
- if (!documentClass().isTeXClassAvailable()) {
+ if (!baseClass()->isTeXClassAvailable()) {
docstring const msg =
bformat(_("The layout file requested by this document,\n"
"%1$s.layout,\n"
bool BufferParams::setBaseClass(string const & classname)
{
- string localtc = classname;
+ LYXERR(Debug::TCLASS, "setBaseClass: " << classname);
BaseClassList const & bcl = BaseClassList::get();
- if (!bcl.haveClass(localtc)) {
- // OK, let's try again assuming it's a local file
- localtc = BaseClassList::localPrefix + localtc;
- if (!bcl.haveClass(localtc)) {
- docstring s =
- bformat(_("The document class %1$s could not be found."),
- from_utf8(classname));
- frontend::Alert::error(_("Class not found"), s);
- return false;
- }
+ if (!bcl.haveClass(classname)) {
+ docstring s =
+ bformat(_("The document class %1$s could not be found."),
+ from_utf8(classname));
+ frontend::Alert::error(_("Class not found"), s);
+ return false;
}
- if (bcl[localtc].load()) {
- pimpl_->baseClass_ = localtc;
+ if (bcl[classname].load()) {
+ pimpl_->baseClass_ = classname;
return true;
}
}
-TextClass const * BufferParams::baseClass() const
+LayoutFile const * BufferParams::baseClass() const
{
if (BaseClassList::get().haveClass(pimpl_->baseClass_))
return &(BaseClassList::get()[pimpl_->baseClass_]);
}
-BaseClassIndex const & BufferParams::baseClassID() const
+LayoutFileIndex const & BufferParams::baseClassID() const
{
return pimpl_->baseClass_;
}