Do not use English, but the context language, when pasting from math

Fixes: #2596
(cherry picked from commit 92990adc23)
This commit is contained in:
Juergen Spitzmueller 2018-02-06 14:10:12 +01:00 committed by Richard Heck
parent 6da7b92c36
commit 8bf7e691bc
2 changed files with 7 additions and 1 deletions

View File

@ -1040,7 +1040,10 @@ void copySelectionToStack(Cursor const & cur, CutStack & cutstack)
BufferParams const & bp = cur.buffer()->params(); BufferParams const & bp = cur.buffer()->params();
// FIXME This should be the plain layout...right? // FIXME This should be the plain layout...right?
par.setLayout(bp.documentClass().plainLayout()); par.setLayout(bp.documentClass().plainLayout());
par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED)); // For pasting into text, we set the language to the paragraph language
// (rather than the default_language which is always English; see #2596)
par.insert(0, grabSelection(cur), Font(sane_font, par.getParLanguage(bp)),
Change(Change::UNCHANGED));
pars.push_back(par); pars.push_back(par);
cutstack.push(make_pair(pars, bp.documentClassPtr())); cutstack.push(make_pair(pars, bp.documentClassPtr()));
} }

View File

@ -49,6 +49,9 @@ What's new
- Do not use English, but the context language, when pasting from LaTeX - Do not use English, but the context language, when pasting from LaTeX
(bug 9199). (bug 9199).
- Do not use English, but the context language, when pasting from math
(bug 2596).
* INTERNALS * INTERNALS