anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not close language before PassThru insets

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-08-14 09:50:40 +02:00
parent ef11fdc77d
commit 70eb8c37cb
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Paragraph.cpp
View File

@ -1030,13 +1030,17 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
if (open_font && (!inset->inheritFont() || inset->allowMultiPar())) {
// Some insets cannot be inside a font change command.
// However, even such insets *can* be placed in \L or \R
// or their equivalents (for RTL language switches), so we don't
// close the language in those cases.
// ArabTeX, though, cannot handle this special behavior, it seems.
bool arabtex = basefont.language()->lang() == "arabic_arabtex"
|| running_font.language()->lang() == "arabic_arabtex";
bool closeLanguage = arabtex
|| basefont.isRightToLeft() == running_font.isRightToLeft();
// or their equivalents (for RTL language switches),
// so we don't close the language in those cases
// (= differing isRightToLeft()).
// ArabTeX, though, doesn't seem to handle this special behavior.
bool const inRLSwitch =
basefont.isRightToLeft() != running_font.isRightToLeft()
&& basefont.language()->lang() != "arabic_arabtex"
&& running_font.language()->lang() != "arabic_arabtex";
// Having said that, PassThru insets must be inside a font change command,
// as we do not re-open the font inside. So:
bool const closeLanguage = !inset->isPassThru() && !inRLSwitch;
bool lang_closed = false;
bool lang_switched_at_inset = false;
// Close language if needed