Fix bug #9813

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 0d2114516aa470982c9256d30b9350c31d112ae7..fb8fb6085a92d8caeee3401337993de4fcbab2fe 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -796,7 +796,8 @@ char const * simplefeatures[] = {
        "pdfcomment",
        "fixme",
        "todonotes",
-       "forest"
+       "forest",
+       "varwidth"
 };
 
 char const * bibliofeatures[] = {
@@ -1171,24 +1172,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") ||