anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 15:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix nesting problem with numbers in RTL text

Browse Source 
\textcolor must precede any \beginL

Fixes: #6283
This commit is contained in:
Juergen Spitzmueller 2018-07-21 15:50:35 +02:00
parent 8e9e050670
commit 114ebf00c4
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Font.cpp
View File

@ -349,21 +349,6 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
} }
} }
// If the current language is Hebrew, Arabic, or Farsi
// the numbers are written Left-to-Right. ArabTeX package
// and bidi (polyglossia) reorder the number automatically
// but the packages used for Hebrew and Farsi (Arabi) do not.
if (!runparams.use_polyglossia
&& !runparams.pass_thru
&& bits_.number() == FONT_ON
&& prev.fontInfo().number() != FONT_ON
&& (language()->lang() == "hebrew"
|| language()->lang() == "farsi"
|| language()->lang() == "arabic_arabi")) {
os << "{\\beginL ";
count += 9;
}
FontInfo f = bits_; FontInfo f = bits_;
f.reduce(base.bits_); f.reduce(base.bits_);
FontInfo p = bits_; FontInfo p = bits_;
@ -413,6 +398,20 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
env = true; //We have opened a new environment env = true; //We have opened a new environment
} }
*/ */
// If the current language is Hebrew, Arabic, or Farsi
// the numbers are written Left-to-Right. ArabTeX package
// and bidi (polyglossia) reorder the number automatically
// but the packages used for Hebrew and Farsi (Arabi) do not.
if (!runparams.use_polyglossia
&& !runparams.pass_thru
&& bits_.number() == FONT_ON
&& prev.fontInfo().number() != FONT_ON
&& (language()->lang() == "hebrew"
|| language()->lang() == "farsi"
|| language()->lang() == "arabic_arabi")) {
os << "{\\beginL ";
count += 9;
}
if (f.emph() == FONT_ON) { if (f.emph() == FONT_ON) {
os << "\\emph{"; os << "\\emph{";
count += 6; count += 6;