- FileName const layout_file(fullName);
- if (layout_file.exists()) {
- LYXERR(Debug::TCLASS, "Adding class " << textclass << " from directory " << path);
- // Read .layout file and get description, real latex classname etc
- //
- // This is a C++ version of function processLayoutFile in configure.py,
- // 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*"
- "(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*");
- static regex const catreg("^#\\s*\\\\DeclareCategory\\{(.*)\\}");
- string line;
- string class_name;
- string class_prereq;
- string category;
- bool have_declaration = false;
- while (getline(ifs, line)) {
- // look for the \DeclareXXXClass line
- smatch sub;
- if (regex_match(line, sub, reg)) {
- // returns: whole string, classtype (not used here), class name, description
- LASSERT(sub.size() == 4, /**/);
- // now, create a TextClass with description containing path information
- class_name = (sub.str(2) == "" ? textclass : sub.str(2));
- class_prereq = class_name + ".cls";
- have_declaration = true;
- }
- else if (regex_match(line, sub, catreg)) {
- category = sub.str(1);
- }
- if (have_declaration && !category.empty())
- break;
+ 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
+ //
+ // This is a C++ version of function processLayoutFile in configure.py,
+ // which uses the following regex
+ // \Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
+ ifstream ifs(layout_file.toFilesystemEncoding().c_str());
+ static regex const reg("^\\s*#\\s*\\\\Declare(LaTeX|DocBook)Class\\s*"
+ "(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*");
+ static regex const catreg("^\\s*#\\s*\\\\DeclareCategory\\{(.*)\\}\\s*");
+ string line;
+ string class_name;
+ string class_prereq;
+ string category;
+ bool have_declaration = false;
+ while (getline(ifs, line)) {
+ // look for the \DeclareXXXClass line
+ smatch sub;
+ if (regex_match(line, sub, reg)) {
+ // returns: whole string, classtype (not used here), class name, description
+ // LASSERT: Why would this fail?
+ LASSERT(sub.size() == 4, /**/);
+ // now, create a TextClass with description containing path information
+ class_name = (sub.str(2) == "" ? textclass : sub.str(2));
+ class_prereq = class_name + ".cls";
+ have_declaration = true;