Change tracking cue for InsetCaption

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 99b1381f93d9961914dfd163d4c58ab0bd247bb7..41427ce7c3326c22838e4842a400bf8329cd7015 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -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"
@@ -226,8 +226,8 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
                                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.
+               // 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
@@ -612,7 +612,9 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
        runparams.par_end = text().paragraphs().size();
        
        if (undefined()) {
+               xs.startDivision(false);
                xhtmlParagraphs(text_, buffer(), xs, runparams);
+               xs.endDivision();
                return docstring();
        }
 
@@ -646,7 +648,9 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
        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());
@@ -1014,52 +1018,6 @@ docstring InsetText::toolTipText(docstring prefix, size_t const len) const
 }
 
 
-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();
-}
-
-
 InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2)
 {
        return static_cast<InsetText::XHTMLOptions>((int)a1 | (int)a2);