]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetText.cpp
Improve the check for multiple paragraphs in Text::insertStringAsLine.
[lyx.git] / src / insets / InsetText.cpp
index ccdc9f04ac826bea23d804fa986b37528e484aec..254d86641ede94953d2258498bd8926dc6d534e8 100644 (file)
@@ -12,7 +12,8 @@
 
 #include "InsetText.h"
 
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
+#include "insets/InsetLayout.h"
 
 #include "buffer_funcs.h"
 #include "Buffer.h"
@@ -30,6 +31,7 @@
 #include "InsetList.h"
 #include "Intl.h"
 #include "Language.h"
+#include "Layout.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "lyxfind.h"
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 #include "support/lassert.h"
 
+#include <algorithm>
+
+
 using namespace std;
 using namespace lyx::support;
 
-using boost::bind;
-using boost::ref;
 
 namespace lyx {
 
@@ -75,20 +79,17 @@ using graphics::PreviewLoader;
 /////////////////////////////////////////////////////////////////////
 
 InsetText::InsetText(Buffer * buf, UsePlain type)
-       : Inset(buf), drawFrame_(false), frame_color_(Color_insetframe), text_(this)
+       : Inset(buf), drawFrame_(false), frame_color_(Color_insetframe),
+       text_(this, type == DefaultLayout)
 {
-       initParagraphs(type);
 }
 
 
 InsetText::InsetText(InsetText const & in)
-       : Inset(in), text_(this)
+       : Inset(in), text_(this, in.text_)
 {
-       text_.autoBreakRows_ = in.text_.autoBreakRows_;
        drawFrame_ = in.drawFrame_;
        frame_color_ = in.frame_color_;
-       text_.paragraphs() = in.text_.paragraphs();
-       setParagraphOwner();
 }
 
 
@@ -101,31 +102,30 @@ void InsetText::setBuffer(Buffer & buf)
 }
 
 
-void InsetText::initParagraphs(UsePlain type)
+void InsetText::setMacrocontextPositionRecursive(DocIterator const & pos)
 {
-       LASSERT(paragraphs().empty(), /**/);
-       paragraphs().push_back(Paragraph());
-       Paragraph & ourpar = paragraphs().back();
-       ourpar.setInsetOwner(this);
-       DocumentClass const & dc = buffer_->params().documentClass();
-       if (type == DefaultLayout)
-               ourpar.setDefaultLayout(dc);
-       else
-               ourpar.setPlainLayout(dc);
-}
-
+       text_.setMacrocontextPosition(pos);
 
-void InsetText::setParagraphOwner()
-{
-       for_each(paragraphs().begin(), paragraphs().end(),
-                bind(&Paragraph::setInsetOwner, _1, this));
+       ParagraphList::const_iterator pit = paragraphs().begin();
+       ParagraphList::const_iterator pend = paragraphs().end();
+       for (; pit != pend; ++pit) {
+               InsetList::const_iterator iit = pit->insetList().begin();
+               InsetList::const_iterator end = pit->insetList().end();
+               for (; iit != end; ++iit) {
+                       if (InsetText * txt = iit->inset->asInsetText()) {
+                               DocIterator ppos(pos);
+                               ppos.push_back(CursorSlice(*txt));
+                               iit->inset->asInsetText()->setMacrocontextPositionRecursive(ppos);
+                       }
+               }
+       }
 }
 
 
 void InsetText::clear()
 {
        ParagraphList & pars = paragraphs();
-       LASSERT(!pars.empty(), /**/);
+       LBUFERR(!pars.empty());
 
        // This is a gross hack...
        Layout const & old_layout = pars.begin()->layout();
@@ -251,7 +251,6 @@ void InsetText::edit(Cursor & cur, bool front, EntryDirection entry_from)
        }
 
        text_.setCursor(cur.top(), pit, pos);
-       cur.clearSelection();
        cur.finishUndo();
 }
 
