]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetText.cpp
Collapsable -> Collapsible (part 1)
[lyx.git] / src / insets / InsetText.cpp
index 4760df5024ac13dd2cfb6be44484d70ad769cf1d..28484a4d76114704eb6725d6d5eeaeef35669774 100644 (file)
@@ -27,7 +27,6 @@
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetCaption.h"
 #include "InsetList.h"
 #include "Intl.h"
 #include "Language.h"
@@ -48,6 +47,7 @@
 #include "Row.h"
 #include "sgml.h"
 #include "TexRow.h"
+#include "texstream.h"
 #include "TextClass.h"
 #include "Text.h"
 #include "TextMetrics.h"
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
 
+#include "support/bind.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
-#include "support/lstrings.h"
-
-#include "support/bind.h"
 #include "support/lassert.h"
+#include "support/lstrings.h"
+#include "support/RefChanger.h"
 
 #include <algorithm>
 
@@ -125,7 +125,7 @@ void InsetText::setMacrocontextPositionRecursive(DocIterator const & pos)
 void InsetText::clear()
 {
        ParagraphList & pars = paragraphs();
-       LASSERT(!pars.empty(), /**/);
+       LBUFERR(!pars.empty());
 
        // This is a gross hack...
        Layout const & old_layout = pars.begin()->layout();
@@ -137,7 +137,7 @@ void InsetText::clear()
 }
 
 
-Dimension const InsetText::dimension(BufferView const & bv) const
+Dimension const InsetText::dimensionHelper(BufferView const & bv) const
 {
        TextMetrics const & tm = bv.textMetrics(&text_);
        Dimension dim = tm.dimension();
@@ -195,7 +195,7 @@ void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
        mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
 
        // This can happen when a layout has a left and right margin,
-       // and the view is made very narrow. We can't do better than 
+       // and the view is made very narrow. We can't do better than
        // to draw it partly out of view (bug 5890).
        if (mi.base.textwidth < 1)
                mi.base.textwidth = 1;
@@ -215,24 +215,48 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
 {
        TextMetrics & tm = pi.base.bv->textMetrics(&text_);
 
+       int const w = tm.width() + TEXT_TO_INSET_OFFSET;
+       int const yframe = y - TEXT_TO_INSET_OFFSET - tm.ascent();
+       int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET;
+       int const xframe = x + TEXT_TO_INSET_OFFSET / 2;
+       bool change_drawn = false;
        if (drawFrame_ || pi.full_repaint) {
-               int const w = tm.width() + TEXT_TO_INSET_OFFSET;
-               int const yframe = y - TEXT_TO_INSET_OFFSET - tm.ascent();
-               int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET;
-               int const xframe = x + TEXT_TO_INSET_OFFSET / 2;
                if (pi.full_repaint)
                        pi.pain.fillRectangle(xframe, yframe, w, h,
                                pi.backgroundColor(this));
 
+               // Change color of the frame in tracked changes, like for tabulars.
+               // Only do so if the color is not custom. But do so even if RowPainter
+               // handles the strike-through already.
+               Color c;
+               if (pi.change_.changed()
+                   // Originally, these are the colors with role Text, from role() in
+                   // ColorCache.cpp.  The code is duplicated to avoid depending on Qt
+                   // types, and also maybe it need not match in the future.
+                   && (frameColor() == Color_foreground
+                       || frameColor() == Color_cursor
+                       || frameColor() == Color_preview
+                       || frameColor() == Color_tabularline
+                       || frameColor() == Color_previewframe)) {
+                       c = pi.change_.color();
+                       change_drawn = true;
+               } else
+                       c = frameColor();
                if (drawFrame_)
-                       pi.pain.rectangle(xframe, yframe, w, h, frameColor());
+                       pi.pain.rectangle(xframe, yframe, w, h, c);
        }
-       ColorCode const old_color = pi.background_color;
-       pi.background_color = pi.backgroundColor(this, false);
-
-       tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
-
-       pi.background_color = old_color;
+       {
+               Changer dummy = make_change(pi.background_color,
+                                           pi.backgroundColor(this, false));
+               // The change tracking cue must not be inherited
+               Changer dummy2 = make_change(pi.change_, Change());
+               tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y);
+       }
+       if (canPaintChange(*pi.base.bv) && (!change_drawn || pi.change_.deleted()))
+               // Do not draw the change tracking cue if already done by RowPainter and
+               // do not draw the cue for INSERTED if the information is already in the
+               // color of the frame
+               pi.change_.paintCue(pi, xframe, yframe, xframe + w, yframe + h);
 }
 
 
