X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=41427ce7c3326c22838e4842a400bf8329cd7015;hb=9c0281126e5b819a6c10afa1bb585b76cdc4dca2;hp=7d28020669caff829576a2919f71254dea8013bd;hpb=4089ff1ec36292a37866c81d844e9ebd6dffd850;p=lyx.git

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 7d28020669..41427ce7c3 100644
--- 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"
@@ -56,13 +56,13 @@
 #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>
 
@@ -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);
 }
 
 
@@ -588,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();
 	}
 
@@ -622,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());
@@ -990,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);