anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nomenclWidest(): take (proper) formatting into account.

Browse Source
This commit is contained in:
Juergen Spitzmueller 2017-12-04 10:24:02 +01:00
parent 798b7126ef
commit 1bd4223554
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/insets/InsetNomencl.cpp
View File

@ -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