X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=ae82050fce1c5ca7b00cc83a1bf6b98ee3090ce0;hb=da03e5b1c4a21edf63a2ba73397cb46b59123f4b;hp=ed2f3fd0bac72effaee670e743a8597f014cc4b2;hpb=df0801cf65356c537ebd9fe7e1c8d070a55c6bfb;p=lyx.git

diff --git a/src/Text2.cpp b/src/Text2.cpp
index ed2f3fd0ba..ae82050fce 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -33,14 +33,12 @@
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
-#include "FuncRequest.h"
 #include "Language.h"
 #include "Layout.h"
 #include "Lexer.h"
-#include "LyXFunc.h"
+#include "LyX.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
-#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
@@ -63,19 +61,14 @@ using namespace std;
 
 namespace lyx {
 
-Text::Text()
-	: autoBreakRows_(false)
-{}
-
-
-bool Text::isMainText(Buffer const & buffer) const
+bool Text::isMainText() const
 {
-	return &buffer.text() == this;
+	return &owner_->buffer().text() == this;
 }
 
 
 // Note that this is supposed to return a fully realized font.
-FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
+FontInfo Text::layoutFont(pit_type const pit) const
 {
 	Layout const & layout = pars_[pit].layout();
 
@@ -83,14 +76,14 @@ FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
 		FontInfo lf = layout.resfont;
 		// In case the default family has been customized
 		if (layout.font.family() == INHERIT_FAMILY)
-			lf.setFamily(buffer.params().getFont().fontInfo().family());
+			lf.setFamily(owner_->buffer().params().getFont().fontInfo().family());
 		// FIXME
 		// It ought to be possible here just to use Inset::getLayout() and skip
 		// the asInsetCollapsable() bit. Unfortunatley, that doesn't work right
 		// now, because Inset::getLayout() will return a default-constructed
 		// InsetLayout, and that e.g. sets the foreground color to red. So we
 		// need to do some work to make that possible.
-		InsetCollapsable const * icp = pars_[pit].inInset().asInsetCollapsable();
+		InsetCollapsable const * icp = owner_->asInsetCollapsable();
 		if (!icp)
 			return lf;
 		FontInfo icf = icp->getLayout().font();
@@ -100,16 +93,17 @@ FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
 
 	FontInfo font = layout.font;
 	// Realize with the fonts of lesser depth.
-	//font.realize(outerFont(pit, paragraphs()));
-	font.realize(buffer.params().getFont().fontInfo());
+	//font.realize(outerFont(pit));
+	font.realize(owner_->buffer().params().getFont().fontInfo());
 
 	return font;
 }
 
 
 // Note that this is supposed to return a fully realized font.
-FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const
+FontInfo Text::labelFont(Paragraph const & par) const
 {
+	Buffer const & buffer = owner_->buffer();
 	Layout const & layout = par.layout();
 
 	if (!par.getDepth()) {
@@ -128,9 +122,10 @@ FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const
 }
 
 
-void Text::setCharFont(Buffer const & buffer, pit_type pit,
+void Text::setCharFont(pit_type pit,
 		pos_type pos, Font const & fnt, Font const & display_font)
 {
+	Buffer const & buffer = owner_->buffer();
 	Font font = fnt;
 	Layout const & layout = pars_[pit].layout();
 
@@ -148,7 +143,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
 		while (!layoutfont.resolved() &&
 		       tp != pit_type(paragraphs().size()) &&
 		       pars_[tp].getDepth()) {
-			tp = outerHook(tp, paragraphs());
+			tp = outerHook(tp);
 			if (tp != pit_type(paragraphs().size()))
 				layoutfont.realize(pars_[tp].layout().font);
 		}
@@ -156,7 +151,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
 
 	// Inside inset, apply the inset's font attributes if any
 	// (charstyle!)
-	if (!isMainText(buffer))
+	if (!isMainText())
 		layoutfont.realize(display_font.fontInfo());
 
 	layoutfont.realize(buffer.params().getFont().fontInfo());
@@ -172,7 +167,7 @@ void Text::setInsetFont(BufferView const & bv, pit_type pit,
 		pos_type pos, Font const & font, bool toggleall)
 {
 	Inset * const inset = pars_[pit].getInset(pos);
-	LASSERT(inset && inset->noFontChange(), /**/);
+	LASSERT(inset && inset->resetFontEdit(), /**/);
 
 	CursorSlice::idx_type endidx = inset->nargs();
 	for (CursorSlice cs(*inset); cs.idx() != endidx; ++cs.idx()) {
@@ -207,11 +202,12 @@ pit_type Text::undoSpan(pit_type pit)
 }
 
 
-void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end,
+void Text::setLayout(pit_type start, pit_type end,
 		     docstring const & layout)
 {
 	LASSERT(start != end, /**/);
 
+	Buffer const & buffer = owner_->buffer();
 	BufferParams const & bp = buffer.params();
 	Layout const & lyxlayout = bp.documentClass()[layout];
 
@@ -233,8 +229,8 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
 	pit_type end = cur.selEnd().pit() + 1;
 	pit_type undopit = undoSpan(end - 1);
 	recUndo(cur, start, undopit - 1);
-	setLayout(*cur.buffer(), start, end, layout);
-	cur.buffer()->updateLabels();
+	setLayout(start, end, layout);
+	cur.forceBufferUpdate();
 }
 
 
@@ -293,7 +289,7 @@ void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type)
 	}
 	// this handles the counter labels, and also fixes up
 	// depth values for follow-on (child) paragraphs
-	cur.buffer()->updateLabels();
+	cur.forceBufferUpdate();
 }
 
 
@@ -305,9 +301,9 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 	FontInfo layoutfont;
 	pit_type pit = cur.pit();
 	if (cur.pos() < pars_[pit].beginOfBody())
-		layoutfont = labelFont(*cur.buffer(), pars_[pit]);
+		layoutfont = labelFont(pars_[pit]);
 	else
-		layoutfont = layoutFont(*cur.buffer(), pit);
+		layoutfont = layoutFont(pit);
 
 	// Update current font
 	cur.real_current_font.update(font,
@@ -349,17 +345,18 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin,
 		pit_type const pit = dit.pit();
 		pos_type const pos = dit.pos();
 		Inset * inset = pars_[pit].getInset(pos);
-		if (inset && inset->noFontChange()) {
+		if (inset && inset->resetFontEdit()) {
 			// We need to propagate the font change to all
-			// text cells of the inset (bug 1973).
-			// FIXME: This should change, see documentation
-			// of noFontChange in Inset.h
+			// text cells of the inset (bugs 1973, 6919).
 			setInsetFont(bv, pit, pos, font, toggleall);
 		}
 		TextMetrics const & tm = bv.textMetrics(this);
 		Font f = tm.displayFont(pit, pos);
 		f.update(font, language, toggleall);
-		setCharFont(buffer, pit, pos, f, tm.font_);
+		setCharFont(pit, pos, f, tm.font_);
+		// font change may change language... 
+		// spell checker has to know that
+		pars_[pit].requestSpellCheck(pos);
 	}
 }
 
@@ -434,6 +431,32 @@ docstring Text::getStringToIndex(Cursor const & cur)
 }
 
 
+void Text::setLabelWidthStringToSequence(pit_type const par_offset,
+		docstring const & s)
+{
+	pit_type offset = par_offset;
+	// Find first of same layout in sequence
+	while (!isFirstInSequence(offset)) {
+		offset = depthHook(offset, pars_[offset].getDepth());
+	}
+
+	// now apply label width string to every par
+	// in sequence
+	pit_type const end = pars_.size();
+	depth_type const depth = pars_[offset].getDepth();
+	Layout const & layout = pars_[offset].layout();
+	for (pit_type pit = offset; pit != end; ++pit) {
+		while (pars_[pit].getDepth() > depth)
+			++pit;
+		if (pars_[pit].getDepth() < depth)
+			return;
+		if (pars_[pit].layout() != layout)
+			return;
+		pars_[pit].setLabelWidthString(s);
+	}
+}
+
+
 void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) 
 {
 	LASSERT(cur.text(), /**/);
@@ -455,8 +478,7 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
 		// Do this only once for a selected range of paragraphs
 		// of the same layout and depth.
 		if (par.getDepth() != priordepth || par.layout() != priorlayout)
-			setLabelWidthStringToSequence(pit, pars_,
-					params.labelWidthString());
+			setLabelWidthStringToSequence(pit, params.labelWidthString());
 		par.params().apply(params, par.layout());
 		priordepth = par.getDepth();
 		priorlayout = par.layout();
@@ -484,8 +506,8 @@ void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p)
 		// Do this only once for a selected range of paragraphs
 		// of the same layout and depth.
 		if (par.getDepth() != priordepth || par.layout() != priorlayout)
