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

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 9d34808d41..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));
 }
 
 
@@ -432,12 +432,22 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
 					     docstring const & command,
 					     ParamInfo::ParamHandling handling) const
 {
-	if (handling == ParamInfo::HANDLING_LATEXIFY)
+	docstring result;
+	bool ltrimmed = false;
+	// Trimming can be done on top of any of the other handlings
+	// We check this here since handling might be changed below.
+	if (handling & ParamInfo::HANDLING_LTRIM) {
+		// this is used if no other handling is done
+		result = command;
+		ltrimmed = true;
+	}
+	if (handling & ParamInfo::HANDLING_LATEXIFY
+	    || handling & ParamInfo::HANDLING_INDEX_ESCAPE)
 		if ((*this)["literal"] == "true")
 			handling = ParamInfo::HANDLING_NONE;
-	docstring result;
-	switch (handling) {
-	case ParamInfo::HANDLING_LATEXIFY: {
+
+	// LATEXIFY, ESCAPE and NONE are mutually exclusive
+	if (handling & ParamInfo::HANDLING_LATEXIFY) {
 		// First handle backslash
 		result = subst(command, from_ascii("\\"), from_ascii("\\textbackslash{}"));
 		// Then get LaTeX macros
@@ -454,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) {
@@ -476,17 +487,30 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
 							result.replace(pos, 1, backslash + chars_escape[k] + term);
 				}
 		}
-		break;
 	}
-	case ParamInfo::HANDLING_ESCAPE:
+	else if (handling & ParamInfo::HANDLING_ESCAPE)
 		result = escape(command);
-		break;
-	case ParamInfo::HANDLING_NONE:
+	else if (handling & ParamInfo::HANDLING_NONE)
 		result = command;
-		break;
-	} // switch
+	// INDEX_ESCAPE is independent of the others
+	if (handling & ParamInfo::HANDLING_INDEX_ESCAPE) {
+		// Now escape special commands
+		static docstring const quote = from_ascii("\"");
+		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 < nchars_escape; k++)
+				for (size_t i = 0, pos;
+					(pos = result.find(chars_escape[k], i)) != string::npos;
+					i = pos + 2)
+						result.replace(pos, 1, quote + chars_escape[k]);
+		}
+	}
 
-	return result;
+	return ltrimmed ? ltrim(result) : result;
 }