mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
revert parts of 53002538
which set wrong local_font
This commit is contained in:
parent
b65d5f2012
commit
a78bed06eb
@ -573,7 +573,6 @@ void TeXOnePar(Buffer const & buf,
|
|||||||
|
|
||||||
if (style.pass_thru) {
|
if (style.pass_thru) {
|
||||||
Font const outerfont = text.outerFont(pit);
|
Font const outerfont = text.outerFont(pit);
|
||||||
runparams.local_font = &par.getFirstFontSettings(bparams);
|
|
||||||
parStartCommand(par, os, runparams, style);
|
parStartCommand(par, os, runparams, style);
|
||||||
|
|
||||||
par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
|
par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
|
||||||
@ -810,7 +809,6 @@ void TeXOnePar(Buffer const & buf,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
runparams.local_font = &par.getFirstFontSettings(bparams);
|
|
||||||
parStartCommand(par, os, runparams, style);
|
parStartCommand(par, os, runparams, style);
|
||||||
Font const outerfont = text.outerFont(pit);
|
Font const outerfont = text.outerFont(pit);
|
||||||
|
|
||||||
@ -891,7 +889,7 @@ void TeXOnePar(Buffer const & buf,
|
|||||||
// not for ArabTeX
|
// not for ArabTeX
|
||||||
&& (par_language->lang() != "arabic_arabtex"
|
&& (par_language->lang() != "arabic_arabtex"
|
||||||
&& outer_language->lang() != "arabic_arabtex")
|
&& outer_language->lang() != "arabic_arabtex")
|
||||||
// have we opened and \L or \R environment?
|
// have we opened an \L or \R environment?
|
||||||
&& runparams.local_font != 0
|
&& runparams.local_font != 0
|
||||||
&& runparams.local_font->isRightToLeft() != par_language->rightToLeft()
|
&& runparams.local_font->isRightToLeft() != par_language->rightToLeft()
|
||||||
// are we about to close the language?
|
// are we about to close the language?
|
||||||
|
Loading…
Reference in New Issue
Block a user