X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.C;h=9b2233c5ddd22bf0687262998cb62bdd4505d5fd;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=7ac46bc85cec9ae305a90d4df7cc7b9de9fce6fa;hpb=59413be9a0b999c17784d1abad01e55819ecd27a;p=lyx.git

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 7ac46bc85c..9b2233c5dd 100644
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -16,6 +16,7 @@
 #include "buffer.h"
 #include "bufferparams.h"
 #include "BufferView.h"
+#include "coordcache.h"
 #include "CutAndPaste.h"
 #include "cursor.h"
 #include "debug.h"
@@ -32,7 +33,6 @@
 #include "metricsinfo.h"
 #include "output_docbook.h"
 #include "output_latex.h"
-#include "output_linuxdoc.h"
 #include "output_plaintext.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
@@ -44,20 +44,21 @@
 #include "undo.h"
 
 #include "frontends/Alert.h"
-#include "frontends/font_metrics.h"
-#include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 
-#include "support/lyxalgo.h" // lyx::count
+#include "support/lyxalgo.h" // count
 
 #include <boost/bind.hpp>
+#include <boost/current_function.hpp>
 
-using lyx::pos_type;
+#include <sstream>
 
-using lyx::graphics::PreviewLoader;
 
-using lyx::support::isStrUnsignedInt;
-using lyx::support::strToUnsignedInt;
+namespace lyx {
+
+using graphics::PreviewLoader;
+
+using support::isStrUnsignedInt;
 
 using boost::bind;
 using boost::ref;
@@ -71,30 +72,37 @@ using std::ostream;
 using std::vector;
 
 
+int InsetText::border_ = 2;
+
+
 InsetText::InsetText(BufferParams const & bp)
-	: autoBreakRows_(false), drawFrame_(false),
-	  frame_color_(LColor::insetframe), text_(0)
+	: drawFrame_(false), frame_color_(LColor::insetframe)
 {
 	paragraphs().push_back(Paragraph());
 	paragraphs().back().layout(bp.getLyXTextClass().defaultLayout());
-	if (bp.tracking_changes)
-		paragraphs().back().trackChanges();
+	// Dispose of the infamous L-shaped cursor.
+	text_.current_font.setLanguage(bp.language);
+	text_.real_current_font.setLanguage(bp.language);
 	init();
 }
 
 
 InsetText::InsetText(InsetText const & in)
-	: UpdatableInset(in), text_(in.text_.bv_owner)
+	: InsetOld(in), text_()
 {
-	autoBreakRows_ = in.autoBreakRows_;
+	text_.autoBreakRows_ = in.text_.autoBreakRows_;
 	drawFrame_ = in.drawFrame_;
 	frame_color_ = in.frame_color_;
 	text_.paragraphs() = in.text_.paragraphs();
+	// Hand current buffer language down to "cloned" textinsets
+	// e.g. tabular cells
+	text_.current_font = in.text_.current_font;
+	text_.real_current_font = in.text_.real_current_font;
 	init();
 }
 
 
-InsetText::InsetText() : text_(0)
+InsetText::InsetText()
 {}
 
 
@@ -102,18 +110,12 @@ void InsetText::init()
 {
 	for_each(paragraphs().begin(), paragraphs().end(),
 		 bind(&Paragraph::setInsetOwner, _1, this));
-	old_par = -1;
 }
 
 
-void InsetText::clear(bool just_mark_erased)
+void InsetText::clear()
 {
 	ParagraphList & pars = paragraphs();
-	if (just_mark_erased) {
-		for_each(pars.begin(), pars.end(),
-			 bind(&Paragraph::markErased, _1));
-		return;
-	}
 
 	// This is a gross hack...
 	LyXLayout_ptr old_layout = pars.begin()->layout();
@@ -140,18 +142,13 @@ void InsetText::write(Buffer const & buf, ostream & os) const
 
 void InsetText::read(Buffer const & buf, LyXLex & lex)
 {
-	clear(false);
-
-#ifdef WITH_WARNINGS
-#warning John, look here. Doesnt make much sense.
-#endif
-	if (buf.params().tracking_changes)
-		paragraphs().begin()->trackChanges();
+	clear();
 
 	// delete the initial paragraph
 	Paragraph oldpar = *paragraphs().begin();
 	paragraphs().clear();
-	bool res = text_.read(buf, lex);
+	ErrorList errorList;
+	bool res = text_.read(buf, lex, errorList);
 	init();
 
 	if (!res) {
@@ -160,104 +157,78 @@ void InsetText::read(Buffer const & buf, LyXLex & lex)
 	}
 
 	// sanity check
-	// ensure we have at least one par.
+	// ensure we have at least one paragraph.
 	if (paragraphs().empty())
 		paragraphs().push_back(oldpar);
 }
 
 
-void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+	TextMetrics & tm = mi.base.bv->textMetrics(&text_);
+
 	//lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
-	setViewCache(mi.base.bv);
-	text_.metrics(mi, dim);
-	dim_ = dim;
+	mi.base.textwidth -= 2 * border_;
 	font_ = mi.base.font;
+	// Hand font through to contained lyxtext:
 	text_.font_ = mi.base.font;
+	tm.metrics(mi, dim);
+	dim.asc += border_;
+	dim.des += border_;
+	dim.wid += 2 * border_;
+	mi.base.textwidth += 2 * border_;
+	bool const changed = dim_ != dim;
+	dim_ = dim;
+	return changed;
 }
 
 
 void InsetText::draw(PainterInfo & pi, int x, int y) const
 {
-	BOOST_ASSERT(!text_.paragraphs().begin()->rows.empty());
 	// update our idea of where we are
 	setPosCache(pi, x, y);
 
-	BufferView * bv = pi.base.bv;
-	bv->hideCursor();
-
-	x += scroll();
-	y -= text_.ascent();
+	TextMetrics & tm = pi.base.bv->textMetrics(&text_);
 
-	// repaint the background if needed
-	if (backgroundColor() != LColor::background)
-		clearInset(pi.pain, x, y);
+	text_.background_color_ = backgroundColor();
+	text_.draw(pi, x + border_, y);
 
-	text_.draw(pi, x, y + bv->top_y());
-
-	if (drawFrame_)
-		drawFrame(pi.pain, x, y);
+	if (drawFrame_) {
+		int const w = tm.width() + 2 * border_;
+		int const a = tm.ascent() + border_;
+		int const h = a + tm.descent() + border_;
+		pi.pain.rectangle(x, y - a, (wide() ? tm.maxWidth() : w), h,
+			frameColor());
+	}
 }
 
 
 void InsetText::drawSelection(PainterInfo & pi, int x, int y) const
 {
-	text_.drawSelection(pi, x, y);
-}
-
-
-void InsetText::drawFrame(Painter & pain, int x, int y) const
-{
-	int const w = text_.width();
-	int const h = text_.height();
-	pain.rectangle(x, y, w, h, frameColor());
-}
-
+	TextMetrics & tm = pi.base.bv->textMetrics(&text_);
 
-void InsetText::clearInset(Painter & pain, int x, int y) const
-{
-	int const w = text_.width();
-	int const h = text_.height();
-	pain.fillRectangle(x, y, w, h, backgroundColor());
+	int const w = tm.width() + 2 * border_;
+	int const a = tm.ascent() + border_;
+	int const h = a + tm.descent() + border_;
+	pi.pain.fillRectangle(x, y - a, (wide() ? tm.maxWidth() : w), h,
+		backgroundColor());
+	text_.drawSelection(pi, x, y);
 }
 
 
-void InsetText::updateLocal(LCursor & cur)
+bool InsetText::covers(BufferView const & bv, int x, int y) const
 {
-	if (!autoBreakRows_ && paragraphs().size() > 1) {
-		// collapseParagraphs
-		while (paragraphs().size() > 1) {
-			ParagraphList::iterator const first = paragraphs().begin();
-			ParagraphList::iterator second = first;
-			++second;
-			size_t const first_par_size = first->size();
-
-			if (!first->empty() &&
-					!second->empty() &&
-					!first->isSeparator(first_par_size - 1)) {
-				first->insertChar(first_par_size, ' ');
-			}
-
-			cur.clearSelection();
-			mergeParagraph(cur.buffer().params(), paragraphs(), 0);
-		}
-	}
+	TextMetrics const & tm = bv.textMetrics(&text_);
 
-	if (!cur.selection())
-		cur.resetAnchor();
-
-	LyXView * lv = cur.bv().owner();
-	lv->view_state_changed();
-	lv->updateMenubar();
-	lv->updateToolbars();
-	if (old_par != cur.par()) {
-		lv->setLayout(text_.getPar(cur.par()).layout()->name());
-		old_par = cur.par();
-	}
+	return bv.coordCache().getInsets().has(this)
+			&& x >= xo(bv)
+			&& x <= xo(bv) + width() + (wide() ? tm.maxWidth() : 0)
+			&& y >= yo(bv) - ascent()
+			&& y <= yo(bv) + descent();
 }
 
 
-string const InsetText::editMessage() const
+docstring const InsetText::editMessage() const
 {
 	return _("Opened Text Inset");
 }
@@ -266,38 +237,26 @@ string const InsetText::editMessage() const
 void InsetText::edit(LCursor & cur, bool left)
 {
 	//lyxerr << "InsetText: edit left/right" << endl;
-	old_par = -1;
-	setViewCache(&cur.bv());
-	int const par = left ? 0 : paragraphs().size() - 1;
+	int const pit = left ? 0 : paragraphs().size() - 1;
 	int const pos = left ? 0 : paragraphs().back().size();
-	text_.setCursor(cur.top(), par, pos);
+	text_.setCursor(cur.top(), pit, pos);
 	cur.clearSelection();
 	finishUndo();
-#ifdef WITH_WARNINGS
-#warning can someone check if/when this is needed?
-#endif
-//Andre?
-//	updateLocal(cur);
 }
 
 
-InsetBase * InsetText::editXY(LCursor & cur, int x, int y) const
+InsetBase * InsetText::editXY(LCursor & cur, int x, int y)
 {
-	old_par = -1;
 	return text_.editXY(cur, x, y);
-	//sanitizeEmptyText(cur.bv());
-	//updateLocal(cur);
 }
 
 
-void InsetText::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetText::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-	//lyxerr << "InsetText::priv_dispatch: " << cmd.action << " " << endl;
-	setViewCache(&cur.bv());
-
-	bool was_empty = paragraphs().begin()->empty() && paragraphs().size() == 1;
+	lyxerr[Debug::ACTION] << BOOST_CURRENT_FUNCTION
+			     << " [ cmd.action = "
+			     << cmd.action << ']' << endl;
 	text_.dispatch(cur, cmd);
-
 }
 
 
