X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaption.cpp;h=941047f337ecb055aa39819919259a941ae2f073;hb=cc3e227cba3571bb8c383cd41348b932e3104df3;hp=0ebbcea379c3d440a42a1939267807765c92d7fd;hpb=8b92a2a689c2548a263065a24c0d3aa917785cce;p=lyx.git

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 0ebbcea379..941047f337 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -264,7 +264,16 @@ void InsetCaption::latex(otexstream & os,
 	// \caption{...}, later we will make it take advantage
 	// of the one of the caption packages. (Lgb)
 	OutputParams runparams = runparams_in;
+	// Some fragile commands (labels, index entries)
+	// are output after the caption (#2154)
+	runparams.postpone_fragile_stuff = true;
 	InsetText::latex(os, runparams);
+	if (!runparams.post_macro.empty()) {
+		// Output the stored fragile commands (labels, indices etc.)
+		// that need to be output after the caption.
+		os << runparams.post_macro;
+		runparams.post_macro.clear();
+	}
 	// Backwards compatibility: We always had a linebreak after
 	// the caption (see #8514)
 	os << breakln;