anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix/simplify "if" clause for application of \textcyrrillic or \textgreek.

Browse Source 
Also with Xe/LuaTeX only required with non-native font encodings.
This commit is contained in:
Günter Milde 2019-03-02 20:24:05 +01:00
parent 7dfc6c7f8b
commit 68b6198d63
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Paragraph.cpp
View File

@ -924,8 +924,7 @@ int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
length -= pos;
latex2 = latex2.substr(pos, length);
// and place it before the accent macro if required (#6463)
if (Encodings::needsScriptWrapper(script, fontenc)
|| runparams.isFullUnicode()) {
if (Encodings::needsScriptWrapper(script, fontenc)) {
scriptmacro = from_ascii("\\" + script + "{");
cb = from_ascii("}");
}
@ -1010,10 +1009,8 @@ int Paragraph::Private::writeScriptChars(BufferParams const & bparams,
int length = brace2;
bool closing_brace = true;
// We only need the script macro with non-native font encodings
// and with XeTeX/LuaTeX (with TeX fonts)
if (!Encodings::needsScriptWrapper(script, fontenc)
&& !runparams.isFullUnicode()) {
// Correct font encoding is being used, so we can avoid \text[greek|cyr].
if (!Encodings::needsScriptWrapper(script, fontenc)) {
// Correct font encoding is being used, so we can avoid \text(greek|cyrrillic).
pos = brace1 + 1;
length -= pos;
closing_brace = false;