@@ -250,8 +274,7 @@ void InsetText::edit(Cursor & cur, bool front, EntryDirection entry_from)
                pos = temp_cur.pos();
        }
 
-       text_.setCursor(cur.top(), pit, pos);
-       cur.clearSelection();
+       cur.top().setPitPos(pit, pos);
        cur.finishUndo();
 }
 
@@ -266,7 +289,8 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
 
-       if (getLayout().isPassThru()) {
+       // See bug #9042, for instance.
+       if (isPassThru()) {
                // Force any new text to latex_language FIXME: This
                // should only be necessary in constructor, but new
                // paragraphs that are created by pressing enter at
@@ -290,10 +314,11 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_INSET_DISSOLVE: {
-               bool const main_inset = &buffer().inset() == this;
-               bool const target_inset = cmd.argument().empty() 
+               bool const main_inset = text_.isMainText();
+               bool const target_inset = cmd.argument().empty()
                        || cmd.getArg(0) == insetName(lyxCode());
-               bool const one_cell = nargs() == 1;
+               // cur.inset() is the tabular when this is a single cell (bug #9954)
+               bool const one_cell = cur.inset().nargs() == 1;
 
                if (!main_inset && target_inset && one_cell) {
                        // Text::dissolveInset assumes that the cursor
@@ -311,7 +336,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
        default:
                text_.dispatch(cur, cmd);
        }
-       
+
        if (!cur.result().dispatched())
                Inset::doDispatch(cur, cmd);
 }
@@ -322,10 +347,11 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        switch (cmd.action()) {
        case LFUN_INSET_DISSOLVE: {
-               bool const main_inset = &buffer().inset() == this;
-               bool const target_inset = cmd.argument().empty() 
+               bool const main_inset = text_.isMainText();
+               bool const target_inset = cmd.argument().empty()
                        || cmd.getArg(0) == insetName(lyxCode());
-               bool const one_cell = nargs() == 1;
+               // cur.inset() is the tabular when this is a single cell (bug #9954)
+               bool const one_cell = cur.inset().nargs() == 1;
 
                if (target_inset)
                        status.setEnabled(!main_inset && one_cell);
@@ -338,26 +364,21 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
                        status.setEnabled(false);
                        return true;
                }
-               if (&buffer().inset() == this || !cur.paragraph().layout().latexargs().empty())
+               if (text_.isMainText() || !cur.paragraph().layout().args().empty())
                        return text_.getStatus(cur, cmd, status);
-               Layout::LaTeXArgMap args = getLayout().latexargs();
-               Layout::LaTeXArgMap::const_iterator const lait =
-                               args.find(convert<unsigned int>(arg));
+
+               Layout::LaTeXArgMap args = getLayout().args();
+               Layout::LaTeXArgMap::const_iterator const lait = args.find(arg);
                if (lait != args.end()) {
                        status.setEnabled(true);
-                       InsetList::const_iterator it = cur.paragraph().insetList().begin();
-                       InsetList::const_iterator end = cur.paragraph().insetList().end();
-                       for (; it != end; ++it) {
-                               if (it->inset->lyxCode() == ARG_CODE) {
-                                       InsetArgument const * ins =
-                                               static_cast<InsetArgument const *>(it->inset);
-                                       if (ins->name() == arg) {
-                                               // we have this already
-                                               status.setEnabled(false);
-                                               return true;
-                                       }
-                               }
-                       }
+                       for (Paragraph const & par : paragraphs())
+                               for (auto const & table : par.insetList())
+                                       if (InsetArgument const * ins = table.inset->asInsetArgument())
+                                               if (ins->name() == arg) {
+                                                       // we have this already
+                                                       status.setEnabled(false);
+                                                       return true;
+                                               }
                } else
                        status.setEnabled(false);
                return true;
@@ -369,7 +390,7 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
                bool ret = false;
                if (cur.text() == &text_)
                        ret = text_.getStatus(cur, cmd, status);
-               
+
                if (!ret)
                        ret = Inset::getStatus(cur, cmd, status);
                return ret;
@@ -418,8 +439,8 @@ void InsetText::rejectChanges()
 void InsetText::validate(LaTeXFeatures & features) const
 {
        features.useInsetLayout(getLayout());
-       for_each(paragraphs().begin(), paragraphs().end(),
-                bind(&Paragraph::validate, _1, ref(features)));
+       for (Paragraph const & p : paragraphs())
+               p.validate(features);
 }
 
 
@@ -427,16 +448,21 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
 {
        // This implements the standard way of handling the LaTeX
        // output of a text inset, either a command or an
-       // environment. Standard collapsable insets should not
+       // environment. Standard collapsible insets should not
        // redefine this, non-standard ones may call this.
        InsetLayout const & il = getLayout();
+       if (il.forceOwnlines())
+               os << breakln;
        if (!il.latexname().empty()) {
                if (il.latextype() == InsetLayout::COMMAND) {
                        // FIXME UNICODE
+                       // FIXME \protect should only be used for fragile
+                       //    commands, but we do not provide this information yet.
                        if (runparams.moving_arg)
                                os << "\\protect";
                        os << '\\' << from_utf8(il.latexname());
-                       getOptArg(os, runparams);
+                       if (!il.latexargs().empty())
+                               getArgs(os, runparams);
                        if (!il.latexparam().empty())
                                os << from_utf8(il.latexparam());
                        os << '{';
@@ -449,13 +475,15 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
                                os.texrow().start(runparams.lastid,
                                                  runparams.lastpos);
                        os << "\\begin{" << from_utf8(il.latexname()) << "}";
-                       getOptArg(os, runparams);
+                       if (!il.latexargs().empty())
+                               getArgs(os, runparams);
                        if (!il.latexparam().empty())
                                os << from_utf8(il.latexparam());
                        os << '\n';
                }
        } else {
-               getOptArg(os, runparams);
+               if (!il.latexargs().empty())
+                       getArgs(os, runparams);
                if (!il.latexparam().empty())
                        os << from_utf8(il.latexparam());
        }
@@ -464,10 +492,12 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
                os << il.leftdelim();
 
        OutputParams rp = runparams;
-       if (il.isPassThru())
+       if (isPassThru())
                rp.pass_thru = true;
        if (il.isNeedProtect())
                rp.moving_arg = true;
+       if (!il.passThruChars().empty())
+               rp.pass_thru_chars += il.passThruChars();
        rp.par_begin = 0;
        rp.par_end = paragraphs().size();
 
@@ -481,21 +511,26 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
        if (!il.latexname().empty()) {
                if (il.latextype() == InsetLayout::COMMAND) {
                        os << "}";
+                       if (!il.postcommandargs().empty())
+                               getArgs(os, runparams, true);
                } else if (il.latextype() == InsetLayout::ENVIRONMENT) {
                        // A comment environment doesn't need a % before \n\end
                        if (il.isDisplay() || runparams.inComment)
-                           os << breakln;
+                               os << breakln;
                        else
-                           os << safebreakln;
-                       os << "\\end{" << from_utf8(il.latexname()) << "}\n";
+                               os << safebreakln;
+                       os << "\\end{" << from_utf8(il.latexname()) << "}" << breakln;
                        if (!il.isDisplay())
                                os.protectSpace(true);
                }
        }
+       if (il.forceOwnlines())
+               os << breakln;
 }
 
 
-int InsetText::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetText::plaintext(odocstringstream & os,
+        OutputParams const & runparams, size_t max_length) const
 {
        ParagraphList::const_iterator beg = paragraphs().begin();
        ParagraphList::const_iterator end = paragraphs().end();
@@ -509,12 +544,14 @@ int InsetText::plaintext(odocstream & os, OutputParams const & runparams) const
                                os << '\n';
                }
                odocstringstream oss;
-               writePlaintextParagraph(buffer(), *it, oss, runparams, ref_printed);
+               writePlaintextParagraph(buffer(), *it, oss, runparams, ref_printed, max_length);
                docstring const str = oss.str();
                os << str;
                // FIXME: len is not computed fully correctly; in principle,
                // we have to count the characters after the last '\n'
                len = str.size();
+               if (os.str().size() >= max_length)
+                       break;
        }
 
        return len;
@@ -554,7 +591,7 @@ docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) con
 // One solution would be to make the footnote <span>, but the problem is
 // completely general, and so we'd have to make absolutely everything into
 // span. What I think will work is to check if we're about to write "div" and,
-// if so, try to close fonts, etc. 
+// if so, try to close fonts, etc.
 // There are probably limits to how well we can do here, though, and we will
 // have to rely upon users not putting footnotes inside noun-type insets.
 docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
@@ -565,22 +602,25 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
        OutputParams runparams = rp;
        runparams.par_begin = 0;
        runparams.par_end = text().paragraphs().size();
-       
+
        if (undefined()) {
+               xs.startDivision(false);
                xhtmlParagraphs(text_, buffer(), xs, runparams);
+               xs.endDivision();
                return docstring();
        }
 
        InsetLayout const & il = getLayout();
        if (opts & WriteOuterTag)
                xs << html::StartTag(il.htmltag(), il.htmlattr());
+
        if ((opts & WriteLabel) && !il.counter().empty()) {
                BufferParams const & bp = buffer().masterBuffer()->params();
                Counters & cntrs = bp.documentClass().counters();
                cntrs.step(il.counter(), OutputUpdate);
                // FIXME: translate to paragraph language
                if (!il.htmllabel().empty()) {
-                       docstring const lbl = 
+                       docstring const lbl =
                                cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code());
                        // FIXME is this check necessary?
                        if (!lbl.empty()) {
@@ -593,21 +633,41 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
 
        if (opts & WriteInnerTag)
                xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr());
-       OutputParams ours = runparams;
-       if (!il.isMultiPar() || opts == JustText)
-               ours.html_make_pars = false;
-       xhtmlParagraphs(text_, buffer(), xs, ours);
+
+       // we will eventually lose information about the containing inset
+       if (!allowMultiPar() || opts == JustText)
+               runparams.html_make_pars = false;
+       if (il.isPassThru())
+               runparams.pass_thru = true;
+
+       xs.startDivision(false);
+       xhtmlParagraphs(text_, buffer(), xs, runparams);
+       xs.endDivision();
+
        if (opts & WriteInnerTag)
                xs << html::EndTag(il.htmlinnertag());
+
        if (opts & WriteOuterTag)
                xs << html::EndTag(il.htmltag());
+
        return docstring();
 }
 
-void InsetText::getOptArg(otexstream & os,
-                       OutputParams const & runparams) const
+
+void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in,
+                       bool const post) const
 {
-       latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
+       OutputParams runparams = runparams_in;
+       runparams.local_font =
+               &paragraphs()[0].getFirstFontSettings(buffer().masterBuffer()->params());
+       if (isPassThru())
+               runparams.pass_thru = true;
+       if (post)
+               latexArgInsetsForParent(paragraphs(), os, runparams,
+                                       getLayout().postcommandargs(), "post:");
+       else
+               latexArgInsetsForParent(paragraphs(), os, runparams,
+                                       getLayout().latexargs());
 }
 
 
