X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCommandParams.cpp;h=24d1afad883008cac73637bfdf2251b5aa28b376;hb=131f4b92bac3ecb75b47c266dfa3d8543bd4d578;hp=cae982782c6d50fc4038e4f89dfb79aa7bca68b5;hpb=b68701c4da93a6f0ff618f5554b76c48373a3ac8;p=lyx.git

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index cae982782c..24d1afad88 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -132,10 +132,10 @@ bool ParamInfo::hasParam(std::string const & name) const
 
 
 void ParamInfo::add(std::string const & name, ParamType type,
-                    ParamHandling handling, bool ignore,
+                    ParamHandling handling, bool ignoreval,
                     docstring default_value)
 {
-	info_.push_back(ParamData(name, type, handling, ignore, default_value));
+	info_.push_back(ParamData(name, type, handling, ignoreval, default_value));
 }
 
 
@@ -464,14 +464,15 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
 		}
 		// Now escape special commands
 		static docstring const backslash = from_ascii("\\");
-		static char_type const chars_escape[6] = {
-			'&', '_', '$', '%', '#', '^'};
+		int const nchars_escape = 8;
+		static char_type const chars_escape[nchars_escape] = {
+			'&', '_', '$', '%', '#', '^', '{', '}'};
 
 		if (!result.empty()) {
 			int previous;
 			// The characters in chars_name[] need to be changed to a command when
 			// they are LaTeXified.
-			for (int k = 0; k < 6; k++)
+			for (int k = 0; k < nchars_escape; k++)
 				for (size_t i = 0, pos;
 					(pos = result.find(chars_escape[k], i)) != string::npos;
 					i = pos + 2) {
@@ -495,12 +496,13 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
 	if (handling & ParamInfo::HANDLING_INDEX_ESCAPE) {
 		// Now escape special commands
 		static docstring const quote = from_ascii("\"");
-		static char_type const chars_escape[4] = { '"', '@', '|', '!' };
+		int const nchars_escape = 4;
+		static char_type const chars_escape[nchars_escape] = { '"', '@', '|', '!' };
 
 		if (!result.empty()) {
 			// The characters in chars_name[] need to be changed to a command when
 			// they are LaTeXified.
-			for (int k = 0; k < 4; k++)
+			for (int k = 0; k < nchars_escape; k++)
 				for (size_t i = 0, pos;
 					(pos = result.find(chars_escape[k], i)) != string::npos;
 					i = pos + 2)