Make script inset much tighter in texted.

[lyx.git] / src / insets / InsetNomencl.cpp

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 74d1387599290e43762a6ce4726a41ec5bf8d368..880f0fff52aec86df97c015b3ef9995e00c6af15 100644 (file)
--- 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,19 +381,9 @@ 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 anon
+} // namespace
 
 
 void InsetPrintNomencl::latex(otexstream & os, OutputParams const & runparams_in) const
@@ -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");
 }