From 4b9153619762d78d938e98734d8f6c140d498c5d Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Wed, 2 Feb 2011 11:05:56 +0000
Subject: [PATCH] * InsetFloat.cpp (getCaption): 	- Protect content
 which has a "]" in subfloat captions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37416 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetFloat.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index c24824c4eb..ea6f0931f6 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -490,7 +490,14 @@ docstring InsetFloat::getCaption(OutputParams const & runparams) const
 	otexstream os(ods);
 	ins->getOptArg(os, runparams);
 	ods << '[';
-	ins->getArgument(os, runparams);
+	odocstringstream odss;
+	otexstream oss(odss);
+	ins->getArgument(oss, runparams);
+	docstring arg = odss.str();
+	// Protect ']'
+	if (arg.find(']') != docstring::npos)
+		arg = '{' + arg + '}';
+	ods << arg;
 	ods << ']';
 	return ods.str();
 }
-- 
2.39.2