X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=6c899a95e8f7f65d86210de687f785cd7dfa85ce;hb=e2982037d9f981a6070c3cf90148bde33edbfdc9;hp=9b38e9b15e11598ba98f29a102fa5cfb95ce9a0f;hpb=cd15ffd9a9a97f0d57a153fe8013fec49f20b85d;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index 9b38e9b15e..6c899a95e8 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -53,10 +53,9 @@
 #include "insets/InsetText.h"
 #include "insets/InsetBibitem.h"
 #include "insets/InsetCaption.h"
-#include "insets/InsetLine.h"
 #include "insets/InsetNewline.h"
 #include "insets/InsetNewpage.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetSpecialChar.h"
 #include "insets/InsetTabular.h"
@@ -171,6 +170,31 @@ void mergeParagraph(BufferParams const & bparams,
 }
 
 
+Text::Text(InsetText * owner, bool use_default_layout)
+	: owner_(owner), autoBreakRows_(false), undo_counter_(0)
+{
+	pars_.push_back(Paragraph());
+	Paragraph & par = pars_.back();
+	par.setInsetOwner(owner);
+	DocumentClass const & dc = owner->buffer().params().documentClass();
+	if (use_default_layout)
+		par.setDefaultLayout(dc);
+	else
+		par.setPlainLayout(dc);
+}
+
+
+Text::Text(InsetText * owner, Text const & text)
+	: owner_(owner), autoBreakRows_(text.autoBreakRows_), undo_counter_(0)
+{
+	pars_ = text.pars_;
+	ParagraphList::iterator const end = pars_.end();
+	ParagraphList::iterator it = pars_.begin();
+	for (; it != end; ++it)
+		it->setInsetOwner(owner);
+}
+
+
 pit_type Text::depthHook(pit_type pit, depth_type depth) const
 {
 	pit_type newpit = pit;
@@ -234,37 +258,59 @@ Font const Text::outerFont(pit_type par_offset) const
 }
 
 
