X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.cpp;h=e428b5d76f860e932e2d44906862925ddfd8bd03;hb=390ae05444cf4899a3028dcbbfe1095ecd2d207a;hp=5f2f0d3db8d4819ee106e29bae6316f1ef30e364;hpb=aafd52f44167d5510be1ddcb974daa9dae486933;p=lyx.git

diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp
index 5f2f0d3db8..e428b5d76f 100644
--- a/src/LayoutFile.cpp
+++ b/src/LayoutFile.cpp
@@ -29,6 +29,7 @@
 
 #include "support/bind.h"
 #include "support/regex.h"
+#include "support/TempFile.h"
 
 #include <fstream>
 
@@ -83,14 +84,16 @@ bool LayoutFileList::haveClass(string const & classname) const
 
 LayoutFile const & LayoutFileList::operator[](string const & classname) const
 {
-	LASSERT(haveClass(classname), /**/);
+	LATTEST(haveClass(classname));
+	// safe to continue, since we will make an empty LayoutFile
 	return *classmap_[classname];
 }
 
 
 LayoutFile & LayoutFileList::operator[](string const & classname)
 {
-	LASSERT(haveClass(classname), /**/);
+	LATTEST(haveClass(classname));
+	// safe to continue, since we will make an empty LayoutFile
 	return *classmap_[classname];
 }
 
@@ -184,7 +187,8 @@ std::vector<LayoutFileIndex> LayoutFileList::classList() const
 
 void LayoutFileList::reset(LayoutFileIndex const & classname)
 {
-	LASSERT(haveClass(classname), /**/);
+	LATTEST(haveClass(classname));
+	// safe to continue, since we will make an empty LayoutFile
 	LayoutFile * tc = classmap_[classname];
 	LayoutFile * tmpl = 
 		new LayoutFile(tc->name(), tc->latexname(), tc->description(),
@@ -220,7 +224,10 @@ string layoutpost =
 
 LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
 {
-	FileName const tempLayout = FileName::tempName("basic_layout");
+	// FIXME This could be simplified a bit to call TextClass::read(string, ReadType).
+
+	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 
 	// stdclass.inc. That would give us something moderately usable.
@@ -249,8 +256,9 @@ LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
 		     << layoutpost;
 		ofs2.close();
 		if (!tc->load(tempLayout.absFileName())) {
-			// This can only happen if the hardcoded file above is wrong.
-			LASSERT(false, /* */);
+			// This can only happen if the hardcoded file above is wrong
+			// or there is some weird filesystem error.
+			LATTEST(false); // We will get an empty layout or something.
 		}
 	}
 
@@ -270,62 +278,64 @@ LayoutFileIndex  LayoutFileList::addLocalLayout(
 	string fullName = addName(path, textclass + ".layout");
 	
 	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;
+
+	if (!layout_file.exists())
+		return string();
+
+	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: 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;
 		}
-		if (have_declaration) {
-			LayoutFile * tmpl = 
-				new LayoutFile(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);
-			// 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);
-				delete classmap_[textclass];
-			}
-			classmap_[textclass] = tmpl;
-			return textclass;
+		else if (regex_match(line, sub, catreg)) {
+			category = sub.str(1);
 		}
+		if (have_declaration && !category.empty())
+			break;
+	}
+
+	if (!have_declaration)
+		return string();
+
+	LayoutFile * tmpl =
+		new LayoutFile(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);
+	// 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);
+		delete classmap_[textclass];
 	}
-	// If .layout is not in local directory, or an invalid layout
-	// is found, return null
-	return string();
+	classmap_[textclass] = tmpl;
+	return textclass;
 }