X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNomencl.cpp;h=880f0fff52aec86df97c015b3ef9995e00c6af15;hb=9176e60b7bcab3e355521a86ddb4c2778cd9b29e;hp=6d234e6ab37ed48f47a9a6634e0bb2807ef2d334;hpb=e30f3d76d2bee0011ceaeb5f0cc221156458cbad;p=lyx.git

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 6d234e6ab3..880f0fff52 100644
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -65,9 +65,11 @@ ParamInfo const & InsetNomencl::findInfo(string const & /* cmdName */)
 	if (param_info_.empty()) {
 		param_info_.add("prefix", ParamInfo::LATEX_OPTIONAL);
 		param_info_.add("symbol", ParamInfo::LATEX_REQUIRED,
-				ParamInfo::HANDLING_LATEXIFY);
+				ParamInfo::ParamHandling(ParamInfo::HANDLING_LATEXIFY
+							 | ParamInfo::HANDLING_INDEX_ESCAPE));
 		param_info_.add("description", ParamInfo::LATEX_REQUIRED,
-				ParamInfo::HANDLING_LATEXIFY);
+				ParamInfo::ParamHandling(ParamInfo::HANDLING_LATEXIFY
+							 | ParamInfo::HANDLING_INDEX_ESCAPE));
 		param_info_.add("literal", ParamInfo::LYX_INTERNAL);
 	}
 	return param_info_;
@@ -362,8 +364,11 @@ docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
 			if (inset->lyxCode() != NOMENCL_CODE)
 				continue;
 			nomencl = static_cast<InsetNomencl const *>(inset);
-			docstring const symbol =
-				nomencl->getParam("symbol");
+			// Use proper formatting. We do not escape makeindex chars here
+			docstring const symbol = nomencl ?
+				nomencl->params().prepareCommand(runparams, nomencl->getParam("symbol"),
+							ParamInfo::HANDLING_LATEXIFY)
+				: docstring();
 			// This is only an approximation,
 			// but the best we can get.
 			int const wx = use_gui ?
@@ -376,17 +381,7 @@ docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
 		}
 	}
 	// return the widest (or an empty) string
-	if (symb.empty())
-		return symb;
-
-	// we have to encode the string properly
-	pair<docstring, docstring> latex_symb =
-		runparams.encoding->latexString(symb, runparams.dryrun);
-	if (!latex_symb.second.empty())
-		LYXERR0("Omitting uncodable characters '"
-			<< latex_symb.second
-			<< "' in nomencl widest string!");
-	return latex_symb.first;
+	return symb;
 }
 } // namespace
 
@@ -422,6 +417,7 @@ void InsetPrintNomencl::latex(otexstream & os, OutputParams const & runparams_in
 
 void InsetPrintNomencl::validate(LaTeXFeatures & features) const
 {
+	features.useInsetLayout(getLayout());
 	features.require("nomencl");
 }