From 0bbc80fa83847668b58c5f6c17331a0c02058e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Milde?= Date: Thu, 27 Aug 2015 00:04:19 +0200 Subject: [PATCH] Remove problematic workaround for "exotic" problem Greek and Times under MikTeX with auto-install may fail due to a half-installed font package. However, the workaround in LyX stands in the way of alternative approaches (see bug #6469). --- lib/RELEASE-NOTES | 4 ++++ src/LaTeXFeatures.cpp | 12 +----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index 6557b9ea90..93d9bf038b 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -134,3 +134,7 @@ as errors. This leads to error reports for documents that compiled without error before. However, the error was always present but went undetected! +* Documents using Times fonts and containing Greek characters may now fail + to compile under pdflatex for users of MikTeX due to an automatically + half-installed "grtimes" package. A workaround in LyX was removed as it + stands in the way of alternative approaches (see bug #6469). diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 0d2114516a..65e1fc5966 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -1171,17 +1171,7 @@ 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"))