@@ -628,27 +688,6 @@ void InsetText::setText(docstring const & data, Font const & font, bool trackCha
 }
 
 
-void InsetText::setAutoBreakRows(bool flag)
-{
-       if (flag == text_.autoBreakRows_)
-               return;
-
-       text_.autoBreakRows_ = flag;
-       if (flag)
-               return;
-
-       // remove previously existing newlines
-       ParagraphList::iterator it = paragraphs().begin();
-       ParagraphList::iterator end = paragraphs().end();
-       for (; it != end; ++it)
-               for (int i = 0; i < it->size(); ++i)
-                       if (it->isNewline(i))
-                               // do not track the change, because the user
-                               // is not allowed to revert/reject it
-                               it->eraseChar(i, false);
-}
-
-
 void InsetText::setDrawFrame(bool flag)
 {
        drawFrame_ = flag;
@@ -724,11 +763,12 @@ ParagraphList & InsetText::paragraphs()
 bool InsetText::insetAllowed(InsetCode code) const
 {
        switch (code) {
-       // Arguments are also allowed in PassThru insets
+       // Arguments and (plain) quotes are also allowed in PassThru insets
        case ARG_CODE:
+       case QUOTE_CODE:
                return true;
        default:
-               return !getLayout().isPassThru();
+               return !isPassThru();
        }
 }
 
@@ -760,6 +800,9 @@ void InsetText::updateBuffer(ParIterator const & it, UpdateType utype)
                // since we are saving and restoring the existing counters, etc.
                Counters const savecnt = tclass.counters();
                tclass.counters().reset();
+               // we need float information even in note insets (#9760)
+               tclass.counters().current_float(savecnt.current_float());
+               tclass.counters().isSubfloat(savecnt.isSubfloat());
                buffer().updateBuffer(it2, utype);
                tclass.counters() = savecnt;
        }
