X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=e7b2c78564a446497cddfb1d140eeda11d0eff2a;hb=449c766e03d94ddf6c823cfcae845f76f83c0e1c;hp=dcfadc8c2834629b89d545d89eca6adaa6b87b68;hpb=2896fe1bd09da000401718d45fbdf34dd1a6e68f;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index dcfadc8c28..e7b2c78564 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -96,7 +96,7 @@ public:
 	///
 	void result(SpellChecker::Result r) { result_ = r; }
 	///
-	bool inside(pos_type pos) const { return range_.inside(pos); }
+	bool contains(pos_type pos) const { return range_.contains(pos); }
 	///
 	bool covered(FontSpan const & r) const
 	{
@@ -104,8 +104,9 @@ public:
 		// 2. last of new range inside current range or
 		// 3. first of current range inside new range or
 		// 4. last of current range inside new range
-		return range_.inside(r.first) || range_.inside(r.last) ||
-			r.inside(range_.first) || r.inside(range_.last);
+		//FIXME: is this the same as !range_.intersect(r).empty() ?
+		return range_.contains(r.first) || range_.contains(r.last) ||
+			r.contains(range_.first) || r.contains(range_.last);
 	}
 	///
 	void shift(pos_type pos, int offset)
@@ -191,7 +192,7 @@ public:
 		RangesIterator et = ranges_.end();
 		RangesIterator it = ranges_.begin();
 		for (; it != et; ++it) {
-			if(it->inside(pos)) {
+			if(it->contains(pos)) {
 				return it->result();
 			}
 		}
@@ -205,7 +206,7 @@ public:
 		RangesIterator et = ranges_.end();
 		RangesIterator it = ranges_.begin();
 		for (; it != et; ++it) {
-			if(it->inside(pos)) {
+			if(it->contains(pos)) {
 				return it->range();
 			}
 		}
@@ -281,6 +282,10 @@ private:
 
 class Paragraph::Private
 {
+	// Enforce our own "copy" constructor by declaring the standard one and
+	// the assignment operator private without implementing them.
+	Private(Private const &);
+	Private & operator=(Private const &);
 public:
 	///
 	Private(Paragraph * owner, Layout const & layout);
@@ -1516,7 +1521,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
 			icit->inset->validate(features);
 			if (layout_->needprotect &&
 			    icit->inset->lyxCode() == FOOT_CODE)
-				features.require("NeedLyXFootnoteCode");
+				features.require("footmisc");
 		}
 	}
 
@@ -1669,11 +1674,11 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
 					os << "\\begin_inset ";
 					inset->write(os);
 					os << "\n\\end_inset\n\n";
-					// FIXME This can be removed again once the mystery
-					// crash has been resolved.
-					os << flush;
 					column = 0;
 				}
+				// FIXME This can be removed again once the mystery
+				// crash has been resolved.
+				os << flush;
 			}
 			break;
 		case '\\':
@@ -1928,7 +1933,7 @@ FontSize Paragraph::highestFontInRange
 char_type Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 {
 	char_type c = d->text_[pos];
-	if (!lyxrc.rtl_support || !getFontSettings(bparams, pos).isRightToLeft())
+	if (!getFontSettings(bparams, pos).isRightToLeft())
 		return c;
 
 	// FIXME: The arabic special casing is due to the difference of arabic
@@ -2203,36 +2208,37 @@ string correction(string const & orig)
 }
 
 
-string const corrected_env(string const & suffix, string const & env,
-	InsetCode code, bool const lastpar)
+bool corrected_env(otexstream & os, string const & suffix, string const & env,
+	InsetCode code, bool const lastpar, int & col)
 {
-	string output = suffix + "{";
+	string macro = suffix + "{";
 	if (noTrivlistCentering(code)) {
 		if (lastpar) {
 			// the last paragraph in non-trivlist-aligned
 			// context is special (to avoid unwanted whitespace)
-			if (suffix == "\\begin")
-				return "\\" + correction(env) + "{}";
-			return string();
+			if (suffix == "\\begin") {
+				macro = "\\" + correction(env) + "{}";
+				os << from_ascii(macro);
+				col += macro.size();
+				return true;
+			}
+			return false;
 		}
-		output += correction(env);
+		macro += correction(env);
 	} else
-		output += env;
-	output += "}";
-	if (suffix == "\\begin")
-		output += "\n";
-	return output;
-}
-
-
-void adjust_column(string const & str, int & column)
-{
-	if (!contains(str, "\n"))
-		column += str.size();
-	else {
-		string tmp;
-		column = rsplit(str, tmp, '\n').size();
+		macro += env;
+	macro += "}";
+	if (suffix == "\\par\\end") {
+		os << breakln;
+		col = 0;
 	}
+	os << from_ascii(macro);
+	col += macro.size();
+	if (suffix == "\\begin") {
+		os << breakln;
+		col = 0;
+	}
+	return true;
 }
 
 } // namespace anon
