Add Nomenclature to the TOC.

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

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index a32191b78aa595ee79a6482d8c5723e6c92e04db..6a02271612041c353808b44f54e6bac8ecf8491e 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -30,9 +30,11 @@
 #include "OutputParams.h"
 #include "output_xhtml.h"
 #include "sgml.h"
+#include "TocBackend.h"
 
 #include "frontends/FontMetrics.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -129,6 +131,13 @@ void InsetNomencl::validate(LaTeXFeatures & features) const
 }
 
 
+void InsetNomencl::addToToc(DocIterator const & cpit, bool output_active) const
+{
+       docstring const str = getParam("symbol");
+       buffer().tocBackend().toc("nomencl").push_back(TocItem(cpit, 0, str, output_active));
+}
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // InsetPrintNomencl
@@ -276,20 +285,13 @@ docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
                return symb;
 
        // we have to encode the string properly
-       docstring latex_symb;
-       for (size_t n = 0; n < symb.size(); ++n) {
-               try {
-                       latex_symb += runparams.encoding->latexChar(symb[n]).first;
-               } catch (EncodingException & /* e */) {
-                       if (runparams.dryrun) {
-                               latex_symb += "<" + _("LyX Warning: ")
-                                          + _("uncodable character") + " '";
-                               latex_symb += docstring(1, symb[n]);
-                               latex_symb += "'>";
-                       }
-               }
-       }
-       return latex_symb;
+       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;
 }
 } // namespace anon