@@ -772,87 +815,154 @@ void InsetText::toString(odocstream & os) const
 }
 
 
-void InsetText::forToc(docstring & os, size_t maxlen) const
+void InsetText::forOutliner(docstring & os, size_t const maxlen,
+                                                       bool const shorten) const
 {
        if (!getLayout().isInToc())
                return;
-       text().forToc(os, maxlen, false);
+       text().forOutliner(os, maxlen, shorten);
 }
 
 
-void InsetText::addToToc(DocIterator const & cdit) const
+void InsetText::addToToc(DocIterator const & cdit, bool output_active,
+                                                UpdateType utype, TocBackend & backend) const
 {
        DocIterator dit = cdit;
        dit.push_back(CursorSlice(const_cast<InsetText &>(*this)));
-       Toc & toc = buffer().tocBackend().toc("tableofcontents");
+       iterateForToc(dit, output_active, utype, backend);
+}
+
+
+void InsetText::iterateForToc(DocIterator const & cdit, bool output_active,
+                                                         UpdateType utype, TocBackend & backend) const
+{
+       DocIterator dit = cdit;
+       // This also ensures that any document has a table of contents
+       shared_ptr<Toc> toc = backend.toc("tableofcontents");
 
        BufferParams const & bufparams = buffer_->params();
        int const min_toclevel = bufparams.documentClass().min_toclevel();
-
-       // For each paragraph, traverse its insets and let them add
-       // their toc items
+       // we really should have done this before we got here, but it
+       // can't hurt too much to do it again
+       bool const doing_output = output_active && producesOutput();
+
+       // For each paragraph,
+       // * Add a toc item for the paragraph if it is AddToToc--merging adjacent
+       //   paragraphs as needed.
+       // * Traverse its insets and let them add their toc items
+       // * Compute the main table of contents (this is hardcoded)
+       // * Add the list of changes
        ParagraphList const & pars = paragraphs();
        pit_type pend = paragraphs().size();
+       // Record pairs {start,end} of where a toc item was opened for a paragraph
+       // and where it must be closed
+       stack<pair<pit_type, pit_type>> addtotoc_stack;
+
        for (pit_type pit = 0; pit != pend; ++pit) {
                Paragraph const & par = pars[pit];
                dit.pit() = pit;
+               dit.pos() = 0;
+
+               // Custom AddToToc in paragraph layouts (i.e. theorems)
+               if (par.layout().addToToc() && text().isFirstInSequence(pit)) {
+                       pit_type end =
+                               openAddToTocForParagraph(pit, dit, output_active, backend);
+                       addtotoc_stack.push({pit, end});
+               }
+
                // if we find an optarg, we'll save it for use later.
-               InsetText const * arginset = 0;
-               InsetList::const_iterator it  = par.insetList().begin();
-               InsetList::const_iterator end = par.insetList().end();
-               for (; it != end; ++it) {
-                       Inset & inset = *it->inset;
-                       dit.pos() = it->pos;
-                       //lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl;
-                       inset.addToToc(dit);
-                       if (inset.lyxCode() == ARG_CODE)
-                               arginset = inset.asInsetText();
+               InsetArgument const * arginset = nullptr;
+               for (auto const & table : par.insetList()) {
+                       dit.pos() = table.pos;
+                       table.inset->addToToc(dit, doing_output, utype, backend);
+                       if (InsetArgument const * x = table.inset->asInsetArgument())
+                               arginset = x;
                }
-               // now the toc entry for the paragraph
-               int const toclevel = par.layout().toclevel;
+
+               // End custom AddToToc in paragraph layouts
+               while (!addtotoc_stack.empty() && addtotoc_stack.top().second == pit) {
+                       // execute the closing function
+                       closeAddToTocForParagraph(addtotoc_stack.top().first,
+                                                 addtotoc_stack.top().second, backend);
+                       addtotoc_stack.pop();
+               }
+
+               // now the toc entry for the paragraph in the main table of contents
+               int const toclevel = text().getTocLevel(pit);
                if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel) {
                        // insert this into the table of contents
                        docstring tocstring;
+                       int const length = (doing_output && utype == OutputUpdate) ?
+                               INT_MAX : TOC_ENTRY_LENGTH;
                        if (arginset) {
                                tocstring = par.labelString();
                                if (!tocstring.empty())
                                        tocstring += ' ';
-                               arginset->text().forToc(tocstring, TOC_ENTRY_LENGTH);
+                               arginset->text().forOutliner(tocstring, length);
                        } else
-                               par.forToc(tocstring, TOC_ENTRY_LENGTH);
+                               par.forOutliner(tocstring, length);
                        dit.pos() = 0;
-                       toc.push_back(TocItem(dit, toclevel - min_toclevel,
-                               tocstring, tocstring));
+                       toc->push_back(TocItem(dit, toclevel - min_toclevel,
+                                              tocstring, doing_output));
                }
-               
+
                // And now the list of changes.
-               par.addChangesToToc(dit, buffer());
+               par.addChangesToToc(dit, buffer(), doing_output, backend);
        }
 }
 
 
