Workaround for #6865: smarter FontList::setMisspelled implementation

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 615901f8936eea1430157d539bf70df20422d443..0a4c840bd2a5af8e35504e0d230df84814bce847 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -38,6 +38,9 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include <algorithm>
+
+
 using namespace std;
 using namespace lyx::support;
 
@@ -195,13 +198,11 @@ static docstring const changetracking_none_def = from_ascii(
        "\\newcommand{\\lyxdeleted}[3]{}\n");
 
 static docstring const textgreek_def = from_ascii(
-       "\\providecommand*{\\perispomeni}{\\char126}\n"
-       "\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
-       "  \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}%\n"
-       "  \\renewcommand{\\~}{\\perispomeni}%\n"
-       "}}\n"
+       "\\DeclareRobustCommand{\\greektext}{%\n"
+       "  \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
        "\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
-       "\\DeclareFontEncoding{LGR}{}{}\n");
+       "\\DeclareFontEncoding{LGR}{}{}\n"
+       "\\DeclareTextSymbol{\\~}{LGR}{126}");
 
 static docstring const textcyr_def = from_ascii(
        "\\DeclareRobustCommand{\\cyrtext}{%\n"
@@ -1114,7 +1115,7 @@ docstring const LaTeXFeatures::getIncludedFiles(string const & fname) const
             fi != end; ++fi)
                // FIXME UNICODE
                sgmlpreamble << "\n<!ENTITY " << fi->first
-                            << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
+                            << (isSGMLFileName(fi->second) ? " SYSTEM \"" : " \"")
                             << makeRelPath(from_utf8(fi->second), basename) << "\">";
 
        return sgmlpreamble.str();