X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=ea1b8c17a37ca14c4ad873c7dfc2ca15f69842ac;hb=38a3692a0fce8b0531cef794a08d179e9e33ac33;hp=ee6a8ca4e76fb9d9ec45d11cfe331630a0d953a3;hpb=c5527942f3a7a6c160f27da2e61a5fe81dcb33aa;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index ee6a8ca4e7..ea1b8c17a3 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -18,11 +18,14 @@
 
 #include "BufferParams.h" // stateText
 #include "debug.h"
+#include "Encoding.h"
 #include "gettext.h"
 #include "Language.h"
 #include "Color.h"
 #include "Lexer.h"
 #include "LyXRC.h"
+#include "output_latex.h"
+#include "OutputParams.h"
 
 #include "support/lstrings.h"
 
@@ -37,6 +40,7 @@ using support::subst;
 using std::endl;
 using std::string;
 using std::ostream;
+using std::pair;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
@@ -163,37 +167,37 @@ bool operator==(Font::FontBits const & lhs,
 
 
 Font::Font()
-	: bits(sane), lang(default_language)
+	: bits(sane), lang(default_language), open_encoding_(false)
 {}
 
 
 Font::Font(Font::FONT_INIT1)
-	: bits(inherit), lang(default_language)
+	: bits(inherit), lang(default_language), open_encoding_(false)
 {}
 
 
 Font::Font(Font::FONT_INIT2)
-	: bits(ignore), lang(ignore_language)
+	: bits(ignore), lang(ignore_language), open_encoding_(false)
 {}
 
 
 Font::Font(Font::FONT_INIT3)
-	: bits(sane), lang(default_language)
+	: bits(sane), lang(default_language), open_encoding_(false)
 {}
 
 
 Font::Font(Font::FONT_INIT1, Language const * l)
-	: bits(inherit), lang(l)
+	: bits(inherit), lang(l), open_encoding_(false)
 {}
 
 
 Font::Font(Font::FONT_INIT2, Language const * l)
-	: bits(ignore), lang(l)
+	: bits(ignore), lang(l), open_encoding_(false)
 {}
 
 
 Font::Font(Font::FONT_INIT3, Language const * l)
-	: bits(sane), lang(l)
+	: bits(sane), lang(l), open_encoding_(false)
 {}
 
 
@@ -507,21 +511,21 @@ docstring const Font::stateText(BufferParams * params) const
 		os << lcolor.getGUIName(color()) << ", ";
 	if (emph() != INHERIT)
 		os << bformat(_("Emphasis %1$s, "),
-		              _(GUIMiscNames[emph()]));
+			      _(GUIMiscNames[emph()]));
 	if (underbar() != INHERIT)
 		os << bformat(_("Underline %1$s, "),
-		              _(GUIMiscNames[underbar()]));
+			      _(GUIMiscNames[underbar()]));
 	if (noun() != INHERIT)
 		os << bformat(_("Noun %1$s, "),
-		              _(GUIMiscNames[noun()]));
+			      _(GUIMiscNames[noun()]));
 	if (bits == inherit)
 		os << _("Default") << ", ";
 	if (!params || (language() != params->language))
 		os << bformat(_("Language: %1$s, "),
-		              _(language()->display()));
+			      _(language()->display()));
 	if (number() != OFF)
 		os << bformat(_("  Number %1$s"),
-		              _(GUIMiscNames[number()]));
+			      _(GUIMiscNames[number()]));
 	return rtrim(os.str(), ", ");
 }
 