@@ -264,10 +263,10 @@ Inset * InsetText::editXY(Cursor & cur, int x, int y)
 
 void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       LYXERR(Debug::ACTION, "InsetText::doDispatch()"
-               << " [ cmd.action = " << cmd.action << ']');
+       LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
 
-       if (getLayout().isPassThru()) {
+       // See bug #9042, for instance.
+       if (isPassThru() && lyxCode() != ARG_CODE) {
                // 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
@@ -278,7 +277,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
                cur.real_current_font.setLanguage(latex_language);
        }
 
-       switch (cmd.action) {
+       switch (cmd.action()) {
        case LFUN_PASTE:
        case LFUN_CLIPBOARD_PASTE:
        case LFUN_SELECTION_PASTE:
@@ -321,18 +320,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
-       switch (cmd.action) {
-       case LFUN_LAYOUT:
-               status.setEnabled(!forcePlainLayout());
-               return true;
-
-       case LFUN_LAYOUT_PARAGRAPH:
-       case LFUN_PARAGRAPH_PARAMS:
-       case LFUN_PARAGRAPH_PARAMS_APPLY:
-       case LFUN_PARAGRAPH_UPDATE:
-               status.setEnabled(allowParagraphCustomization());
-               return true;
-
+       switch (cmd.action()) {
        case LFUN_INSET_DISSOLVE: {
                bool const main_inset = &buffer().inset() == this;
                bool const target_inset = cmd.argument().empty() 
@@ -344,6 +332,40 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
                return target_inset;
        }
 
+       case LFUN_ARGUMENT_INSERT: {
+               string const arg = cmd.getArg(0);
+               if (arg.empty()) {
+                       status.setEnabled(false);
+                       return true;
+               }
+               if (&buffer().inset() == this || !cur.paragraph().layout().args().empty())
+                       return text_.getStatus(cur, cmd, status);
+
+               Layout::LaTeXArgMap args = getLayout().args();
+               Layout::LaTeXArgMap::const_iterator const lait = args.find(arg);
+               if (lait != args.end()) {
+                       status.setEnabled(true);
+                       ParagraphList::const_iterator pit = paragraphs().begin();
+                       for (; pit != paragraphs().end(); ++pit) {
+                               InsetList::const_iterator it = pit->insetList().begin();
+                               InsetList::const_iterator end = pit->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;
+                                               }
+                                       }
+                               }
+                       }
+               } else
+                       status.setEnabled(false);
+               return true;
+       }
+
        default:
                // Dispatch only to text_ if the cursor is inside
                // the text_. It is not for context menus (bug 5797).
@@ -360,16 +382,15 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetText::fixParagraphsFont()
 {
-       if (!getLayout().isPassThru())
-               return;
-
        Font font(inherit_font, buffer().params().language);
        font.setLanguage(latex_language);
        ParagraphList::iterator par = paragraphs().begin();
        ParagraphList::iterator const end = paragraphs().end();
        while (par != end) {
-               par->resetFonts(font);
-               par->params().clear();
+               if (par->isPassThru())
+                       par->resetFonts(font);
+               if (!par->allowParagraphCustomization())
+                       par->params().clear();
                ++par;
        }
 }
@@ -405,54 +426,91 @@ void InsetText::validate(LaTeXFeatures & features) const
 }
 
 
-int InsetText::latex(odocstream & os, OutputParams const & runparams) const
+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
        // redefine this, non-standard ones may call this.
        InsetLayout const & il = getLayout();
-       int rows = 0;
+       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());
+                       if (!il.latexargs().empty())
+                               getArgs(os, runparams);
                        if (!il.latexparam().empty())
                                os << from_utf8(il.latexparam());
                        os << '{';
                } else if (il.latextype() == InsetLayout::ENVIRONMENT) {
-                       os << "%\n\\begin{" << from_utf8(il.latexname()) << "}\n";
+                       if (il.isDisplay())
+                               os << breakln;
+                       else
+                               os << safebreakln;
+                       if (runparams.lastid != -1)
+                               os.texrow().start(runparams.lastid,
+                                                 runparams.lastpos);
+                       os << "\\begin{" << from_utf8(il.latexname()) << "}";
+                       if (!il.latexargs().empty())
+                               getArgs(os, runparams);
                        if (!il.latexparam().empty())
                                os << from_utf8(il.latexparam());
-                       rows += 2;
+                       os << '\n';
                }