-void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+static void acceptOrRejectChanges(ParagraphList & pars,
+	BufferParams const & bparams, Text::ChangeOp op)
 {
 	pit_type pars_size = static_cast<pit_type>(pars.size());
 
-	// first, accept changes within each individual paragraph
-	// (do not consider end-of-par)
+	// first, accept or reject changes within each individual
+	// paragraph (do not consider end-of-par)
 	for (pit_type pit = 0; pit < pars_size; ++pit) {
-		if (!pars[pit].empty())   // prevent assertion failure
-			pars[pit].acceptChanges(0, pars[pit].size());
+		// prevent assertion failure
+		if (!pars[pit].empty()) {
+			if (op == Text::ACCEPT)
+				pars[pit].acceptChanges(0, pars[pit].size());
+			else
+				pars[pit].rejectChanges(0, pars[pit].size());
+		}
 	}
 
-	// next, accept imaginary end-of-par characters
+	// next, accept or reject imaginary end-of-par characters
 	for (pit_type pit = 0; pit < pars_size; ++pit) {
 		pos_type pos = pars[pit].size();
-
-		if (pars[pit].isInserted(pos)) {
-			pars[pit].setChange(pos, Change(Change::UNCHANGED));
-		} else if (pars[pit].isDeleted(pos)) {
-			if (pit == pars_size - 1) {
-				// we cannot remove a par break at the end of the last
-				// paragraph; instead, we mark it unchanged
+		if (pars[pit].isChanged(pos)) {
+			// keep the end-of-par char if it is inserted and accepted
+			// or when it is deleted and rejected.
+			if (pars[pit].isInserted(pos) == (op == Text::ACCEPT)) {
 				pars[pit].setChange(pos, Change(Change::UNCHANGED));
 			} else {
-				mergeParagraph(bparams, pars, pit);
-				--pit;
-				--pars_size;
+				if (pit == pars_size - 1) {
+					// we cannot remove a par break at the end of the last
+					// paragraph; instead, we mark it unchanged
+					pars[pit].setChange(pos, Change(Change::UNCHANGED));
+				} else {
+					mergeParagraph(bparams, pars, pit);
+					--pit;
+					--pars_size;
+				}
 			}
 		}
 	}
 }
 
+
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+	acceptOrRejectChanges(pars, bparams, Text::ACCEPT);
+}
+
+
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+	acceptOrRejectChanges(pars, bparams, Text::REJECT);
+}
+
+
 InsetText const & Text::inset() const
 {
 	return *owner_;
@@ -274,8 +320,8 @@ InsetText const & Text::inset() const
 void Text::readParToken(Paragraph & par, Lexer & lex,
 	string const & token, Font & font, Change & change, ErrorList & errorList)
 {
-	Buffer const & buf = owner_->buffer();
-	BufferParams const & bp = buf.params();
+	Buffer * buf = const_cast<Buffer *>(&owner_->buffer());
+	BufferParams const & bp = buf->params();
 
 	if (token[0] != '\\') {
 		docstring dstr = lex.getDocString();
@@ -397,28 +443,23 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 		auto_ptr<Inset> inset;
 		inset.reset(new InsetSpecialChar);
 		inset->read(lex);
-		inset->setBuffer(const_cast<Buffer &>(buf));
+		inset->setBuffer(*buf);
 		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\backslash") {
 		par.appendChar('\\', font, change);
 	} else if (token == "\\LyXTable") {
-		auto_ptr<Inset> inset(new InsetTabular(const_cast<Buffer &>(buf)));
+		auto_ptr<Inset> inset(new InsetTabular(buf));
 		inset->read(lex);
 		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\lyxline") {
-		auto_ptr<Inset> inset;
-		inset.reset(new InsetLine);
-		inset->setBuffer(const_cast<Buffer &>(buf));
-		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\change_unchanged") {
 		change = Change(Change::UNCHANGED);
 	} else if (token == "\\change_inserted" || token == "\\change_deleted") {
 		lex.eatLine();
 		istringstream is(lex.getString());
-		unsigned int aid;
+		int aid;
 		time_t ct;
 		is >> aid >> ct;
-		map<unsigned int, int> const & am = bp.author_map;
+		BufferParams::AuthorMap const & am = bp.author_map;
 		if (am.find(aid) == am.end()) {
 			errorList.push_back(ErrorItem(_("Change tracking error"),
 					    bformat(_("Unknown author index for change: %1$d\n"), aid),
@@ -478,6 +519,9 @@ void Text::readParagraph(Paragraph & par, Lexer & lex,
 
 	// Initialize begin_of_body_ on load; redoParagraph maintains
 	par.setBeginOfBody();
+	
+	// mark paragraph for spell checking on load
+	// par.requestSpellCheck();
 }
 
 
@@ -485,8 +529,8 @@ class TextCompletionList : public CompletionList
 {
 public:
 	///
-	TextCompletionList(Cursor const & cur)
-		: buffer_(cur.buffer()), pos_(0)
+	TextCompletionList(Cursor const & cur, WordList const * list)
+		: buffer_(cur.buffer()), pos_(0), list_(list)
 	{}
 	///
 	virtual ~TextCompletionList() {}
@@ -496,12 +540,12 @@ public:
 	///
 	virtual size_t size() const
 	{
-		return theWordList().size();
+		return list_->size();
 	}
 	///
 	virtual docstring const & data(size_t idx) const
 	{
-		return theWordList().word(idx);
+		return list_->word(idx);
 	}
 	
 private:
@@ -509,6 +553,8 @@ private:
 	Buffer const * buffer_;
 	///
 	size_t pos_;
+	///
+	WordList const * list_;
 };
 
 
@@ -553,7 +599,6 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
 	// end of a paragraph
 	tmp->setPlainOrDefaultLayout(bparams.documentClass());
 
-	// layout stays the same with latex-environments
 	if (keep_layout) {
 		tmp->setLayout(par.layout());
 		tmp->setLabelWidthString(par.params().labelWidthString());
@@ -619,7 +664,6 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
 		par.setPlainOrDefaultLayout(bparams.documentClass());
 	}
 
-	// layout stays the same with latex-environments
 	if (keep_layout) {
 		par.setLayout(tmp->layout());
 		par.setLabelWidthString(tmp->params().labelWidthString());
@@ -638,11 +682,13 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 	DocumentClass const & tclass = cur.buffer()->params().documentClass();
 	Layout const & layout = cpar.layout();
 
-	// this is only allowed, if the current paragraph is not empty
-	// or caption and if it has not the keepempty flag active
-	if (cur.lastpos() == 0 && !cpar.allowEmpty() &&
-	    layout.labeltype != LABEL_SENSITIVE)
+	if (cur.lastpos() == 0 && !cpar.allowEmpty()) {
+		if (changeDepthAllowed(cur, DEC_DEPTH))
+			changeDepth(cur, DEC_DEPTH);
+		else 
+			setLayout(cur, tclass.defaultLayoutName());
 		return;
+	}
 
 	// a layout change may affect also the following paragraph
 	recUndo(cur, cur.pit(), undoSpan(cur.pit()) - 1);
@@ -653,9 +699,10 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 		cpar.eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
 
 	// What should the layout for the new paragraph be?
-	bool keep_layout = inverse_logic ? 
-		!layout.isEnvironment() 
-		: layout.isEnvironment();
+	bool keep_layout = layout.isEnvironment() 
+		|| (layout.isParagraph() && layout.parbreak_is_newline);
+	if (inverse_logic)
+		keep_layout = !keep_layout;
 
 	// We need to remember this before we break the paragraph, because
 	// that invalidates the layout variable
@@ -688,10 +735,9 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 			break; // the character couldn't be deleted physically due to change tracking
 	}
 
-	cur.buffer()->updateLabels();
-
 	// A singlePar update is not enough in this case.
-	cur.updateFlags(Update::Force);
+	cur.screenUpdateFlags(Update::Force);
+	cur.forceBufferUpdate();
 
 	// This check is necessary. Otherwise the new empty paragraph will
 	// be deleted automatically. And it is more friendly for the user!
@@ -804,7 +850,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 		static docstring const number_seperators = from_ascii(".,:");
 
 		if (cur.current_font.fontInfo().number() == FONT_ON) {
-			if (!isDigit(c) && !contains(number_operators, c) &&
+			if (!isDigitASCII(c) && !contains(number_operators, c) &&
 			    !(contains(number_seperators, c) &&
 			      cur.pos() != 0 &&
 			      cur.pos() != cur.lastpos() &&
@@ -812,7 +858,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 			      tm.displayFont(pit, cur.pos() - 1).fontInfo().number() == FONT_ON)
 			   )
 				number(cur); // Set current_font.number to OFF
-		} else if (isDigit(c) &&
+		} else if (isDigitASCII(c) &&
 			   cur.real_current_font.isVisibleRightToLeft()) {
 			number(cur); // Set current_font.number to ON
 
@@ -889,23 +935,17 @@ void Text::insertChar(Cursor & cur, char_type c)
 	// disable the double-space checking
 	if (!freeSpacing && isLineSeparatorChar(c)) {
 		if (cur.pos() == 0) {
-			static bool sent_space_message = false;
-			if (!sent_space_message) {
-				cur.message(_("You cannot insert a space at the "
-							   "beginning of a paragraph. Please read the Tutorial."));
-				sent_space_message = true;
-			}
+			cur.message(_(
+					"You cannot insert a space at the "
+					"beginning of a paragraph. Please read the Tutorial."));
 			return;
 		}
 		LASSERT(cur.pos() > 0, /**/);
 		if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
-		    && !par.isDeleted(cur.pos() - 1)) {
-			static bool sent_space_message = false;
-			if (!sent_space_message) {
-				cur.message(_("You cannot type two spaces this way. "
-							   "Please read the Tutorial."));
-				sent_space_message = true;
-			}
+				&& !par.isDeleted(cur.pos() - 1)) {
+			cur.message(_(
+					"You cannot type two spaces this way. "
+					"Please read the Tutorial."));
 			return;
 		}
 	}
@@ -914,7 +954,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 		cur.buffer()->params().trackChanges);
 	cur.checkBufferStructure();
 
-//		cur.updateFlags(Update::Force);
+//		cur.screenUpdateFlags(Update::Force);
 	bool boundary = cur.boundary()
 		|| tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
 	setCursor(cur, cur.pit(), cur.pos() + 1, false, boundary);
@@ -1123,9 +1163,11 @@ void Text::selectWord(Cursor & cur, word_location loc)
 		setCursor(cur, from.pit(), from.pos());
 	if (to == from)
 		return;
-	cur.resetAnchor();
+	if (!cur.selection())
+		cur.resetAnchor();
 	setCursor(cur, to.pit(), to.pos());
 	cur.setSelection();
+	cur.setWordSelection(true);
 }
 
 
@@ -1262,8 +1304,8 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 	cur.finishUndo();
 	cur.clearSelection();
 	setCursorIntern(cur, begPit, begPos);
-	cur.updateFlags(Update::Force);
-	cur.buffer()->updateLabels();
+	cur.screenUpdateFlags(Update::Force);
+	cur.forceBufferUpdate();
 }
 
 
@@ -1414,9 +1456,9 @@ bool Text::handleBibitems(Cursor & cur)
 		cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
 		mergeParagraph(bufparams, cur.text()->paragraphs(),
 							prevcur.pit());
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		setCursorIntern(cur, prevcur.pit(), prevcur.pos());
-		cur.updateFlags(Update::Force);
+		cur.screenUpdateFlags(Update::Force);
 		return true;
 	} 
 
@@ -1442,7 +1484,7 @@ bool Text::erase(Cursor & cur)
 			cur.top().forwardPos();
 
 		if (was_inset)
-			cur.buffer()->updateLabels();
+			cur.forceBufferUpdate();
 		else
 			cur.checkBufferStructure();
 		needsUpdate = true;
@@ -1518,7 +1560,7 @@ bool Text::backspacePos0(Cursor & cur)
 	}
 
 	if (needsUpdate) {
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		setCursorIntern(cur, prevcur.pit(), prevcur.pos());
 	}
 
@@ -1558,7 +1600,7 @@ bool Text::backspace(Cursor & cur)
 		bool const was_inset = cur.paragraph().isInset(cur.pos());
 		cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
 		if (was_inset)
-			cur.buffer()->updateLabels();
+			cur.forceBufferUpdate();
 		else
 			cur.checkBufferStructure();
 	}
@@ -1569,7 +1611,7 @@ bool Text::backspace(Cursor & cur)
 	needsUpdate |= handleBibitems(cur);
 
 	// A singlePar update is not enough in this case.
-//		cur.updateFlags(Update::Force);
+//		cur.screenUpdateFlags(Update::Force);
 	setCursor(cur.top(), cur.pit(), cur.pos());
 
 	return needsUpdate;
@@ -1614,9 +1656,7 @@ bool Text::dissolveInset(Cursor & cur)
 		cur.pit() = min(cur.lastpit(), spit);
 		cur.pos() = min(cur.lastpos(), spos);
 	} else