+pit_type InsetText::openAddToTocForParagraph(pit_type pit,
+                                             DocIterator const & dit,
+                                             bool output_active,
+                                             TocBackend & backend) const
+{
+       Paragraph const & par = paragraphs()[pit];
+       TocBuilder & b = backend.builder(par.layout().tocType());
+       docstring const label = par.labelString();
+       b.pushItem(dit, label + (label.empty() ? "" : " "), output_active);
+       return text().lastInSequence(pit);
+}
+
+
+void InsetText::closeAddToTocForParagraph(pit_type start, pit_type end,
+                                          TocBackend & backend) const
+{
+       Paragraph const & par = paragraphs()[start];
+       TocBuilder & b = backend.builder(par.layout().tocType());
+       if (par.layout().isTocCaption()) {
+               docstring str;
+               text().forOutliner(str, TOC_ENTRY_LENGTH, start, end);
+               b.argumentItem(str);
+       }
+       b.pop();
+}
+
+
 bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & cur)
 {
        if (buffer().isClean())
                return Inset::notifyCursorLeaves(old, cur);
-       
+
        // find text inset in old cursor
        Cursor insetCur = old;
        int scriptSlice = insetCur.find(this);
-       LASSERT(scriptSlice != -1, /**/);
+       // we can try to continue here. returning true means
+       // the cursor is "now" invalid. which it was.
+       LASSERT(scriptSlice != -1, return true);
        insetCur.cutOff(scriptSlice);
-       LASSERT(&insetCur.inset() == this, /**/);
-       
+       LASSERT(&insetCur.inset() == this, return true);
+
        // update the old paragraph's words
        insetCur.paragraph().updateWords();
-       
+
        return Inset::notifyCursorLeaves(old, cur);
 }
 
 
 bool InsetText::completionSupported(Cursor const & cur) const
 {
-       //LASSERT(&cur.bv().cursor().inset() != this, return false);
+       //LASSERT(&cur.bv().cursor().inset() == this, return false);
        return text_.completionSupported(cur);
 }
 
