X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=562e0e2a00bc2bf6c693d472c9d03596154b40f9;hb=af16acb0b4c5379ac87fe0c9fae384af1babdc3a;hp=0d2114516aa470982c9256d30b9350c31d112ae7;hpb=468cedb923bf0fb1e7e2ab947b009fdcd2d1c1c6;p=lyx.git diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 0d2114516a..562e0e2a00 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -1171,24 +1171,15 @@ docstring const LaTeXFeatures::getMacros() const // ensure LGR font encoding is defined also if fontenc is not loaded by LyX if (params_.font_encoding() == "default") macros << textgreek_LGR_def; - // Avoid a LaTeX error if times fonts are used and the grtimes - // package is installed but actual fonts are not (bug 6469). - if (params_.fonts_roman == "times") - macros << subst(textgreek_def, - from_ascii("\\greektext #1"), - from_ascii("%\n \\IfFileExists" - "{grtm10.tfm}{}{\\fontfamily" - "{cmr}}\\greektext #1")) - << '\n'; - else - macros << textgreek_def << '\n'; + macros << textgreek_def << '\n'; } - if (!usePolyglossia() && mustProvide("textcyr")) - // ensure T2A font encoding is set up also if fontenc is not loaded by LyX - if (params_.font_encoding() == "default") + if (!usePolyglossia() && mustProvide("textcyr")) { + // ensure T2A font encoding is set up also if fontenc is not loaded by LyX + if (params_.font_encoding() == "default") macros << textcyr_T2A_def; macros << textcyr_def << '\n'; + } // non-standard text accents: if (mustProvide("textcommaabove") || mustProvide("textcommaaboveright") ||