-		// this is the least that needs to be done (bug 6003)
-		// in the above case, pasteParagraphList handles this
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 
 	// Ensure the current language is set correctly (bug 6292)
 	cur.text()->setCursor(cur, cur.pit(), cur.pos());
@@ -1803,10 +1843,11 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
 
 	docstring text;
 	docstring par_text = pars_[pit].asString();
-	string piece;
-	// the return string of math matrices might contain linebreaks
+
+	// The return string of math matrices might contain linebreaks
 	par_text = subst(par_text, '\n', '-');
-	for (int i = 0; i < lyxrc.label_init_length; ++i) {
+	int const numwords = 3;
+	for (int i = 0; i < numwords; ++i) {
 		if (par_text.empty())
 			break;
 		docstring head;
@@ -1816,12 +1857,13 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
 			text += '-';
 		text += head;
 	}
+	
+	// Make sure it isn't too long
+	unsigned int const max_label_length = 32;
+	if (text.size() > max_label_length)
+		text.resize(max_label_length);
 
-	// No need for a prefix if the user said so.
-	if (lyxrc.label_init_length <= 0)
-		return text;
-
-	// Will contain the label type.
+	// Will contain the label prefix.
 	docstring name;
 
 	// For section, subsection, etc...
@@ -1833,40 +1875,29 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
 		}
 	}
 	if (layout->latextype != LATEX_PARAGRAPH)