@@ -905,7 +1015,7 @@ bool InsetText::insertCompletion(Cursor & cur, docstring const & s,
 }
 
 
-void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y, 
+void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
        Dimension & dim) const
 {
        TextMetrics const & tm = cur.bv().textMetrics(&text_);
@@ -917,7 +1027,7 @@ string InsetText::contextMenu(BufferView const &, int, int) const
 {
        string context_menu = contextMenuName();
        if (context_menu != InsetText::contextMenuName())
-               context_menu += ";" + InsetText::contextMenuName(); 
+               context_menu += ";" + InsetText::contextMenuName();
        return context_menu;
 }
 
@@ -928,11 +1038,10 @@ string InsetText::contextMenuName() const
 }
 
 
-docstring InsetText::toolTipText(docstring prefix,
-               size_t numlines, size_t len) const
+docstring InsetText::toolTipText(docstring prefix, size_t const len) const
 {
-       size_t const max_length = numlines * len;
        OutputParams rp(&buffer().params().encoding());
+       rp.for_tooltip = true;
        odocstringstream oss;
        oss << prefix;
 
@@ -940,63 +1049,17 @@ docstring InsetText::toolTipText(docstring prefix,
        ParagraphList::const_iterator end = paragraphs().end();
        ParagraphList::const_iterator it = beg;
        bool ref_printed = false;
-       docstring str;
 
        for (; it != end; ++it) {
                if (it != beg)
                        oss << '\n';
-               writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed);
-               str = oss.str();
-               if (str.length() > max_length)
+               writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed, len);
+               if (oss.tellp() >= 0 && size_t(oss.tellp()) > len)
                        break;
        }
