X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNomencl.cpp;h=880f0fff52aec86df97c015b3ef9995e00c6af15;hb=cf6ff2cac79d09adafa63e3a1ec02dfb09f707b9;hp=05a5dea8cda6aaeda27c6c9072faee405cc02a4f;hpb=798b7126ef628f6d5f2a7005768a85f2bfd4e81e;p=lyx.git

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 05a5dea8cd..880f0fff52 100644
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -364,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 ?
@@ -378,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