Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 80ae63b770c1952349c7e53bf3d0aa689659a31b..d1276ba94cb1eb95687333c089ddf0f8ddbff4e6 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -44,9 +44,9 @@ namespace os = lyx::support::os;
 
 using lyx::support::ascii_lowercase;
 using lyx::support::bformat;
-using lyx::support::ExpandPath;
+using lyx::support::expandPath;
 using lyx::support::getEnv;
-using lyx::support::LibFileSearch;
+using lyx::support::libFileSearch;
 using lyx::support::token;
 
 using std::cout;
@@ -151,10 +151,10 @@ keyword_item lyxrcTags[] = {
        { "\\screen_font_sizes", LyXRC::RC_SCREEN_FONT_SIZES },
        { "\\screen_font_typewriter", LyXRC::RC_SCREEN_FONT_TYPEWRITER },
        { "\\screen_font_typewriter_foundry", LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY },
-       { "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM },
        { "\\screen_geometry_height", LyXRC::RC_SCREEN_GEOMETRY_HEIGHT },
        { "\\screen_geometry_width", LyXRC::RC_SCREEN_GEOMETRY_WIDTH },
        { "\\screen_geometry_xysaved", LyXRC::RC_SCREEN_GEOMETRY_XYSAVED },
+       { "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM },
        { "\\serverpipe", LyXRC::RC_SERVERPIPE },
        { "\\set_color", LyXRC::RC_SET_COLOR },
        { "\\show_banner", LyXRC::RC_SHOW_BANNER },
@@ -365,7 +365,7 @@ int LyXRC::read(LyXLex & lexrc)
                case RC_INPUT: // Include file
                        if (lexrc.next()) {
                                string const tmp =
-                                       LibFileSearch(string(),
+                                       libFileSearch(string(),
                                                      lexrc.getString());
                                if (read(tmp)) {
                                        lexrc.printError("Error reading "
@@ -400,14 +400,14 @@ int LyXRC::read(LyXLex & lexrc)
                case RC_CYGWIN_PATH_FIX:
                        if (lexrc.next()) {
                                cygwin_path_fix = lexrc.getBool();
-                       }
-                       break;
+                       }
+                       break;
 
                case RC_TEX_ALLOWS_SPACES:
                        if (lexrc.next()) {
                                tex_allows_spaces = lexrc.getBool();
-                       }
-                       break;
+                       }
+                       break;
 
                case RC_KBMAP:
                        if (lexrc.next()) {
@@ -420,7 +420,7 @@ int LyXRC::read(LyXLex & lexrc)
                                string const kmap(os::internal_path(lexrc.getString()));
                                if (kmap.empty()) {
                                        // nothing
-                               } else if (!LibFileSearch("kbd", kmap,
+                               } else if (!libFileSearch("kbd", kmap,
                                                          "kmap").empty()) {
                                        primary_kbmap = kmap;
                                } else {
@@ -434,7 +434,7 @@ int LyXRC::read(LyXLex & lexrc)
                                string const kmap(os::internal_path(lexrc.getString()));
                                if (kmap.empty()) {
                                        // nothing
-                               } else if (!LibFileSearch("kbd", kmap,
+                               } else if (!libFileSearch("kbd", kmap,
                                                          "kmap").empty()) {
                                        secondary_kbmap = kmap;
                                } else {
@@ -720,21 +720,21 @@ int LyXRC::read(LyXLex & lexrc)
                case RC_DOCUMENTPATH:
                        if (lexrc.next()) {
                                document_path = os::internal_path(lexrc.getString());
-                               document_path = ExpandPath(document_path);
+                               document_path = expandPath(document_path);
                        }
                        break;
 
                case RC_TEMPLATEPATH:
                        if (lexrc.next()) {
                                template_path = os::internal_path(lexrc.getString());
-                               template_path = ExpandPath(template_path);
+                               template_path = expandPath(template_path);
                        }
                        break;
 
                case RC_TEMPDIRPATH:
                        if (lexrc.next()) {
                                tempdir_path = os::internal_path(lexrc.getString());
-                               tempdir_path = ExpandPath(tempdir_path);
+                               tempdir_path = expandPath(tempdir_path);
                        }
                        break;
 
@@ -876,7 +876,7 @@ int LyXRC::read(LyXLex & lexrc)
                case RC_SERVERPIPE:
                        if (lexrc.next()) {
                                lyxpipes = os::internal_path(lexrc.getString());
-                               lyxpipes = ExpandPath(lyxpipes);
+                               lyxpipes = expandPath(lyxpipes);
                        }
                        break;
 
@@ -961,7 +961,7 @@ int LyXRC::read(LyXLex & lexrc)
                case RC_BACKUPDIR_PATH:
                        if (lexrc.next()) {
                                backupdir_path = os::internal_path(lexrc.getString());
-                               backupdir_path = ExpandPath(backupdir_path);
+                               backupdir_path = expandPath(backupdir_path);
                        }
                        break;
                case RC_DATE_INSERT_FORMAT:
@@ -1379,7 +1379,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                if (tex_allows_spaces != system_lyxrc.tex_allows_spaces) {
                        os << "\\tex_allows_spaces "
                           << convert<string>(tex_allows_spaces) << '\n';
-               }
+               }
        case RC_KBMAP:
                if (ignore_system_lyxrc ||
                    use_kbmap != system_lyxrc.use_kbmap) {
@@ -1460,7 +1460,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                        os << "\\preview_scale_factor "
                           << preview_scale_factor << '\n';
                }
-               
+
                os << "\n#\n"
                   << "# SCREEN & FONTS SECTION ############################\n"
                   << "#\n\n";
@@ -1801,7 +1801,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
        case RC_LOADSESSION:
                if (ignore_system_lyxrc ||
                    load_session != system_lyxrc.load_session) {
-                       os << "\\load_session " << convert<string>(load_session) 
+                       os << "\\load_session " << convert<string>(load_session)
                           << "\n";
                }
        case RC_NUMLASTFILES:
@@ -2448,11 +2448,11 @@ string const LyXRC::getDescription(LyXRCTags tag)
        case RC_SCREEN_GEOMETRY_HEIGHT:
        case RC_SCREEN_GEOMETRY_WIDTH:
                str = _("Specify geometry of the main view in width x height (values from last session will not be used if non-zero values are specified).");
-               break;  
+               break;
 
        case RC_SCREEN_GEOMETRY_XYSAVED:
                str = _("Allow session manager to save and restore windows position.");
-               break;  
+               break;
 
        case RC_SERVERPIPE:
                str = _("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users.");