[LyX/master] Check script char fontenc from main language.

[Juergen Spitzmueller]

commit a853dab61fe99f133d029266384bdcbb123c1e0f
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sat May 5 15:26:37 2018 +0200

    Check script char fontenc from main language.
---
 src/Paragraph.cpp |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 307f8f4..7aa0d1f 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -913,7 +913,7 @@ int Paragraph::Private::latexSurrogatePair(BufferParams 
const & bparams,
        if (runparams.local_font)
                fontenc = runparams.local_font->language()->fontenc(bparams);
        else
-               fontenc = runparams.main_fontenc;
+               fontenc = bparams.language->fontenc(bparams);
        docstring scriptmacro;
        docstring cb;
        if (script == "textgreek" || script == "textcyrillic") {
@@ -1395,10 +1395,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & 
os,
                        }
                }
                string fontenc;
-               if (running_font.language()->lang() == bparams.language->lang())
-                       fontenc = runparams.main_fontenc;
-               else
-                       fontenc = running_font.language()->fontenc(bparams);
+               fontenc = running_font.language()->fontenc(bparams);
                // "Script chars" need to embraced in \textcyrillic and 
\textgreek notwithstanding
                // whether they are encodable or not (it only depends on the 
font encoding)
                if (!runparams.isFullUnicode() && 
Encodings::isKnownScriptChar(c, script)) {