X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=5bad896dfdf4e13f0a09bc9d1597e52290332e16;hb=26821705565c9d7bd8b534b86580c62d896c5200;hp=2b07456b50495e3ebfd80b869dc4c8191f9c02ca;hpb=57dc817581faf54babaf3db0c602bac205dc6855;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 2b07456b50..5bad896dfd 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1143,13 +1143,15 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
 	odocstream::pos_type const len = os.os().tellp();
 
 	if (inset->forceLTR()
-	    && !runparams.use_polyglossia
 	    && running_font.isRightToLeft()
 	    // ERT is an exception, it should be output with no
 	    // decorations at all
 	    && inset->lyxCode() != ERT_CODE) {
-		if (running_font.language()->lang() == "farsi")
-			os << "\\beginL" << termcmd;
+		if (runparams.use_polyglossia) {
+			os << "\\LRE{";
+		} else if (running_font.language()->lang() == "farsi"
+			   || running_font.language()->lang() == "arabic_arabi")
+			os << "\\textLR{" << termcmd;
 		else
 			os << "\\L{";
 		close = true;
@@ -1205,12 +1207,8 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
 		throw(e);
 	}
 
-	if (close) {
-		if (running_font.language()->lang() == "farsi")
-				os << "\\endL" << termcmd;
-			else
-				os << '}';
-	}
+	if (close)
+		os << '}';
 
 	if (os.texrow().rows() > previous_row_count) {
 		os.texrow().start(owner_->id(), i + 1);
@@ -1234,10 +1232,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
 					  pos_type end_pos,
 					  unsigned int & column)
 {
-	// With polyglossia, brackets and stuff need not be reversed
-	// in RTL scripts (see bug #8251)
-	char_type const c = (runparams.use_polyglossia) ?
-		owner_->getUChar(bparams, i) : text_[i];
+	char_type const c = owner_->getUChar(bparams, runparams, i);
 
 	if (style.pass_thru || runparams.pass_thru
 	    || contains(style.pass_thru_chars, c)
@@ -1997,32 +1992,57 @@ Font const Paragraph::getLayoutFont
 }
 
 
-char_type Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
+char_type Paragraph::getUChar(BufferParams const & bparams,
+			      OutputParams const & rp,
+			      pos_type pos) const
 {
 	char_type c = d->text_[pos];
-	if (!getFontSettings(bparams, pos).isRightToLeft())
+
+	// Return unchanged character in LTR languages
+	// or if we use poylglossia/bidi.
+	if (rp.use_polyglossia || !getFontSettings(bparams, pos).isRightToLeft())
 		return c;
 
-	// FIXME: The arabic special casing is due to the difference of arabic
-	// round brackets input introduced in r18599. Check if this should be
-	// unified with Hebrew or at least if all bracket types should be
-	// handled the same (file format change in either case).
+	// Without polyglossia/bidi, we need to account for some special cases.
+	// FIXME This needs to be audited!
+	// Check if:
+	// * The input is as expected for all delimiters
+	//   => checked for Hebrew!
+	// * The output matches the display in the LyX workarea
+	//   => checked for Hebrew!
+	// * The special cases below are really necessary
+	//   => checked for Hebrew!
+	// * In arabic_arabi, brackets are transformed to Arabic
+	//   Ornate Parentheses. Is this is really wanted?
+
 	string const & lang = getFontSettings(bparams, pos).language()->lang();
-	bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi"
-		|| lang == "farsi";
 	char_type uc = c;
+
+	// 1. In the following languages, parentheses need to be reversed.
+	bool const reverseparens = lang == "hebrew";
+
+	// 2. In the following languages, brackets don't need to be reversed.
+	bool const reversebrackets = lang != "arabic_arabtex"
+			&& lang != "arabic_arabi"
+			&& lang != "farsi";
+
+	// Now swap delimiters if needed.
 	switch (c) {
 	case '(':
-		uc = arabic ? c : ')';
+		if (reverseparens)
+			uc = ')';
 		break;
 	case ')':
-		uc = arabic ? c : '(';
+		if (reverseparens)
+			uc = '(';
 		break;
 	case '[':
-		uc = ']';
+		if (reversebrackets)
+			uc = ']';
 		break;
 	case ']':
-		uc = '[';
+		if (reversebrackets)
+			uc = '[';
 		break;
 	case '{':
 		uc = '}';
@@ -2358,13 +2378,13 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
 	case LYX_ALIGN_DECIMAL:
 		break;
 	case LYX_ALIGN_LEFT: {
-		if (owner_->getParLanguage(bparams)->babel() != "hebrew")
+		if (!owner_->getParLanguage(bparams)->rightToLeft())
 			corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
 		else
 			corrected_env(os, begin_tag, "flushright", code, lastpar, column);
 		break;
 	} case LYX_ALIGN_RIGHT: {
-		if (owner_->getParLanguage(bparams)->babel() != "hebrew")
+		if (!owner_->getParLanguage(bparams)->rightToLeft())
 			corrected_env(os, begin_tag, "flushright", code, lastpar, column);
 		else
 			corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
@@ -2416,13 +2436,13 @@ bool Paragraph::Private::endTeXParParams(BufferParams const & bparams,
 	case LYX_ALIGN_DECIMAL:
 		break;
 	case LYX_ALIGN_LEFT: {
-		if (owner_->getParLanguage(bparams)->babel() != "hebrew")
+		if (!owner_->getParLanguage(bparams)->rightToLeft())
 			output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
 		else
 			output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
 		break;
 	} case LYX_ALIGN_RIGHT: {
-		if (owner_->getParLanguage(bparams)->babel() != "hebrew")
+		if (!owner_->getParLanguage(bparams)->rightToLeft())
 			output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
 		else
 			output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
@@ -3387,7 +3407,8 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 				retval += inset->xhtml(xs, np);
 			}
 		} else {
-			char_type c = getUChar(buf.masterBuffer()->params(), i);
+			char_type c = getUChar(buf.masterBuffer()->params(),
+					       runparams, i);
 			xs << c;
 		}
 		font_old = font.fontInfo();