X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutFile.cpp;h=8ec7474a0a3673be826d90cb1a3efedee0d5a4a0;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=496707c04ede3f83acb3f65c3b79c679d733091c;hpb=0c61991c9a276475deac3ea8ebcb7f27b33bc1d5;p=lyx.git

diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp
index 496707c04e..8ec7474a0a 100644
--- a/src/LayoutFile.cpp
+++ b/src/LayoutFile.cpp
@@ -83,14 +83,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 +186,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(),
@@ -253,7 +256,7 @@ LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
 		if (!tc->load(tempLayout.absFileName())) {
 			// This can only happen if the hardcoded file above is wrong
 			// or there is some weird filesystem error.
-			LASSERT(false, /* */);
+			LATTEST(false); // We will get an empty layout or something.
 		}
 	}
 
@@ -273,6 +276,7 @@ LayoutFileIndex  LayoutFileList::addLocalLayout(
 	string fullName = addName(path, textclass + ".layout");
 	
 	FileName const layout_file(fullName);
+
 	if (!layout_file.exists())
 		return string();
 
@@ -296,6 +300,7 @@ LayoutFileIndex  LayoutFileList::addLocalLayout(
 		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));