Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 9b993fdd2d200759b74c0d9ed51e77fb8f9c3f7d..0e5b4dcf8184e6c4dd633f41155d3fc27011d488 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -30,10 +30,10 @@
 
 #include <sstream>
 
-using lyx::support::IsSGMLFilename;
-using lyx::support::LibFileSearch;
-using lyx::support::MakeRelPath;
-using lyx::support::OnlyPath;
+using lyx::support::isSGMLFilename;
+using lyx::support::libFileSearch;
+using lyx::support::makeRelPath;
+using lyx::support::onlyPath;
 
 using std::endl;
 using std::find;
@@ -50,7 +50,7 @@ LaTeXFeatures::PackagesList LaTeXFeatures::packages_;
 
 
 LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
-                             OutputParams const & r)
+                            OutputParams const & r)
        : buffer_(&b), params_(p), runparams_(r)
 {}
 
@@ -75,7 +75,7 @@ void LaTeXFeatures::require(string const & name)
 void LaTeXFeatures::getAvailable()
 {
        LyXLex lex(0, 0);
-       string real_file = LibFileSearch("", "packages.lst");
+       string real_file = libFileSearch("", "packages.lst");
 
        if (real_file.empty())
                return;
@@ -220,8 +220,8 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
        LanguageList::const_iterator it  = UsedLanguages_.begin();
        LanguageList::const_iterator end = UsedLanguages_.end();
        for (; it != end; ++it)
-               if ((*it)->encoding()->LatexName() != doc_encoding)
-                       encodings.insert((*it)->encoding()->LatexName());
+               if ((*it)->encoding()->latexName() != doc_encoding)
+                       encodings.insert((*it)->encoding()->latexName());
        return encodings;
 }
 
@@ -242,6 +242,7 @@ char const * simplefeatures[] = {
        "dvipost",
        "fancybox",
        "calc",
+       "nicefrac",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -502,14 +503,14 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
 string const LaTeXFeatures::getIncludedFiles(string const & fname) const
 {
        ostringstream sgmlpreamble;
-       string const basename = OnlyPath(fname);
+       string const basename = onlyPath(fname);
 
        FileMap::const_iterator end = IncludedFiles_.end();
        for (FileMap::const_iterator fi = IncludedFiles_.begin();
             fi != end; ++fi)
                sgmlpreamble << "\n<!ENTITY " << fi->first
-                            << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
-                            << MakeRelPath(fi->second, basename) << "\">";
+                            << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
+                            << makeRelPath(fi->second, basename) << "\">";
 
        return sgmlpreamble.str();
 }