anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +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
(cherry picked from commit 114ebf00c4)
This commit is contained in:
Juergen Spitzmueller 2018-07-21 15:50:35 +02:00
parent cc845ed2cf
commit 485f070887
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Font.cpp
View File

@ -347,21 +347,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_;
f.reduce(base.bits_);
FontInfo p = bits_;
@ -411,6 +396,20 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
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) {
os << "\\emph{";
count += 6;

2
status.23x
View File

@ -274,6 +274,8 @@ What's new
- Fix insertion of quotation marks and brackets in RTL languages
(bugs 11188 and 11187).
- Fix nesting problem with numbers in RTL text (bug 6283).
* INTERNALS