X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=cc8fb993bbe9de3d86b76f5355a93a835b5607c7;hb=cfeddb92;hp=113cddb7fd94e2c763379b90b85e7f60061e347f;hpb=f47361c4db69c7de87471d15cb0156d2bc0cdda8;p=lyx.git

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 113cddb7fd..cc8fb993bb 100644
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -61,7 +61,7 @@ namespace lyx {
 // You should also run the development/tools/updatelayouts.py script,
 // to update the format of all of our layout files.
 //
-int const LAYOUT_FORMAT = 52; //spitz: add ForceOwnlines tag
+int const LAYOUT_FORMAT = 53; //spitz: add ObsoletedBy tag for InsetLayouts
 
 namespace {
 
@@ -1422,13 +1422,20 @@ InsetLayout const & DocumentClass::insetLayout(docstring const & name) const
 	InsetLayouts::const_iterator cen = insetlayoutlist_.end();
 	while (!n.empty()) {
 		InsetLayouts::const_iterator cit = insetlayoutlist_.lower_bound(n);
-		if (cit != cen && cit->first == n)
-			return cit->second;
+		if (cit != cen && cit->first == n) {
+			if (cit->second.obsoleted_by().empty())
+				return cit->second;
+			n = cit->second.obsoleted_by();
+			return insetLayout(n);
+		}
+		// If we have a generic prefix (e.g., "Note:"),
+		// try if this one alone is found.
 		size_t i = n.find(':');
 		if (i == string::npos)
 			break;
 		n = n.substr(0, i);
 	}
+	// Layout "name" not found.
 	return plain_insetlayout_;
 }