minimal effort implementation of:

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 316f64796ebca21ea01765c521495eaa58741844..fd741ab8ff8cfb8f82ee92b43a2c184f8f9eef5d 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -81,7 +81,6 @@ keyword_item lyxrcTags[] = {
        { "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR },
        { "\\custom_export_command", LyXRC::RC_CUSTOM_EXPORT_COMMAND },
        { "\\custom_export_format", LyXRC::RC_CUSTOM_EXPORT_FORMAT },
-       { "\\cygwin_path_fix_needed", LyXRC::RC_CYGWIN_PATH_FIX },
        { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT },
        { "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE },
        { "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE },
@@ -163,6 +162,7 @@ keyword_item lyxrcTags[] = {
        { "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
        { "\\template_path", LyXRC::RC_TEMPLATEPATH },
        { "\\tex_allows_spaces", LyXRC::RC_TEX_ALLOWS_SPACES },
+       { "\\tex_expects_windows_paths", LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS },
        { "\\ui_file", LyXRC::RC_UIFILE },
        { "\\use_alt_language", LyXRC::RC_USE_ALT_LANG },
        { "\\use_escape_chars", LyXRC::RC_USE_ESC_CHARS },
@@ -178,8 +178,7 @@ keyword_item lyxrcTags[] = {
        { "\\user_name", LyXRC::RC_USER_NAME },
        { "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
        // compatibility with versions older than 1.4.0 only
-       { "\\viewer" ,LyXRC::RC_VIEWER},
-       { "\\wheel_jump", LyXRC::RC_WHEEL_JUMP }
+       { "\\viewer" ,LyXRC::RC_VIEWER}
 };
 
 const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
@@ -227,7 +226,6 @@ void LyXRC::setDefaults() {
        geometry_width = 0;
        geometry_height = 0;
        geometry_xysaved = true;
-       wheel_jump = 5;
        // Default LaTeX font size:
        font_sizes[LyXFont::SIZE_TINY] = "5.0";
        font_sizes[LyXFont::SIZE_SCRIPT] = "7.0";
@@ -280,7 +278,7 @@ void LyXRC::setDefaults() {
        language_command_local = "\\foreignlanguage{$$lang}{";
        default_language = "english";
        show_banner = true;
-       cygwin_path_fix = false;
+       windows_style_tex_paths = false;
        tex_allows_spaces = false;
        date_insert_format = "%A, %e %B %Y";
        cursor_follows_scrollbar = false;
@@ -398,9 +396,9 @@ int LyXRC::read(LyXLex & lexrc)
                        }
                        break;
 
-               case RC_CYGWIN_PATH_FIX:
+               case RC_TEX_EXPECTS_WINDOWS_PATHS:
                        if (lexrc.next()) {
-                               cygwin_path_fix = lexrc.getBool();
+                               windows_style_tex_paths = lexrc.getBool();
                        }
                        break;
 
@@ -657,12 +655,6 @@ int LyXRC::read(LyXLex & lexrc)
                        }
                        break;
 
-               case RC_WHEEL_JUMP:
-                       if (lexrc.next()) {
-                               wheel_jump = lexrc.getInteger();
-                       }
-                       break;
-
                case RC_SCREEN_FONT_SIZES:
                        if (lexrc.next()) {
                                font_sizes[LyXFont::SIZE_TINY] =
@@ -1374,11 +1366,11 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                    index_command != system_lyxrc.index_command) {
                        os << "\\index_command \"" << index_command << "\"\n";
                }
-       case RC_CYGWIN_PATH_FIX:
+       case RC_TEX_EXPECTS_WINDOWS_PATHS:
                if (ignore_system_lyxrc ||
-                   cygwin_path_fix != system_lyxrc.cygwin_path_fix) {
-                       os << "\\cygwin_path_fix_needed "
-                          << convert<string>(cygwin_path_fix) << '\n';
+                   windows_style_tex_paths != system_lyxrc.windows_style_tex_paths) {
+                       os << "\\tex_expects_windows_paths "
+                          << convert<string>(windows_style_tex_paths) << '\n';
                }
        case RC_TEX_ALLOWS_SPACES:
                if (tex_allows_spaces != system_lyxrc.tex_allows_spaces) {
@@ -1516,11 +1508,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                        os << "\\screen_geometry_xysaved " << convert<string>(geometry_xysaved)
                           << '\n';
                }
-       case RC_WHEEL_JUMP:
-               if (ignore_system_lyxrc ||
-                   wheel_jump != system_lyxrc.wheel_jump) {
-                       os << "\\wheel_jump " << wheel_jump << '\n';
-               }
        case RC_CURSOR_FOLLOWS_SCROLLBAR:
                if (ignore_system_lyxrc ||
                    cursor_follows_scrollbar
@@ -2203,9 +2190,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
        case RC_CUSTOM_EXPORT_FORMAT:
                break;
 
-       case RC_CYGWIN_PATH_FIX:
-               break;
-
        case RC_DATE_INSERT_FORMAT:
                //xgettext:no-c-format
                str = _("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\".");
@@ -2490,6 +2474,9 @@ string const LyXRC::getDescription(LyXRCTags tag)
        case RC_TEX_ALLOWS_SPACES:
                break;
 
+       case RC_TEX_EXPECTS_WINDOWS_PATHS:
+               break;
+
        case RC_UIFILE:
                str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories.");
                break;
@@ -2517,10 +2504,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
        case RC_VIEWER:
                break;
 
-       case RC_WHEEL_JUMP:
-               str = _("The number of lines that are scrolled by mice with wheels or five button mice.");
-               break;
-
        case RC_LAST:
                break;
        }