@@ -308,7 +267,41 @@ bool InsetText::getStatus(LCursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetText::latex(Buffer const & buf, ostream & os,
+void InsetText::setChange(Change const & change)
+{
+	ParagraphList::iterator pit = paragraphs().begin();
+	ParagraphList::iterator end = paragraphs().end();
+	for (; pit != end; ++pit) {
+		pit->setChange(change);
+	}
+}
+
+
+void InsetText::acceptChanges()
+{
+	ParagraphList::iterator pit = paragraphs().begin();
+	ParagraphList::iterator end = paragraphs().end();
+	for (; pit != end; ++pit) {
+		// FIXME: change tracking (MG)
+		// we must handle end-of-par chars!
+		pit->acceptChanges(0, pit->size() + 1);
+	}
+}
+
+
+void InsetText::rejectChanges()
+{
+	ParagraphList::iterator pit = paragraphs().begin();
+	ParagraphList::iterator end = paragraphs().end();
+	for (; pit != end; ++pit) {
+		// FIXME: change tracking (MG)
+		// we must handle end-of-par chars!
+		pit->rejectChanges(0, pit->size() + 1);
+	}
+}
+
+
+int InsetText::latex(Buffer const & buf, odocstream & os,
 		     OutputParams const & runparams) const
 {
 	TexRow texrow;
@@ -317,29 +310,25 @@ int InsetText::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetText::plaintext(Buffer const & buf, ostream & os,
+int InsetText::plaintext(Buffer const & buf, odocstream & os,
 		     OutputParams const & runparams) const
 {
 	ParagraphList::const_iterator beg = paragraphs().begin();
 	ParagraphList::const_iterator end = paragraphs().end();
 	ParagraphList::const_iterator it = beg;
+	bool ref_printed = false;
+	odocstringstream oss;
 	for (; it != end; ++it)
-		asciiParagraph(buf, *it, os, runparams, it == beg);
-
-	// FIXME: Give the total numbers of lines
-	return 0;
-}
+		writePlaintextParagraph(buf, *it, oss, runparams, ref_printed);
 
-
-int InsetText::linuxdoc(Buffer const & buf, ostream & os,
-			OutputParams const & runparams) const
-{
-	linuxdocParagraphs(buf, paragraphs(), os, runparams);
-	return 0;
+	docstring const str = oss.str();
+	os << str;
+	// Return how many newlines we issued.
+	return int(lyx::count(str.begin(), str.end(), '\n'));
 }
 
 
-int InsetText::docbook(Buffer const & buf, ostream & os,
+int InsetText::docbook(Buffer const & buf, odocstream & os,
 		       OutputParams const & runparams) const
 {
 	docbookParagraphs(paragraphs(), buf, os, runparams);
@@ -354,10 +343,11 @@ void InsetText::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetText::getCursorPos(LCursor const & cur, int & x, int & y) const
+void InsetText::cursorPos(BufferView const & bv,
+		CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
-	x = text_.cursorX(cur.top());
-	y = text_.cursorY(cur.top());
+	x = text_.cursorX(bv, sl, boundary) + border_;
+	y = text_.cursorY(bv, sl, boundary);
 }
 
 
@@ -367,51 +357,33 @@ bool InsetText::showInsetDialog(BufferView *) const
 }
 
 
-void InsetText::getLabelList(Buffer const & buffer,
-			     std::vector<string> & list) const
-{
-	ParagraphList::const_iterator pit = paragraphs().begin();
-	ParagraphList::const_iterator pend = paragraphs().end();
-	for (; pit != pend; ++pit) {
-		InsetList::const_iterator beg = pit->insetlist.begin();
-		InsetList::const_iterator end = pit->insetlist.end();
-		for (; beg != end; ++beg)
-			beg->inset->getLabelList(buffer, list);
-	}
-}
-
-
-void InsetText::markNew(bool track_changes)
-{
-	ParagraphList::iterator pit = paragraphs().begin();
-	ParagraphList::iterator end = paragraphs().end();
-	for (; pit != end; ++pit) {
-		if (track_changes) {
-			pit->trackChanges();
-		} else {
-			// no-op when not tracking
-			pit->cleanChanges();
-		}
-	}
-}
-
-
-void InsetText::setText(string const & data, LyXFont const & font)
+void InsetText::setText(docstring const & data, LyXFont const & font, bool trackChanges)
 {
-	clear(false);
+	clear();
 	Paragraph & first = paragraphs().front();
 	for (unsigned int i = 0; i < data.length(); ++i)
-		first.insertChar(i, data[i], font);
+		first.insertChar(i, data[i], font, trackChanges);
 }
 
 
 void InsetText::setAutoBreakRows(bool flag)
 {
-	if (flag != autoBreakRows_) {
-		autoBreakRows_ = flag;
-		if (!flag)
-			removeNewlines();
-	}
+	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);
 }
 
 
@@ -433,49 +405,23 @@ void InsetText::setFrameColor(LColor_color col)
 }
 
 
-void InsetText::setViewCache(BufferView const * bv) const
-{
-	if (bv && bv != text_.bv_owner) {
-		//lyxerr << "setting view cache from "
-		//	<< text_.bv_owner << " to " << bv << "\n";
-		text_.bv_owner = const_cast<BufferView *>(bv);
-	}
-}
-
-
-void InsetText::removeNewlines()
-{
-	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))
-				it->erase(i);
-}
-
-
-LyXText * InsetText::getText(int i) const
-{
-	return (i == 0) ? const_cast<LyXText*>(&text_) : 0;
-}
-
-
 void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist)
 {
-#ifdef WITH_WARNINGS
-#warning FIXME Check if Changes stuff needs changing here. (Lgb)
-// And it probably does. You have to take a look at this John. (Lgb)
-#warning John, have a look here. (Lgb)
-#endif
+	// There is little we can do here to keep track of changes.
+	// As of 2006/10/20, appendParagraphs is used exclusively by
+	// LyXTabular::setMultiColumn. In this context, the paragraph break
+	// is lost irreversibly and the appended text doesn't really change
+
 	ParagraphList & pl = paragraphs();
-	
+
 	ParagraphList::iterator pit = plist.begin();
 	ParagraphList::iterator ins = pl.insert(pl.end(), *pit);
 	++pit;
-	mergeParagraph(buffer->params(), pl, ins - pl.begin() - 1);
+	mergeParagraph(buffer->params(), pl,
+		       std::distance(pl.begin(), ins) - 1);
 
 	for_each(pit, plist.end(),
-		 bind(&ParagraphList::push_back, ref(pl), _1));
+	         bind(&ParagraphList::push_back, ref(pl), _1));
 }
 
 
@@ -493,6 +439,15 @@ void InsetText::addPreview(PreviewLoader & loader) const
 }
 
 
+//FIXME: instead of this hack, which only works by chance,
+// cells should have their own insetcell type, which returns CELL_CODE!
+bool InsetText::neverIndent(Buffer const & buffer) const
+{
+	// this is only true for tabular cells
+	return !text_.isMainText(buffer) && lyxCode() == TEXT_CODE;
+}
+
+
 ParagraphList const & InsetText::paragraphs() const
 {
 	return text_.paragraphs();
@@ -503,3 +458,6 @@ ParagraphList & InsetText::paragraphs()
 {
 	return text_.paragraphs();
 }
+
+
+} // namespace lyx