+       } else {
+               if (!il.latexargs().empty())
+                       getArgs(os, runparams);
+               if (!il.latexparam().empty())
+                       os << from_utf8(il.latexparam());
        }
+
+       if (!il.leftdelim().empty())
+               os << il.leftdelim();
+
        OutputParams rp = runparams;
-       if (il.isPassThru())
-               rp.verbatim = true;
+       if (isPassThru())
+               rp.pass_thru = true;
        if (il.isNeedProtect())
                rp.moving_arg = true;
+       rp.par_begin = 0;
+       rp.par_end = paragraphs().size();
 
        // Output the contents of the inset
-       TexRow texrow;
-       latexParagraphs(buffer(), text_, os, texrow, rp);
-       rows += texrow.rows();
+       latexParagraphs(buffer(), text_, os, rp);
+       runparams.encoding = rp.encoding;
+
+       if (!il.rightdelim().empty())
+               os << il.rightdelim();
 
        if (!il.latexname().empty()) {
                if (il.latextype() == InsetLayout::COMMAND) {
                        os << "}";
+                       if (!il.postcommandargs().empty())
+                               getArgs(os, runparams, true);
                } else if (il.latextype() == InsetLayout::ENVIRONMENT) {
-                       os << "\n\\end{" << from_utf8(il.latexname()) << "}\n";
-                       rows += 2;
+                       // A comment environment doesn't need a % before \n\end
+                       if (il.isDisplay() || runparams.inComment)
+                               os << breakln;
+                       else
+                               os << safebreakln;
+                       os << "\\end{" << from_utf8(il.latexname()) << "}" << breakln;
+                       if (!il.isDisplay())
+                               os.protectSpace(true);
                }
        }
-       return rows;
+       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();
@@ -466,12 +524,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;
@@ -514,9 +574,15 @@ docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) con
 // 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 & runparams,
+docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
                                   XHTMLOptions opts) const
 {
+       // we will always want to output all our paragraphs when we are
+       // called this way.
+       OutputParams runparams = rp;
+       runparams.par_begin = 0;
+       runparams.par_end = text().paragraphs().size();
+       
        if (undefined()) {
                xhtmlParagraphs(text_, buffer(), xs, runparams);
                return docstring();
@@ -524,40 +590,59 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & runpara
 
        InsetLayout const & il = getLayout();
        if (opts & WriteOuterTag)
-               xs << StartTag(il.htmltag(), il.htmlattr());
+               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());
+               cntrs.step(il.counter(), OutputUpdate);
                // FIXME: translate to paragraph language
                if (!il.htmllabel().empty()) {
                        docstring const lbl = 
                                cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code());
                        // FIXME is this check necessary?
                        if (!lbl.empty()) {
-                               xs << StartTag(il.htmllabeltag(), il.htmllabelattr());
+                               xs << html::StartTag(il.htmllabeltag(), il.htmllabelattr());
                                xs << lbl;
-                               xs << EndTag(il.htmllabeltag());
+                               xs << html::EndTag(il.htmllabeltag());
                        }
                }
        }
 
        if (opts & WriteInnerTag)
-               xs << StartTag(il.htmlinnertag(), il.htmlinnerattr());
-       if (il.isMultiPar())
-               xhtmlParagraphs(text_, buffer(), xs, runparams);
-       else {
-               OutputParams ours = runparams;
-               ours.html_make_pars = false;
-               xhtmlParagraphs(text_, buffer(), xs, ours);
-       }
+               xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr());
+
+       // 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;
+
+       xhtmlParagraphs(text_, buffer(), xs, runparams);
+
        if (opts & WriteInnerTag)