@@ -2283,28 +2289,20 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
 	case LYX_ALIGN_DECIMAL:
 		break;
 	case LYX_ALIGN_LEFT: {
-		string output;
 		if (owner_->getParLanguage(bparams)->babel() != "hebrew")
-			output = corrected_env(begin_tag, "flushleft", code, lastpar);
+			corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
 		else
-			output = corrected_env(begin_tag, "flushright", code, lastpar);
-		os << from_ascii(output);
-		adjust_column(output, column);
+			corrected_env(os, begin_tag, "flushright", code, lastpar, column);
 		break;
 	} case LYX_ALIGN_RIGHT: {
 		string output;
 		if (owner_->getParLanguage(bparams)->babel() != "hebrew")
-			output = corrected_env(begin_tag, "flushright", code, lastpar);
+			corrected_env(os, begin_tag, "flushright", code, lastpar, column);
 		else
-			output = corrected_env(begin_tag, "flushleft", code, lastpar);
-		os << from_ascii(output);
-		adjust_column(output, column);
+			corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
 		break;
 	} case LYX_ALIGN_CENTER: {
-		string output;
-		output = corrected_env(begin_tag, "center", code, lastpar);
-		os << from_ascii(output);
-		adjust_column(output, column);
+		corrected_env(os, begin_tag, "center", code, lastpar, column);
 		break;
 	}
 	}
@@ -2336,8 +2334,9 @@ bool Paragraph::Private::endTeXParParams(BufferParams const & bparams,
 		break;
 	}
 
-	string output;
-	string const end_tag = "\n\\par\\end";
+	bool output = false;
+	int col = 0;
+	string const end_tag = "\\par\\end";
 	InsetCode code = ownerCode();
 	bool const lastpar = runparams.isLastPar;
 
@@ -2350,26 +2349,23 @@ bool Paragraph::Private::endTeXParParams(BufferParams const & bparams,
 		break;
 	case LYX_ALIGN_LEFT: {
 		if (owner_->getParLanguage(bparams)->babel() != "hebrew")
-			output = corrected_env(end_tag, "flushleft", code, lastpar);
+			output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
 		else
-			output = corrected_env(end_tag, "flushright", code, lastpar);
-		os << from_ascii(output);
+			output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
 		break;
 	} case LYX_ALIGN_RIGHT: {
 		if (owner_->getParLanguage(bparams)->babel() != "hebrew")
-			output = corrected_env(end_tag, "flushright", code, lastpar);
+			output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
 		else
-			output = corrected_env(end_tag, "flushleft", code, lastpar);
-		os << from_ascii(output);
+			output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
 		break;
 	} case LYX_ALIGN_CENTER: {
-		output = corrected_env(end_tag, "center", code, lastpar);
-		os << from_ascii(output);
+		corrected_env(os, end_tag, "center", code, lastpar, col);
 		break;
 	}
 	}
 
-	return !output.empty() || lastpar;
+	return output || lastpar;
 }
 
 
@@ -3200,8 +3196,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 bool Paragraph::isHfill(pos_type pos) const
 {
 	Inset const * inset = getInset(pos);
-	return inset && (inset->lyxCode() == SPACE_CODE &&
-			 inset->isStretchableSpace());
+	return inset && inset->isHfill();
 }
 
 
@@ -3305,8 +3300,7 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 
 bool Paragraph::isRTL(BufferParams const & bparams) const
 {
-	return lyxrc.rtl_support
-		&& getParLanguage(bparams)->rightToLeft()
+	return getParLanguage(bparams)->rightToLeft()
 		&& !inInset().getLayout().forceLTR();
 }
 
@@ -3383,8 +3377,6 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options, const Out
 				getInset(i)->plaintext(os, *runparams);
 			} else {
 				getInset(i)->toString(os);
-				if (getInset(i)->asInsetMath())
-					os << " ";
 			}
 		}
 	}
@@ -3497,46 +3489,6 @@ bool Paragraph::allowEmpty() const
 }
 
 
-char_type Paragraph::transformChar(char_type c, pos_type pos) const
-{
-	if (!Encodings::isArabicChar(c))
-		return c;
-
-	char_type prev_char = ' ';
-	char_type next_char = ' ';
-
-	for (pos_type i = pos - 1; i >= 0; --i) {
-		char_type const par_char = d->text_[i];
-		if (!Encodings::isArabicComposeChar(par_char)) {
-			prev_char = par_char;
-			break;
-		}
-	}
-
-	for (pos_type i = pos + 1, end = size(); i < end; ++i) {
-		char_type const par_char = d->text_[i];
-		if (!Encodings::isArabicComposeChar(par_char)) {
-			next_char = par_char;
-			break;
-		}
-	}
-
-	if (Encodings::isArabicChar(next_char)) {
-		if (Encodings::isArabicChar(prev_char) &&
-			!Encodings::isArabicSpecialChar(prev_char))
-			return Encodings::transformChar(c, Encodings::FORM_MEDIAL);
-		else
-			return Encodings::transformChar(c, Encodings::FORM_INITIAL);
-	} else {
-		if (Encodings::isArabicChar(prev_char) &&
-			!Encodings::isArabicSpecialChar(prev_char))
-			return Encodings::transformChar(c, Encodings::FORM_FINAL);
-		else
-			return Encodings::transformChar(c, Encodings::FORM_ISOLATED);
-	}
-}
-
-
 bool Paragraph::brokenBiblio() const
 {
 	// there is a problem if there is no bibitem at position 0 or