-			setLabelWidthStringToSequence(pit, pars_,
-					par.params().labelWidthString());
+			setLabelWidthStringToSequence(pit,
+				par.params().labelWidthString());
 		par.params().apply(p, par.layout());
 		priordepth = par.getDepth();
 		priorlayout = par.layout();
@@ -504,41 +526,6 @@ void Text::insertInset(Cursor & cur, Inset * inset)
 }
 
 
-// needed to insert the selection
-void Text::insertStringAsLines(Cursor & cur, docstring const & str)
-{
-	cur.buffer()->insertStringAsLines(pars_, cur.pit(), cur.pos(),
-		cur.current_font, str, autoBreakRows_);
-}
-
-
-// turn double CR to single CR, others are converted into one
-// blank. Then insertStringAsLines is called
-void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str)
-{
-	docstring linestr = str;
-	bool newline_inserted = false;
-
-	for (string::size_type i = 0, siz = linestr.size(); i < siz; ++i) {
-		if (linestr[i] == '\n') {
-			if (newline_inserted) {
-				// we know that \r will be ignored by
-				// insertStringAsLines. Of course, it is a dirty
-				// trick, but it works...
-				linestr[i - 1] = '\r';
-				linestr[i] = '\n';
-			} else {
-				linestr[i] = ' ';
-				newline_inserted = true;
-			}
-		} else if (isPrintable(linestr[i])) {
-			newline_inserted = false;
-		}
-	}
-	insertStringAsLines(cur, linestr);
-}
-
-
 bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos,
 			bool setfont, bool boundary)
 {
@@ -561,12 +548,12 @@ void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos)
 
 	// None of these should happen, but we're scaredy-cats
 	if (pos < 0) {
-		lyxerr << "dont like -1" << endl;
+		lyxerr << "don't like -1" << endl;
 		LASSERT(false, /**/);
 	}
 
 	if (pos > para.size()) {
-		lyxerr << "dont like 1, pos: " << pos
+		lyxerr << "don't like 1, pos: " << pos
 		       << " size: " << para.size()
 		       << " par: " << par << endl;
 		LASSERT(false, /**/);
@@ -631,7 +618,7 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool mo
 bool Text::cursorBackward(Cursor & cur)
 {
 	// Tell BufferView to test for FitCursor in any case!
-	cur.updateFlags(Update::FitCursor);
+	cur.screenUpdateFlags(Update::FitCursor);
 
 	// not at paragraph start?
 	if (cur.pos() > 0) {
@@ -699,7 +686,7 @@ bool Text::cursorVisRight(Cursor & cur, bool skip_inset)
 bool Text::cursorForward(Cursor & cur)
 {
 	// Tell BufferView to test for FitCursor in any case!
-	cur.updateFlags(Update::FitCursor);
+	cur.screenUpdateFlags(Update::FitCursor);
 
 	// not at paragraph end?
 	if (cur.pos() != cur.lastpos()) {
@@ -930,8 +917,9 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra
 			}
 		}
 
-		// don't delete anything if this is the only remaining paragraph within the given range
-		// note: Text::acceptOrRejectChanges() sets the cursor to 'first' after calling DEPM
+		// don't delete anything if this is the only remaining paragraph
+		// within the given range. Note: Text::acceptOrRejectChanges()
+		// sets the cursor to 'first' after calling DEPM
 		if (first == last)
 			continue;