Fix formatFPnumber with negative doubles.

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

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index a596691aa36662268de8e4399dcd6264447cf3af..f7f740aa6f4673fbde19818cee36ff27f2141c11 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -24,15 +24,18 @@
 #include "FuncStatus.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Length.h"
 #include "LyX.h"
 #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 +132,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
@@ -163,6 +173,96 @@ docstring InsetPrintNomencl::screenLabel() const
 }
 
 
+struct NomenclEntry {
+       NomenclEntry() {}
+       NomenclEntry(docstring s, docstring d, Paragraph const * p)
+         : symbol(s), desc(d), par(p)
+       {}
+
+       docstring symbol;
+       docstring desc;
+       Paragraph const * par;
+};
+
+
+typedef map<docstring, NomenclEntry > EntryMap;
+
+
+docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const & op) const
+{
+       Toc const & toc = buffer().tocBackend().toc("nomencl");
+
+       EntryMap entries;
+       Toc::const_iterator it = toc.begin();
+       Toc::const_iterator const en = toc.end();
+       for (; it != en; ++it) {
+               DocIterator dit = it->dit();
+               Paragraph const & par = dit.innerParagraph();
+               Inset const * inset = par.getInset(dit.top().pos());
+               if (!inset)
+                       return docstring();
+               InsetCommand const * ic = inset->asInsetCommand();
+               if (!ic)
+                       return docstring();
+               
+               // FIXME We need a link to the paragraph here, so we
+               // need some kind of struct.
+               docstring const symbol = ic->getParam("symbol");
+               docstring const desc = ic->getParam("description");
+               docstring const prefix = ic->getParam("prefix");
+               docstring const sortas = prefix.empty() ? symbol : prefix;
+               
+               entries[sortas] = NomenclEntry(symbol, desc, &par);
+       }
+       
+       if (entries.empty())
+               return docstring();
+       
+       // we'll use our own stream, because we are going to defer everything.
+       // that's how we deal with the fact that we're probably inside a standard
+       // paragraph, and we don't want to be.
+       odocstringstream ods;
+       XHTMLStream xs(ods);
+       
+       InsetLayout const & il = getLayout();
+       string const & tag = il.htmltag();
+       docstring toclabel = translateIfPossible(from_ascii("Nomenclature"),
+               op.local_font->language()->lang());
+
+       xs << html::StartTag("div", "class='nomencl'")
+          << html::StartTag(tag, "class='nomencl'")
+                << toclabel 
+                << html::EndTag(tag)
+          << html::CR()
+          << html::StartTag("dl")
+          << html::CR();
+       
+       EntryMap::const_iterator eit = entries.begin();
+       EntryMap::const_iterator const een = entries.end();
+       for (; eit != een; ++eit) {
+               NomenclEntry const & ne = eit->second;
+               string const parid = ne.par->magicLabel();
+               xs << html::StartTag("dt")
+                  << html::StartTag("a", "href='#" + parid + "' class='nomencl'")
+                  << ne.symbol
+                  << html::EndTag("a")
+                  << html::EndTag("dt")
+                  << html::CR()
+                  << html::StartTag("dd")
+                  << ne.desc
+                  << html::EndTag("dd")
+                  << html::CR();
+       }
+
+       xs << html::EndTag("dl")
+          << html::CR()
+          << html::EndTag("div")
+          << html::CR();
+
+       return ods.str();
+}
+
+
 void InsetPrintNomencl::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action()) {
@@ -204,12 +304,8 @@ bool InsetPrintNomencl::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const &) const
-{
-       return docstring();
-}
-
-
+// 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 +370,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 +392,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 +402,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 +421,9 @@ InsetCode InsetPrintNomencl::lyxCode() const
 }
 
 
-docstring InsetPrintNomencl::contextMenuName() const
+string InsetPrintNomencl::contextMenuName() const
 {
-       return from_ascii("context-nomenclprint");
+       return "context-nomenclprint";
 }