Circumvent odd stmary font metrics (part of #9990).

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index c1bb07aef4a5db8b4f804ef4698b2fac72c4fcd5..e483cf2e104a6ab9db38d223e843d362b3b97b03 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -37,6 +37,7 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Translator.h"
 
 #include "frontends/Application.h"
@@ -207,20 +208,24 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit, bool output_active) const
+void InsetNote::addToToc(DocIterator const & cpit, bool output_active,
+                                                UpdateType utype) const
 {
        DocIterator pit = cpit;
        pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
        
-       shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
        InsetLayout const & il = getLayout();
-       docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
-       text().forOutliner(str, TOC_ENTRY_LENGTH);
-       toc->push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
+       docstring tooltip;
+       text().forOutliner(tooltip, TOC_ENTRY_LENGTH);
+       docstring str = translateIfPossible(il.labelstring()) + ": " + tooltip;
+       tooltip = support::wrapParas(tooltip, 0, 60, 2);
+       
+       shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
+       toc->push_back(TocItem(pit, 0, str, output_active, tooltip));
 
        // Proceed with the rest of the inset.
        bool doing_output = output_active && producesOutput();
-       InsetCollapsable::addToToc(cpit, doing_output);
+       InsetCollapsable::addToToc(cpit, doing_output, utype);
 }