-       return support::wrapParas(str, 4, len, numlines);
-}
-
-
-InsetCaption const * InsetText::getCaptionInset() const
-{
-       ParagraphList::const_iterator pit = paragraphs().begin();
-       for (; pit != paragraphs().end(); ++pit) {
-               InsetList::const_iterator it = pit->insetList().begin();
-               for (; it != pit->insetList().end(); ++it) {
-                       Inset & inset = *it->inset;
-                       if (inset.lyxCode() == CAPTION_CODE) {
-                               InsetCaption const * ins =
-                                       static_cast<InsetCaption const *>(it->inset);
-                               return ins;
-                       }
-               }
-       }
-       return 0;
-}
-
-
-docstring InsetText::getCaptionText(OutputParams const & runparams) const
-{
-       InsetCaption const * ins = getCaptionInset();
-       if (ins == 0)
-               return docstring();
-
-       odocstringstream ods;
-       ins->getCaptionAsPlaintext(ods, runparams);
-       return ods.str();
-}
-
-
-docstring InsetText::getCaptionHTML(OutputParams const & runparams) const
-{
-       InsetCaption const * ins = getCaptionInset();
-       if (ins == 0)
-               return docstring();
-
-       odocstringstream ods;
-       XHTMLStream xs(ods);
-       docstring def = ins->getCaptionAsHTML(xs, runparams);
-       if (!def.empty())
-               // should already have been escaped
-               xs << XHTMLStream::ESCAPE_NONE << def << '\n';
-       return ods.str();
+       docstring str = oss.str();
+       support::truncateWithEllipsis(str, len);
+       return str;
 }