#include "support/lassert.h"
#include "support/lstrings.h"
-#include "support/bind.h"
#include "support/regex.h"
#include "support/TempFile.h"
LayoutFile::LayoutFile(string const & fn, string const & cln,
string const & desc, string const & prereq,
- string const & category, bool texclassavail)
+ string const & category, bool texclassavail)
{
- name_ = fn;
+ name_ = onlyFileName(fn);
+ path_ = fn.rfind('/') == string::npos ? string() : onlyPath(fn);
latexname_ = cln;
description_ = desc;
prerequisites_ = prereq;
}
-LayoutFileList & LayoutFileList::get()
+LayoutFileList & LayoutFileList::get()
{
static LayoutFileList baseclasslist;
return baseclasslist;
default:
string const fname = lex.getString();
LYXERR(Debug::TCLASS, "Fname: " << fname);
- if (!lex.next())
+ if (!lex.next())
break;
string const clname = lex.getString();
LYXERR(Debug::TCLASS, "Clname: " << clname);
- if (!lex.next())
+ if (!lex.next())
break;
string const desc = lex.getString();
LYXERR(Debug::TCLASS, "Desc: " << desc);
- if (!lex.next())
+ if (!lex.next())
break;
bool avail = lex.getBool();
LYXERR(Debug::TCLASS, "Avail: " << avail);
- if (!lex.next())
+ if (!lex.next())
break;
string const prereq = lex.getString();
LYXERR(Debug::TCLASS, "Prereq: " << prereq);
- if (!lex.next())
+ if (!lex.next())
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];
- LayoutFile * tmpl =
+ LayoutFile * tmpl =
new LayoutFile(tc->name(), tc->latexname(), tc->description(),
tc->prerequisites(), tc->category(),
tc->isTeXClassAvailable());
namespace {
-string layoutpost =
+string layoutpost =
"Columns 1\n"
"Sides 1\n"
"SecNumDepth 2\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());
- // This writes a very basic class, but it also attempts to include
+ // This writes a very basic class, but it also attempts to include
// 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.
- LayoutFile * tc = new LayoutFile(textclass, textclass,
+ LayoutFile * tc = new LayoutFile(textclass, textclass,
"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"
LayoutFileIndex LayoutFileList::addLocalLayout(
- string const & textclass, string const & path)
+ string const & textclass, string const & path, string const & oldpath)
{
// FIXME There is a bug here: 4593
//
// only check for textclass.layout file, .cls can be anywhere in $TEXINPUTS
- // NOTE: latex class name is defined in textclass.layout, which can be
+ // NOTE: latex class name is defined in textclass.layout, which can be
// different from textclass
string fullName = addName(path, textclass + ".layout");
-
- FileName const layout_file(fullName);
- if (!layout_file.exists())
- return string();
+ FileName layout_file(fullName);
+ bool moved = false;
+
+ if (!layout_file.exists()) {
+ if (oldpath.empty())
+ return string();
+ // The document has been moved to a different directory.
+ // However, oldpath always points to the right spot, unless
+ // the user also moved the layout file.
+ fullName = addName(oldpath, textclass + ".layout");
+ layout_file.set(fullName);
+ layout_file.refresh();
+ if (!layout_file.exists())
+ return string();
+ moved = true;
+ }
LYXERR(Debug::TCLASS, "Adding class " << textclass << " from directory " << path);
// Read .layout file and get description, real latex classname etc
// which uses the following regex
// \Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
ifstream ifs(layout_file.toFilesystemEncoding().c_str());
- static regex const reg("^#\\s*\\\\Declare(LaTeX|DocBook)Class\\s*"
+ static regex const reg("^\\s*#\\s*\\\\Declare(LaTeX|DocBook)Class\\s*"
"(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*");
- static regex const catreg("^#\\s*\\\\DeclareCategory\\{(.*)\\}");
+ static regex const catreg("^\\s*#\\s*\\\\DeclareCategory\\{(.*)\\}\\s*");
string line;
string class_name;
string class_prereq;
return string();
LayoutFile * tmpl =
- 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"
// This textclass is added on request so it will definitely be
// used. Load it now because other load() calls may fail if they
// are called in a context without buffer path information.
- tmpl->load(path);
+ tmpl->load(moved ? oldpath : path);
// There will be only one textclass with this name, even if different
// layout files are loaded from different directories.
if (haveClass(textclass)) {
- LYXERR0("Existing textclass " << textclass << " is redefined by " << fullName);
+ // Unconditionally issuing the warning may be confusing when
+ // saving the document with a different name, as it is exactly
+ // the same textclass that is being re-established.
+ LYXERR(Debug::TCLASS, "Existing textclass " << textclass << " is redefined by " << fullName);
delete classmap_[textclass];
}
classmap_[textclass] = tmpl;
- return textclass;
+ return removeExtension(fullName);
}
projects / lyx.git / blobdiff