Do not force singlebyte encoding for listings with XeTeX/LuaTeX.

Fixes: #11056
(cherry picked from commit cbf2a329c94fcd531dbee41d64cf199a3ee6bb4b)

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index d66112e6c81e63bee7727060268eaadfdce98b75..d106da39092d5ab721fd2f475bf0b9817cfd9757 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -127,6 +127,7 @@ Encoding const * InsetListings::forcedEncoding(Encoding const * inner_enc,
        // such as XeTeX or LuaTeX are used, and with pLaTeX.
        // Minted can deal with all encodings.
        if (buffer().params().use_minted
+               || inner_enc->name() == "utf8-plain"
                || (buffer().params().encoding().package() == Encoding::japanese
                        && inner_enc->package() == Encoding::japanese)
                || inner_enc->hasFixedWidth())

diff --git a/status.23x b/status.23x
index 84020ef089e8069156e90fe5409da6695c4b359b..3d1d7b621507d8e03db3bc201b97266edc823cb7 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -64,6 +64,8 @@ What's new
 
 - Fix list of viewable formats in view/update menu (bug 11044).
 
+- Fix encoding problems with listings insets and non-TeX fonts (bug 11056).
+
 
 * INTERNALS