LayoutFile::LayoutFile(string const & fn, string const & cln,
string const & desc, string const & prereq,
LayoutFile::LayoutFile(string const & fn, string const & cln,
string const & desc, string const & prereq,
default:
string const fname = lex.getString();
LYXERR(Debug::TCLASS, "Fname: " << fname);
default:
string const fname = lex.getString();
LYXERR(Debug::TCLASS, "Fname: " << fname);
break;
string const clname = lex.getString();
LYXERR(Debug::TCLASS, "Clname: " << clname);
break;
string const clname = lex.getString();
LYXERR(Debug::TCLASS, "Clname: " << clname);
break;
string const desc = lex.getString();
LYXERR(Debug::TCLASS, "Desc: " << desc);
break;
string const desc = lex.getString();
LYXERR(Debug::TCLASS, "Desc: " << desc);
break;
bool avail = lex.getBool();
LYXERR(Debug::TCLASS, "Avail: " << avail);
break;
bool avail = lex.getBool();
LYXERR(Debug::TCLASS, "Avail: " << avail);
break;
string const prereq = lex.getString();
LYXERR(Debug::TCLASS, "Prereq: " << prereq);
break;
string const prereq = lex.getString();
LYXERR(Debug::TCLASS, "Prereq: " << prereq);
break;
string const category = lex.getString();
LYXERR(Debug::TCLASS, "Category: " << category);
break;
string const category = lex.getString();
LYXERR(Debug::TCLASS, "Category: " << category);
LATTEST(haveClass(classname));
// safe to continue, since we will make an empty LayoutFile
LayoutFile * tc = classmap_[classname];
LATTEST(haveClass(classname));
// safe to continue, since we will make an empty LayoutFile
LayoutFile * tc = classmap_[classname];
new LayoutFile(tc->name(), tc->latexname(), tc->description(),
tc->prerequisites(), tc->category(),
tc->isTeXClassAvailable());
new LayoutFile(tc->name(), tc->latexname(), tc->description(),
tc->prerequisites(), tc->category(),
tc->isTeXClassAvailable());
" AlignPossible Block, Left, Right, Center\n"
" LabelType No_Label\n"
"End\n";
" AlignPossible Block, Left, Right, Center\n"
" LabelType No_Label\n"
"End\n";
TempFile tempfile("basicXXXXXX.layout");
FileName const tempLayout = tempfile.name();
ofstream ofs(tempLayout.toFilesystemEncoding().c_str());
TempFile tempfile("basicXXXXXX.layout");
FileName const tempLayout = tempfile.name();
ofstream ofs(tempLayout.toFilesystemEncoding().c_str());
// stdclass.inc. That would give us something moderately usable.
ofs << "# This layout is automatically generated\n"
"# \\DeclareLaTeXClass{" << textclass << "}\n\n"
// stdclass.inc. That would give us something moderately usable.
ofs << "# This layout is automatically generated\n"
"# \\DeclareLaTeXClass{" << textclass << "}\n\n"
// We do not know if a LaTeX class is available for this document, but setting
// the last parameter to true will suppress a warning message about missing
// tex class.
// We do not know if a LaTeX class is available for this document, but setting
// the last parameter to true will suppress a warning message about missing
// tex class.
"Unknown text class " + textclass, textclass + ".cls", "", true);
if (!tc->load(tempLayout.absFileName())) {
"Unknown text class " + textclass, textclass + ".cls", "", true);
if (!tc->load(tempLayout.absFileName())) {
- // The only way this happens is because the hardcoded layout file
- // above is wrong or stdclass.inc cannot be found. So try again
- // without stdclass.inc and without stdinsets.inc.
+ // The only way this happens is because the hardcoded layout file
+ // above is wrong or stdclass.inc cannot be found. So try again
+ // without stdclass.inc and without stdinsets.inc.
ofstream ofs2(tempLayout.toFilesystemEncoding().c_str());
ofs2 << "# This layout is automatically generated\n"
"# \\DeclareLaTeXClass{" << textclass << "}\n\n"
ofstream ofs2(tempLayout.toFilesystemEncoding().c_str());
ofs2 << "# This layout is automatically generated\n"
"# \\DeclareLaTeXClass{" << textclass << "}\n\n"
// FIXME There is a bug here: 4593
//
// only check for textclass.layout file, .cls can be anywhere in $TEXINPUTS
// FIXME There is a bug here: 4593
//
// only check for textclass.layout file, .cls can be anywhere in $TEXINPUTS
// different from textclass
string fullName = addName(path, textclass + ".layout");
// different from textclass
string fullName = addName(path, textclass + ".layout");
- new LayoutFile(textclass, class_name, textclass, class_prereq, category, true);
+ new LayoutFile(addName(moved ? oldpath : path, textclass),
+ class_name, textclass, class_prereq, category, true);
//FIXME: The prerequisites are available from the layout file and
// can be extracted from the above regex, but for now this
// field is simply set to class_name + ".cls"
//FIXME: The prerequisites are available from the layout file and
// can be extracted from the above regex, but for now this
// field is simply set to class_name + ".cls"