From 1bd422355430d4753e48eee298dafaf8c1ac458f Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Mon, 4 Dec 2017 10:24:02 +0100 Subject: [PATCH] nomenclWidest(): take (proper) formatting into account. --- src/insets/InsetNomencl.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) 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(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 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 -- 2.39.5