-               xs << EndTag(il.htmlinnertag());
+               xs << html::EndTag(il.htmlinnertag());
+
        if (opts & WriteOuterTag)
-               xs << EndTag(il.htmltag());
+               xs << html::EndTag(il.htmltag());
+
        return docstring();
 }
 
+void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in,
+                       bool const post) const
+{
+       OutputParams runparams = runparams_in;
+       runparams.local_font =
+               &paragraphs()[0].getFirstFontSettings(buffer().masterBuffer()->params());
+       if (isPassThru())
+               runparams.pass_thru = true;
+       if (post)
+               latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().postcommandargs(), "post:");
+       else
+               latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().latexargs());
+}
+
 
 void InsetText::cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const
@@ -567,12 +652,6 @@ void InsetText::cursorPos(BufferView const & bv,
 }
 
 
-bool InsetText::showInsetDialog(BufferView *) const
-{
-       return false;
-}
-
-
 void InsetText::setText(docstring const & data, Font const & font, bool trackChanges)
 {
        clear();
@@ -675,84 +754,123 @@ ParagraphList & InsetText::paragraphs()
 }
 
 
-void InsetText::updateLabels(ParIterator const & it)
+bool InsetText::insetAllowed(InsetCode code) const
+{
+       switch (code) {
+       // Arguments are also allowed in PassThru insets
+       case ARG_CODE:
+               return true;
+       default:
+               return !isPassThru();
+       }
+}
+
+
+void InsetText::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        ParIterator it2 = it;
        it2.forwardPos();
        LASSERT(&it2.inset() == this && it2.pit() == 0, return);
-       if (producesOutput())
-               buffer().updateLabels(it2);
-       else {
+       if (producesOutput()) {
+               InsetLayout const & il = getLayout();
+               bool const save_layouts = utype == OutputUpdate && il.htmlisblock();
+               Counters & cnt = buffer().masterBuffer()->params().documentClass().counters();
+               if (save_layouts) {
+                       // LYXERR0("Entering " << name());
+                       cnt.clearLastLayout();
+                       // FIXME cnt.saveLastCounter()?
+               }
+               buffer().updateBuffer(it2, utype);
+               if (save_layouts) {
+                       // LYXERR0("Exiting " << name());
+                       cnt.restoreLastLayout();
+                       // FIXME cnt.restoreLastCounter()?
+               }
+       } else {
                DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass();
+               // Note that we do not need to call:
+               //      tclass.counters().clearLastLayout()
+               // since we are saving and restoring the existing counters, etc.
                Counters const savecnt = tclass.counters();
-               buffer().updateLabels(it2);
+               tclass.counters().reset();
+               buffer().updateBuffer(it2, utype);
                tclass.counters() = savecnt;
        }
 }
 
 
-void InsetText::tocString(odocstream & os) const
+void InsetText::toString(odocstream & os) const
+{
+       os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
+}
+
+
+void InsetText::forOutliner(docstring & os, size_t maxlen) const
 {
        if (!getLayout().isInToc())
                return;
-       os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
+       text().forOutliner(os, maxlen, false);
 }
 
 
+void InsetText::addToToc(DocIterator const & cdit, bool output_active) const
+{
+       DocIterator dit = cdit;
+       dit.push_back(CursorSlice(const_cast<InsetText &>(*this)));
+       iterateForToc(dit, output_active);
+}
 
