From: Enrico Forestieri <forenr@lyx.org>
Date: Mon, 15 Oct 2007 13:48:44 +0000 (+0000)
Subject: Better safe than sorry...
X-Git-Tag: 1.6.10~7832
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=51e1520090bca4aca72c71f5be7d5ae0928543f5;p=features.git

Better safe than sorry...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20972 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 5c3b2cb63b..9bd4e6e0b5 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -597,7 +597,7 @@ bool Paragraph::Pimpl::simpleTeXBlanks(Encoding const & encoding,
 	if (style.pass_thru)
 		return false;
 
-	if (i < size() - 1) {
+	if (i + 1 < size()) {
 		char_type next = getChar(i + 1);
 		if (Encodings::isCombiningChar(next)) {
 			// This space has an accent, so we must always output it.
@@ -611,7 +611,7 @@ bool Paragraph::Pimpl::simpleTeXBlanks(Encoding const & encoding,
 	    && column > lyxrc.plaintext_linelen
 	    && i
 	    && getChar(i - 1) != ' '
-	    && (i < size() - 1)
+	    && (i + 1 < size())
 	    // same in FreeSpacing mode
 	    && !owner_->isFreeSpacing()
 	    // In typewriter mode, we want to avoid
@@ -650,7 +650,7 @@ int Paragraph::Pimpl::knownLangChars(odocstream & os,
 	docstring const latex1 = rtrim(encoding.latexChar(c), "}");
 	int length = latex1.length();
 	os << latex1;
-	while (i < size() - 1) {
+	while (i + 1 < size()) {
 		char_type next = getChar(i + 1);
 		// Stop here if next character belongs to another
 		// language or there is a change tracking status.
@@ -1011,7 +1011,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
 
 			if (pnr == phrases_nr && c != '\0') {
 				Encoding const & encoding = *(runparams.encoding);
-				if (i < size() - 1) {
+				if (i + 1 < size()) {
 					char_type next = getChar(i + 1);
 					if (Encodings::isCombiningChar(next)) {
 						column += latexSurrogatePair(os, c, next, encoding) - 1;