X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=d3a122660da0636278e2972f3d3b387edcf243df;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=25f58d55dd89a1915e6a6592b12da989f90f8d7e;hpb=430d03811e15c5f78e3c7110a95683a4e24d37fc;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index 25f58d55dd..d3a122660d 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -46,7 +46,6 @@
 #include "ParIterator.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
-#include "VSpace.h"
 #include "WordLangTuple.h"
 #include "WordList.h"
 
@@ -71,6 +70,31 @@
 
 #include <sstream>
 
+
+// TODO: replace if in Text::readParToken() with compile time switch
+#if 0
+
+#include "support/metahash.h"
+
+typedef boost::mpl::string<'\\end','_lay','out'> end_layout;
+typedef boost::mpl::string<'\\end','in','set'>   end_inset;
+
+void foo()
+{
+	std::string token = "\\end_layout";
+
+	switch (boost::hash_value(token)) {
+		case lyx::support::hash_string<end_layout>::value:
+			return;
+		case lyx::support::hash_string<end_inset>::value:
+			return;
+		default: ;
+	};
+
+}
+#endif
+
+
 using namespace std;
 using namespace lyx::support;
 
@@ -317,6 +341,7 @@ InsetText const & Text::inset() const
 }
 
 
+
 void Text::readParToken(Paragraph & par, Lexer & lex,
 	string const & token, Font & font, Change & change, ErrorList & errorList)
 {
@@ -356,7 +381,13 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 		// of this document. For example, when you apply class article to a beamer document,
 		// all unknown layouts such as frame will be added to document class article so that
 		// these layouts can keep their original names.
-		tclass.addLayoutIfNeeded(layoutname);
+		bool const added_one = tclass.addLayoutIfNeeded(layoutname);
+		if (added_one) {
+			// Warn the user.
+			docstring const s = bformat(_("Layout `%1$s' was not found."), layoutname);
+			errorList.push_back(
+				ErrorItem(_("Layout Not Found"), s, par.id(), 0, par.size()));
+		}
 
 		par.setLayout(bp.documentClass()[layoutname]);
 
@@ -749,12 +780,12 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 
 
 // needed to insert the selection
-void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
+void Text::insertStringAsLines(Cursor & cur, docstring const & str,
 		Font const & font)
 {
 	BufferParams const & bparams = owner_->buffer().params();
-	pit_type pit = dit.pit();
-	pos_type pos = dit.pos();
+	pit_type pit = cur.pit();
+	pos_type pos = cur.pos();
 
 	// insert the string, don't insert doublespace
 	bool space_inserted = true;
@@ -796,12 +827,13 @@ void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
 			space_inserted = (*cit == ' ');
 		}
 	}
+	setCursor(cur, pit, pos);
 }
 
 
 // turn double CR to single CR, others are converted into one
 // blank. Then insertStringAsLines is called
-void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & str,
+void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str,
 		Font const & font)
 {
 	docstring linestr = str;
@@ -823,7 +855,7 @@ void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & s
 			newline_inserted = false;
 		}
 	}
-	insertStringAsLines(dit, linestr, font);
+	insertStringAsLines(cur, linestr, font);
 }
 
 
@@ -1243,7 +1275,11 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 
 		pos_type left  = (pit == begPit ? begPos : 0);
 		pos_type right = (pit == endPit ? endPos : parSize);
-
+		
+		if (left == right)
+			// there is no change here
+			continue;
+		
 		if (op == ACCEPT) {
 			pars_[pit].acceptChanges(left, right);
 		} else {
@@ -1641,7 +1677,17 @@ bool Text::dissolveInset(Cursor & cur)
 	spit += cur.pit();
 	Buffer & b = *cur.buffer();
 	cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+
 	if (!plist.empty()) {
+		// see bug 7319
+		// we clear the cache so that we won't get conflicts with labels
+		// that get pasted into the buffer. we should update this before
+		// its being empty matters. if not (i.e., if we encounter bugs),
+		// then this should instead be:
+		//	  cur.buffer().updateBuffer();
+		// but we'll try the cheaper solution here.
+		cur.buffer()->clearReferenceCache();
+
 		// ERT paragraphs have the Language latex_language.
 		// This is invalid outside of ERT, so we need to
 		// change it to the buffer language.
@@ -1655,8 +1701,9 @@ bool Text::dissolveInset(Cursor & cur)
 		// restore position
 		cur.pit() = min(cur.lastpit(), spit);
 		cur.pos() = min(cur.lastpos(), spos);
-	} else
-		cur.forceBufferUpdate();
+	}
+
+	cur.forceBufferUpdate();
 
 	// Ensure the current language is set correctly (bug 6292)
 	cur.text()->setCursor(cur, cur.pit(), cur.pos());
@@ -1897,8 +1944,6 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
 	}
 
 	if (!name.empty())
-		// FIXME refstyle
-		// We should allow customization of the separator or else change it
 		text = name + ':' + text;
 
 	return text;
@@ -1923,6 +1968,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)
 {