-void InsetText::addToToc(DocIterator const & cdit)
+
+void InsetText::iterateForToc(DocIterator const & cdit, bool output_active) const
 {
        DocIterator dit = cdit;
-       dit.push_back(CursorSlice(*this));
        Toc & toc = buffer().tocBackend().toc("tableofcontents");
 
        BufferParams const & bufparams = buffer_->params();
-       const int min_toclevel = bufparams.documentClass().min_toclevel();
+       int const min_toclevel = bufparams.documentClass().min_toclevel();
+       // 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, traverse its insets and let them add
        // their toc items
-       ParagraphList & pars = paragraphs();
+       ParagraphList const & pars = paragraphs();
        pit_type pend = paragraphs().size();
        for (pit_type pit = 0; pit != pend; ++pit) {
                Paragraph const & par = pars[pit];
                dit.pit() = pit;
-               // the string that goes to the toc (could be the optarg)
-               docstring tocstring;
+               // 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);
-                       switch (inset.lyxCode()) {
-                       case OPTARG_CODE: {
-                               if (!tocstring.empty())
-                                       break;
-                               dit.pos() = 0;
-                               Paragraph const & insetpar =
-                                       *static_cast<InsetOptArg&>(inset).paragraphs().begin();
-                               if (!par.labelString().empty())
-                                       tocstring = par.labelString() + ' ';
-                               tocstring += insetpar.asString(AS_STR_INSETS);
-                               break;
-                       }
-                       default:
-                               break;
-                       }
+                       inset.addToToc(dit, doing_output);
+                       if (inset.lyxCode() == ARG_CODE)
+                               arginset = inset.asInsetText();
                }
                // now the toc entry for the paragraph
-               int const toclevel = par.layout().toclevel;
+               int const toclevel = text().getTocLevel(pit);
                if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel) {
-                       dit.pos() = 0;
                        // insert this into the table of contents
-                       if (tocstring.empty())
-                               tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);
-                       toc.push_back(TocItem(dit, toclevel - min_toclevel, tocstring));
+                       docstring tocstring;
+                       int const length = doing_output ? INT_MAX : TOC_ENTRY_LENGTH;
+                       if (arginset) {
+                               tocstring = par.labelString();
+                               if (!tocstring.empty())
+                                       tocstring += ' ';
+                               arginset->text().forOutliner(tocstring, length);
+                       } else
+                               par.forOutliner(tocstring, length);
+                       dit.pos() = 0;
+                       toc.push_back(TocItem(dit, toclevel - min_toclevel,
+                               tocstring, doing_output, tocstring));
                }
                
                // And now the list of changes.
-               par.addChangesToToc(dit, buffer());
+               par.addChangesToToc(dit, buffer(), doing_output);
        }
 }
 
@@ -765,9 +883,11 @@ bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & 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();
@@ -778,7 +898,7 @@ bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & 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);
 }
 
@@ -839,9 +959,45 @@ void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
 }
 
 
-docstring InsetText::contextMenu(BufferView const &, int, int) const
+string InsetText::contextMenu(BufferView const &, int, int) const
+{
+       string context_menu = contextMenuName();
+       if (context_menu != InsetText::contextMenuName())
+               context_menu += ";" + InsetText::contextMenuName(); 
+       return context_menu;
+}
+
+
+string InsetText::contextMenuName() const
+{
+       return "context-edit";
+}
+
+
+docstring InsetText::toolTipText(docstring prefix,
+               size_t numlines, size_t len) const
 {
-       return from_ascii("context-edit");
+       size_t const max_length = numlines * len;
+       OutputParams rp(&buffer().params().encoding());
+       rp.for_tooltip = true;
+       odocstringstream oss;
+       oss << prefix;
+
+       ParagraphList::const_iterator beg = paragraphs().begin();
+       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, max_length);
+               str = oss.str();
+               if (str.length() >= max_length)
+                       break;
+       }
+       return support::wrapParas(str, 4, len, numlines);
 }
 
 
@@ -882,9 +1038,11 @@ docstring InsetText::getCaptionHTML(OutputParams const & runparams) const
                return docstring();
 
        odocstringstream ods;
-       docstring def = ins->getCaptionAsHTML(ods, runparams);
+       XHTMLStream xs(ods);
+       docstring def = ins->getCaptionAsHTML(xs, runparams);
        if (!def.empty())
-               ods << def << '\n';
+               // should already have been escaped
+               xs << XHTMLStream::ESCAPE_NONE << def << '\n';
        return ods.str();
 }