-		name = from_ascii(layout->latexname());
+		name = layout->refprefix;
 
-	// for captions, we just take the caption type
+	// For captions, we just take the caption type
 	Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
-	if (caption_inset)
-		name = from_ascii(static_cast<InsetCaption *>(caption_inset)->type());
-
-	// If none of the above worked, we'll see if we're inside various
-	// types of insets and take our abbreviation from them.
-	if (name.empty()) {
-		InsetCode const codes[] = {
-			FLOAT_CODE,
-			WRAP_CODE,
-			FOOT_CODE
-		};
-		for (unsigned int i = 0; i < (sizeof codes / sizeof codes[0]); ++i) {
-			Inset * float_inset = cur.innerInsetOfType(codes[i]);
-			if (float_inset) {
-				name = float_inset->name();
-				break;
-			}
+	if (caption_inset) {
+		string const & ftype = static_cast<InsetCaption *>(caption_inset)->type();
+		FloatList const & fl = cur.buffer()->params().documentClass().floats();
+		if (fl.typeExist(ftype)) {
+			Floating const & flt = fl.getType(ftype);
+			name = from_utf8(flt.refPrefix());
 		}
+		if (name.empty())
+			name = from_utf8(ftype.substr(0,3));
 	}
 
-	// Create a correct prefix for prettyref
-	if (name == "theorem")
-		name = from_ascii("thm");
-	else if (name == "Foot")
-		name = from_ascii("fn");
-	else if (name == "listing")
-		name = from_ascii("lst");
+	// If none of the above worked, see if the inset knows.
+	if (name.empty()) {
+		InsetLayout const & il = cur.inset().getLayout();
+		name = il.refprefix();
+	}
 
 	if (!name.empty())
-		text = name.substr(0, 3) + ':' + text;
+		text = name + ':' + text;
 
 	return text;
 }
@@ -1890,6 +1921,15 @@ docstring Text::asString(pit_type beg, pit_type end, int options) const
 }
 
 
+void Text::forToc(docstring & os, size_t maxlen, bool shorten) const
+{
+	LASSERT(maxlen > 10, maxlen = 30);
+	for (size_t i = 0; i != pars_.size() && os.length() < maxlen; ++i)
+		pars_[i].forToc(os, maxlen);
+	if (shorten && os.length() >= maxlen)
+		os = os.substr(0, maxlen - 3) + from_ascii("...");
+}
+
 
 void Text::charsTranspose(Cursor & cur)
 {
@@ -1986,7 +2026,8 @@ bool Text::completionSupported(Cursor const & cur) const
 
 CompletionList const * Text::createCompletionList(Cursor const & cur) const
 {
-	return new TextCompletionList(cur);
+	WordList const * list = theWordList(*cur.getFont().language());
+	return new TextCompletionList(cur, list);
 }
 
 
@@ -1995,8 +2036,8 @@ bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/
 	LASSERT(cur.bv().cursor() == cur, /**/);
 	cur.insert(s);
 	cur.bv().cursor() = cur;
-	if (!(cur.disp_.update() & Update::Force))
-		cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+	if (!(cur.result().screenUpdate() & Update::Force))
+		cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
 	return true;
 }