Add Nomenclature to the TOC.

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

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index a596691aa36662268de8e4399dcd6264447cf3af..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
@@ -210,6 +219,8 @@ docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const &) const
 }
 
 
+// FIXME This should be changed to use the TOC. Perhaps
+// that could be done when XHTML output is added.
 int InsetPrintNomencl::docbook(odocstream & os, OutputParams const &) const
 {
        os << "<glossary>\n";
@@ -274,28 +285,20 @@ 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]);
-               } 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
 
 
-int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetPrintNomencl::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams = runparams_in;
-       int lines = 0;
        if (getParam("set_width") == "auto") {
                docstring widest = nomenclWidest(buffer(), runparams);
                // Set the label width via nomencl's command \nomlabelwidth.
@@ -304,7 +307,6 @@ int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in)
                        os << "\\settowidth{\\nomlabelwidth}{"
                           << widest
                           << "}\n";
-                       ++lines;
                }
        } else if (getParam("set_width") == "custom") {
                // custom length as optional arg of \printnomenclature
@@ -315,11 +317,10 @@ int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in)
                   << '['
                   << from_ascii(width)
                   << "]{}";
-               return lines;
+               return;
        }
        // output the command \printnomenclature
        os << getCommand(runparams);
-       return lines;
 }
 
 
@@ -335,9 +336,9 @@ InsetCode InsetPrintNomencl::lyxCode() const
 }
 
 
-docstring InsetPrintNomencl::contextMenuName() const
+string InsetPrintNomencl::contextMenuName() const
 {
-       return from_ascii("context-nomenclprint");
+       return "context-nomenclprint";
 }