tex2lyx/text.cpp: fix typos

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 500ec44bcf41d9f3ce00b9e6c0ab7b22bec28fce..489358a110a98660e10a3c603ec542496bdf3c40 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -61,15 +61,15 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
 }
 
 
-void InsetFoot::addToToc(DocIterator const & cpit)
+void InsetFoot::addToToc(DocIterator const & cpit) const
 {
        DocIterator pit = cpit;
-       pit.push_back(CursorSlice(*this));
+       pit.push_back(CursorSlice(const_cast<InsetFoot &>(*this)));
 
        Toc & toc = buffer().tocBackend().toc("footnote");
-       docstring str;
-       str = custom_label_ + ": " + text().getPar(0).asString();
-       toc.push_back(TocItem(pit, 0, str, toolTipText()));
+       docstring str = custom_label_ + ": ";
+       text().forToc(str, TOC_ENTRY_LENGTH);
+       toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
        // Proceed with the rest of the inset.
        InsetFootlike::addToToc(cpit);
 }
@@ -84,24 +84,26 @@ docstring InsetFoot::toolTip(BufferView const & bv, int x, int y) const
 }
 
 
-int InsetFoot::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetFoot::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams = runparams_in;
        // footnotes in titling commands like \title have moving arguments
        runparams.moving_arg |= runparams_in.intitle;
 
+       os << safebreakln;
+       if (runparams.lastid != -1)
+               os.texrow().start(runparams.lastid, runparams.lastpos);
+
        // in titling commands, \thanks should be used instead of \footnote.
        // some classes (e.g. memoir) do not understand \footnote.
        if (runparams_in.intitle)
-               os << "%\n\\thanks{";
+               os << "\\thanks{";
        else
-               os << "%\n\\footnote{";
+               os << "\\footnote{";
 
-       int const i = InsetText::latex(os, runparams);
+       InsetText::latex(os, runparams);
        os << "%\n}";
        runparams_in.encoding = runparams.encoding;
-
-       return i + 2;
 }