@@ -671,7 +675,7 @@ Font & Font::lyxRead(Lexer & lex)
 			} else if (ttok == "noun") {
 				setNoun(ON);
 			} else {
-				lex.printError("Illegal misc type `$$Token´");
+				lex.printError("Illegal misc type `$$Token'");
 			}
 		} else if (tok == "color") {
 			lex.next();
@@ -736,15 +740,32 @@ void Font::lyxWriteChanges(Font const & orgfont,
 
 /// Writes the head of the LaTeX needed to impose this font
 // Returns number of chars written.
-int Font::latexWriteStartChanges(odocstream & os, Font const & base,
-                                    Font const & prev) const
+int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
+				    OutputParams const & runparams,
+				    Font const & base,
+				    Font const & prev) const
 {
 	bool env = false;
 
 	int count = 0;
 	if (language()->babel() != base.language()->babel() &&
 	    language() != prev.language()) {
-		if (isRightToLeft() != prev.isRightToLeft()) {
+		if (language()->lang() == "farsi") {
+			os << "\\textFR{";
+			count += 8;
+		} else if (!isRightToLeft() &&
+			    base.language()->lang() == "farsi") {
+			os << "\\textLR{";
+			count += 8;
+		} else if (language()->lang() == "arabic_arabi") {
+			os << "\\textAR{";
+			count += 8;
+ 		} else if (!isRightToLeft() &&
+				base.language()->lang() == "arabic_arabi") {
+			os << "\\textLR{";
+			count += 8;
+		// currently the remaining RTL languages are arabic_arabtex and hebrew
+		} else if (isRightToLeft() != prev.isRightToLeft()) {
 			if (isRightToLeft()) {
 				os << "\\R{";
 				count += 3;
@@ -758,11 +779,30 @@ int Font::latexWriteStartChanges(odocstream & os, Font const & base,
 				      "$$lang", language()->babel());
 			os << from_ascii(tmp);
 			count += tmp.length();
+		} else {
+			os << '{';
+			count += 1;
 		}
 	}
 
-	if (number() == ON && prev.number() != ON &&
-	    language()->lang() == "hebrew") {
+	if (language()->encoding()->package() == Encoding::CJK) {
+		pair<bool, int> const c = switchEncoding(os, bparams,
+				runparams.moving_arg, *(runparams.encoding),
+				*(language()->encoding()));
+		if (c.first) {
+			open_encoding_ = true;
+			count += c.second;
+			runparams.encoding = language()->encoding();
+		}
+	}
+
+	// When the current language is Hebrew, Arabic, or Farsi
+	// the numbers are written Left-to-Right. ArabTeX package
+	// reorders the number automatically but the packages used
+	// for Hebrew and Farsi (Arabi) do not.
+	if (number() == ON && prev.number() != ON
+		&& (language()->lang() == "hebrew"
+			|| language()->lang() == "farsi")) {
 		os << "{\\beginL ";
 		count += 9;
 	}
@@ -832,8 +872,10 @@ int Font::latexWriteStartChanges(odocstream & os, Font const & base,
 /// Writes ending block of LaTeX needed to close use of this font
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
-int Font::latexWriteEndChanges(odocstream & os, Font const & base,
-                                  Font const & next) const
+int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
+				  OutputParams const & runparams,
+				  Font const & base,
+				  Font const & next) const
 {
 	int count = 0;
 	bool env = false;
@@ -887,12 +929,30 @@ int Font::latexWriteEndChanges(odocstream & os, Font const & base,
 		}
 	}
 
-	if (number() == ON && next.number() != ON &&
-	    language()->lang() == "hebrew") {
+	// When the current language is Hebrew, Arabic, or Farsi
+	// the numbers are written Left-to-Right. ArabTeX package
+	// reorders the number automatically but the packages used
+	// for Hebrew and Farsi (Arabi) do not.
+	if (number() == ON && next.number() != ON
+		&& (language()->lang() == "hebrew"
+			|| language()->lang() == "farsi")) {
 		os << "\\endL}";
 		count += 6;
 	}
 
+	if (open_encoding_) {
+		// We need to close the encoding even if it does not change
+		// to do correct environment nesting
+		Encoding const * const ascii = encodings.getFromLyXName("ascii");
+		pair<bool, int> const c = switchEncoding(os, bparams,
+				runparams.moving_arg, *(runparams.encoding),
+				*ascii);
+		BOOST_ASSERT(c.first);
+		count += c.second;
+		runparams.encoding = ascii;
+		open_encoding_ = false;
+	}
+
 	if (language() != base.language() && language() != next.language()) {
 		os << '}';
 		++count;