]> git.lyx.org Git - features.git/commitdiff
Do not rely on babel quotation macros for encodings other than [O]T1
authorJuergen Spitzmueller <spitz@lyx.org>
Sun, 17 Dec 2017 11:16:01 +0000 (12:16 +0100)
committerJuergen Spitzmueller <spitz@lyx.org>
Mon, 18 Dec 2017 11:40:44 +0000 (12:40 +0100)
Babel falls back to OT1 in these cases, which gives wrong output got the
guillemots

Fixes: #10947
(cherry picked from commit 64b94f81be52de33553cda5db85d824de2119a3c)

src/insets/InsetQuotes.cpp

index 24be900cdd6283e219ec139ff5ebe986380ca22a..8b5334d1d36f0d16e4f9d7c08a87abe567950c03 100644 (file)
@@ -880,13 +880,18 @@ void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const
                // (ligatures not featured)
                qstr = quoteparams.getLaTeXQuote(quotechar, "int");
 #ifdef DO_USE_DEFAULT_LANGUAGE
-       } else if (doclang == "default") {
+       } else if ((doclang == "default"
 #else
-       } else if (!runparams.use_babel || runparams.isFullUnicode()) {
+       } else if ((!runparams.use_babel
 #endif
+                  || fontenc_ == "T2A")
+                  || runparams.isFullUnicode()) {
                // Standard quotation mark macros
                // These are also used by babel
                // without fontenc (XeTeX/LuaTeX)
+               // We use those for T2A (russian), since
+               // babel falls back for ugly OT1 versions for
+               // the guillemots.
                qstr = quoteparams.getLaTeXQuote(quotechar, "ot1");
        } else {
                // Babel shorthand quotation marks (for T1/OT1)