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

Fix #6618: RTL (sub)*section after LTR text doesn't compile.

Browse Source 
When deciding whether to switch encoding or not, the "fragileness" of
the enclosing environment (rather than that of the actual one) should
be taken into account, as we already account for the current "fragility"
by outputting the encoding switch just before switching environment.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33882 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2010-03-27 17:29:56 +00:00
parent 9a98285308
commit f84a611775
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/output_latex.cpp
View File

@ -348,8 +348,6 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
Layout const style = text.inset().forcePlainLayout() ?
bparams.documentClass().plainLayout() : pit->layout();
runparams.moving_arg |= style.needprotect;
// This paragraph's language
Language const * const par_language = pit->getParLanguage(bparams);
// The document's language
@ -462,7 +460,9 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
// Look ahead for future encoding changes.
// We try to output them at the beginning of the paragraph,
// since the \inputencoding command is not allowed e.g. in
// sections.
// sections. For this reason we only set runparams.moving_arg
// after checking for the encoding change, otherwise the
// change would be always avoided by switchEncoding().
for (pos_type i = 0; i < pit->size(); ++i) {
char_type const c = pit->getChar(i);
Encoding const * const encoding =
@ -513,6 +513,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
}
}
runparams.moving_arg |= style.needprotect;
Encoding const * const prev_encoding = runparams.encoding;
bool const useSetSpace = bparams.documentClass().provides("SetSpace");