]> git.lyx.org Git - lyx.git/blobdiff - src/LyXRC.cpp
Change string
[lyx.git] / src / LyXRC.cpp
index 4f763eddd8b2845282e1b1ea6ba7e1abc7f3bb02..92c95b0d1e5736981178ae0947990edd840e507f 100644 (file)
 
 #include "LyXRC.h"
 
-#include "debug.h"
 #include "Color.h"
 #include "Converter.h"
 #include "Format.h"
-#include "gettext.h"
 #include "Session.h"
 #include "Lexer.h"
-#include "Font.h"
+#include "FontEnums.h"
 #include "Mover.h"
 
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/userinfo.h"
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
 namespace os = support::os;
 
-using support::ascii_lowercase;
-using support::bformat;
-using support::expandPath;
-using support::FileName;
-using support::getEnv;
-using support::libFileSearch;
-using support::token;
-
-using std::cout;
-using std::endl;
-
-using std::ios;
-using std::ofstream;
-using std::ostream;
-using std::string;
-
-
 namespace {
 
 // when adding something to this array keep it sorted!
 keyword_item lyxrcTags[] = {
        { "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
+       { "\\allow_geometry_session", LyXRC::RC_GEOMETRY_SESSION },
        { "\\alternate_language", LyXRC::RC_ALT_LANG },
        { "\\auto_number", LyXRC::RC_AUTO_NUMBER },
        { "\\auto_region_delete", LyXRC::RC_AUTOREGIONDELETE },
@@ -77,6 +63,15 @@ keyword_item lyxrcTags[] = {
        { "\\bind_file", LyXRC::RC_BINDFILE },
        { "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES },
        { "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND },
+       { "\\completion_cursor_text", LyXRC::RC_COMPLETION_CURSOR_TEXT },
+       { "\\completion_inline_delay", LyXRC::RC_COMPLETION_INLINE_DELAY },
+       { "\\completion_inline_dots", LyXRC::RC_COMPLETION_INLINE_DOTS },
+       { "\\completion_inline_math", LyXRC::RC_COMPLETION_INLINE_MATH },
+       { "\\completion_inline_text", LyXRC::RC_COMPLETION_INLINE_TEXT },
+       { "\\completion_popup_after_complete", LyXRC::RC_COMPLETION_POPUP_AFTER_COMPLETE },
+       { "\\completion_popup_delay", LyXRC::RC_COMPLETION_POPUP_DELAY },
+       { "\\completion_popup_math", LyXRC::RC_COMPLETION_POPUP_MATH },
+       { "\\completion_popup_text", LyXRC::RC_COMPLETION_POPUP_TEXT },
        { "\\converter", LyXRC::RC_CONVERTER },
        { "\\converter_cache_maxage", LyXRC::RC_CONVERTER_CACHE_MAXAGE },
        { "\\copier", LyXRC::RC_COPIER },
@@ -91,8 +86,15 @@ keyword_item lyxrcTags[] = {
        { "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
        { "\\document_path", LyXRC::RC_DOCUMENTPATH },
        { "\\escape_chars", LyXRC::RC_ESC_CHARS },
+       { "\\example_path", LyXRC::RC_EXAMPLEPATH },
        { "\\font_encoding", LyXRC::RC_FONT_ENCODING },
        { "\\format", LyXRC::RC_FORMAT },
+       { "\\fullscreen_limit", LyXRC::RC_FULL_SCREEN_LIMIT },
+       { "\\fullscreen_scrollbar", LyXRC::RC_FULL_SCREEN_SCROLLBAR },
+       { "\\fullscreen_tabbar", LyXRC::RC_FULL_SCREEN_TABBAR },
+       { "\\fullscreen_toolbars", LyXRC::RC_FULL_SCREEN_TOOLBARS },
+       { "\\fullscreen_width", LyXRC::RC_FULL_SCREEN_WIDTH },
+       { "\\group_layouts", LyXRC::RC_GROUP_LAYOUTS },
        { "\\index_command", LyXRC::RC_INDEX_COMMAND },
        { "\\input", LyXRC::RC_INPUT },
        { "\\kbmap", LyXRC::RC_KBMAP },
@@ -108,9 +110,12 @@ keyword_item lyxrcTags[] = {
        { "\\language_package", LyXRC::RC_LANGUAGE_PACKAGE },
        { "\\language_use_babel", LyXRC::RC_LANGUAGE_USE_BABEL },
        { "\\load_session", LyXRC::RC_LOADSESSION },
+       { "\\macro_edit_style", LyXRC::RC_MACRO_EDIT_STYLE },
        { "\\make_backup", LyXRC::RC_MAKE_BACKUP },
        { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
+       { "\\mouse_wheel_speed", LyXRC::RC_MOUSE_WHEEL_SPEED },
        { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
+       { "\\open_buffers_in_tabs", LyXRC::RC_OPEN_BUFFERS_IN_TABS },
        { "\\path_prefix", LyXRC::RC_PATH_PREFIX },
        { "\\personal_dictionary", LyXRC::RC_PERS_DICT },
        { "\\plaintext_linelen", LyXRC::RC_PLAINTEXT_LINELEN },
@@ -146,13 +151,11 @@ 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_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 },
+       { "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS },
        { "\\spell_command", LyXRC::RC_SPELL_COMMAND },
        { "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
        { "\\template_path", LyXRC::RC_TEMPLATEPATH },
@@ -160,21 +163,25 @@ keyword_item lyxrcTags[] = {
        { "\\tex_expects_windows_paths", LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS },
        { "\\ui_file", LyXRC::RC_UIFILE },
        { "\\use_alt_language", LyXRC::RC_USE_ALT_LANG },
+       { "\\use_bundled_format", LyXRC::RC_USE_BUNDLED_FORMAT },
        { "\\use_converter_cache", LyXRC::RC_USE_CONVERTER_CACHE },
        { "\\use_escape_chars", LyXRC::RC_USE_ESC_CHARS },
        { "\\use_input_encoding", LyXRC::RC_USE_INP_ENC },
        { "\\use_lastfilepos", LyXRC::RC_USELASTFILEPOS },
        { "\\use_personal_dictionary", LyXRC::RC_USE_PERS_DICT },
+       { "\\use_pixmap_cache", LyXRC::RC_USE_PIXMAP_CACHE },
        // compatibility with versions older than 1.4.0 only
        { "\\use_pspell", LyXRC::RC_USE_SPELL_LIB },
        { "\\use_spell_lib", LyXRC::RC_USE_SPELL_LIB },
        // compatibility with versions older than 1.4.0 only
        { "\\use_tempdir", LyXRC::RC_USETEMPDIR },
+       { "\\use_tooltip", LyXRC::RC_USE_TOOLTIP },
        { "\\user_email", LyXRC::RC_USER_EMAIL },
        { "\\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}
+       { "\\viewer", LyXRC::RC_VIEWER},
+       { "\\visual_cursor" ,LyXRC::RC_VISUAL_CURSOR}
 };
 
 const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
@@ -220,20 +227,18 @@ void LyXRC::setDefaults() {
        dpi = 75;
        // Because a screen typically is wider than a piece of paper:
        zoom = 150;
-       geometry_width = 0;
-       geometry_height = 0;
-       geometry_xysaved = true;
+       allow_geometry_session = true;
        // Default LaTeX font size:
-       font_sizes[Font::SIZE_TINY] = "5.0";
-       font_sizes[Font::SIZE_SCRIPT] = "7.0";
-       font_sizes[Font::SIZE_FOOTNOTE] = "8.0";
-       font_sizes[Font::SIZE_SMALL] = "9.0";
-       font_sizes[Font::SIZE_NORMAL] = "10.0";
-       font_sizes[Font::SIZE_LARGE] = "12.0";
-       font_sizes[Font::SIZE_LARGER] = "14.4";
-       font_sizes[Font::SIZE_LARGEST] = "17.26";
-       font_sizes[Font::SIZE_HUGE] = "20.74";
-       font_sizes[Font::SIZE_HUGER] = "24.88";
+       font_sizes[FONT_SIZE_TINY] = "5.0";
+       font_sizes[FONT_SIZE_SCRIPT] = "7.0";
+       font_sizes[FONT_SIZE_FOOTNOTE] = "8.0";
+       font_sizes[FONT_SIZE_SMALL] = "9.0";
+       font_sizes[FONT_SIZE_NORMAL] = "10.0";
+       font_sizes[FONT_SIZE_LARGE] = "12.0";
+       font_sizes[FONT_SIZE_LARGER] = "14.4";
+       font_sizes[FONT_SIZE_LARGEST] = "17.26";
+       font_sizes[FONT_SIZE_HUGE] = "20.74";
+       font_sizes[FONT_SIZE_HUGER] = "24.88";
        use_scalable_fonts = true;
        roman_font_name = "";
        sans_font_name = "";
@@ -242,6 +247,7 @@ void LyXRC::setDefaults() {
        auto_region_delete = true;
        auto_reset_options = false;
        plaintext_linelen = 65;
+       mouse_wheel_speed = 1.0;
        num_lastfiles = maxlastfiles;
        check_lastfiles = true;
        use_lastfilepos = true;
@@ -259,6 +265,7 @@ void LyXRC::setDefaults() {
        isp_use_esc_chars = false;
        use_kbmap = false;
        rtl_support = true;
+       visual_cursor = false;
        auto_number = true;
        mark_foreign_language = true;
        language_auto_begin = true;
@@ -268,23 +275,49 @@ void LyXRC::setDefaults() {
        language_package = "\\usepackage{babel}";
        language_command_begin = "\\selectlanguage{$$lang}";
        language_command_local = "\\foreignlanguage{$$lang}{";
+       sort_layouts = false;
+       group_layouts = true;
        default_language = "english";
        show_banner = true;
        windows_style_tex_paths = false;
        tex_allows_spaces = false;
        date_insert_format = "%x";
        cursor_follows_scrollbar = false;
+       macro_edit_style = MACRO_EDIT_INLINE_BOX;
        dialogs_iconify_with_main = false;
        label_init_length = 3;
        preview = PREVIEW_OFF;
        preview_hashed_labels  = false;
        preview_scale_factor = "0.9";
        use_converter_cache = true;
+       use_tooltip = true;
+       use_pixmap_cache = false;
        converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
-
        user_name = to_utf8(support::user_name());
-
        user_email = to_utf8(support::user_email());
+#ifdef __APPLE_CC__
+       open_buffers_in_tabs = false;
+#else
+       open_buffers_in_tabs = true;
+#endif
+       use_bundled_format = false;
+
+       // Fullscreen settings
+       full_screen_limit = false;
+       full_screen_toolbars = true;
+       full_screen_tabbar = true;
+       full_screen_scrollbar = true;
+       full_screen_width = 700;
+
+       completion_cursor_text = true;
+       completion_popup_math = true;
+       completion_popup_text = false;
+       completion_popup_delay = 2.0;
+       completion_popup_after_complete = true;
+       completion_inline_math = true;
+       completion_inline_text = false;
+       completion_inline_dots = -1;
+       completion_inline_delay = 0.2;
 }
 
 
@@ -312,13 +345,13 @@ int LyXRC::read(FileName const & filename)
        lexrc.setFile(filename);
        if (!lexrc.isOK()) return -2;
 
-       LYXERR(Debug::LYXRC) << "Reading '" << filename << "'..." << endl;
+       LYXERR(Debug::LYXRC, "Reading '" << filename << "'...");
 
        return read(lexrc);
 }
 
 
-int LyXRC::read(std::istream & is)
+int LyXRC::read(istream & is)
 {
        Lexer lexrc(lyxrcTags, lyxrcCount);
        if (lyxerr.debugging(Debug::PARSER))
@@ -327,7 +360,7 @@ int LyXRC::read(std::istream & is)
        lexrc.setStream(is);
        if (!lexrc.isOK()) return -2;
 
-       LYXERR(Debug::LYXRC) << "Reading istream..." << endl;
+       LYXERR(Debug::LYXRC, "Reading istream...");
 
        return read(lexrc);
 }
@@ -637,63 +670,51 @@ int LyXRC::read(Lexer & lexrc)
                        }
                        break;
 
-               case RC_SCREEN_GEOMETRY_HEIGHT:
-                       if (lexrc.next()) {
-                               geometry_height = lexrc.getInteger();
-                       }
-                       break;
-
-               case RC_SCREEN_GEOMETRY_WIDTH:
-                       if (lexrc.next()) {
-                               geometry_width = lexrc.getInteger();
-                       }
-                       break;
-
-               case RC_SCREEN_GEOMETRY_XYSAVED:
+               case RC_GEOMETRY_SESSION:
                        if (lexrc.next()) {
-                               geometry_xysaved = lexrc.getBool();
+                               allow_geometry_session = lexrc.getBool();
                        }
                        break;
 
                case RC_SCREEN_FONT_SIZES:
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_TINY] =
+                               font_sizes[FONT_SIZE_TINY] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_SCRIPT] =
+                               font_sizes[FONT_SIZE_SCRIPT] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_FOOTNOTE] =
+                               font_sizes[FONT_SIZE_FOOTNOTE] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_SMALL] =
+                               font_sizes[FONT_SIZE_SMALL] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_NORMAL] =
+                               font_sizes[FONT_SIZE_NORMAL] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_LARGE] =
+                               font_sizes[FONT_SIZE_LARGE] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_LARGER] =
+                               font_sizes[FONT_SIZE_LARGER] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_LARGEST] =
+                               font_sizes[FONT_SIZE_LARGEST] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_HUGE] =
+                               font_sizes[FONT_SIZE_HUGE] =
                                        lexrc.getString();
                        }
                        if (lexrc.next()) {
-                               font_sizes[Font::SIZE_HUGER] =
+                               font_sizes[FONT_SIZE_HUGER] =
                                        lexrc.getString();
                        }
                        break;
@@ -717,6 +738,13 @@ int LyXRC::read(Lexer & lexrc)
                        }
                        break;
 
+               case RC_EXAMPLEPATH:
+                       if (lexrc.next()) {
+                               example_path = os::internal_path(lexrc.getString());
+                               example_path = expandPath(example_path);
+                       }
+                       break;
+
                case RC_TEMPLATEPATH:
                        if (lexrc.next()) {
                                template_path = os::internal_path(lexrc.getString());
@@ -749,6 +777,66 @@ int LyXRC::read(Lexer & lexrc)
                        }
                        break;
 
+               case RC_MOUSE_WHEEL_SPEED:
+                       if (lexrc.next()) {
+                               mouse_wheel_speed = lexrc.getFloat();
+                       }
+                       break;
+
+               case RC_COMPLETION_INLINE_DELAY:
+                       if (lexrc.next()) {
+                               completion_inline_delay = lexrc.getFloat();
+                       }
+                       break;
+
+               case RC_COMPLETION_INLINE_MATH:
+                       if (lexrc.next()) {
+                               completion_inline_math = lexrc.getBool();
+                       }
+                       break;
+
+               case RC_COMPLETION_INLINE_TEXT:
+                       if (lexrc.next()) {
+                               completion_inline_text = lexrc.getBool();
+                       }
+                       break;
+
+               case RC_COMPLETION_INLINE_DOTS:
+                       if (lexrc.next()) {
+                               completion_inline_dots = lexrc.getInteger();
+                       }
+                       break;
+
+               case RC_COMPLETION_POPUP_DELAY:
+                       if (lexrc.next()) {
+                               completion_popup_delay = lexrc.getFloat();
+                       }
+                       break;
+
+               case RC_COMPLETION_POPUP_MATH:
+                       if (lexrc.next()) {
+                               completion_popup_math = lexrc.getBool();
+                       }
+                       break;
+
+               case RC_COMPLETION_POPUP_TEXT:
+                       if (lexrc.next()) {
+                               completion_popup_text = lexrc.getBool();
+                       }
+                       break;
+
+               case RC_COMPLETION_CURSOR_TEXT:
+                       if (lexrc.next()) {
+                               completion_cursor_text = lexrc.getBool();
+                       }
+                       break;
+
+               case RC_COMPLETION_POPUP_AFTER_COMPLETE:
+                       if (lexrc.next()) {
+                               completion_popup_after_complete = lexrc.getBool();
+                       }
+                       break;
+
                case RC_NUMLASTFILES:
                        if (lexrc.next()) {
                                num_lastfiles = lexrc.getInteger();
@@ -854,6 +942,16 @@ int LyXRC::read(Lexer & lexrc)
                        }
                        break;
 
+               case RC_MACRO_EDIT_STYLE:
+                       if (lexrc.next()) {
+                               switch (lexrc.getInteger()) {
+                               case 0: macro_edit_style = MACRO_EDIT_INLINE_BOX; break;
+                               case 1: macro_edit_style = MACRO_EDIT_INLINE; break;
+                               case 2: macro_edit_style = MACRO_EDIT_LIST; break;
+                               }
+                       }
+                       break;
+
                case RC_DIALOGS_ICONIFY_WITH_MAIN:
                        if (lexrc.next()) {
                                dialogs_iconify_with_main = lexrc.getBool();
@@ -901,6 +999,16 @@ int LyXRC::read(Lexer & lexrc)
                                isp_use_pers_dict = lexrc.getBool();
                        }
                        break;
+               case RC_USE_TOOLTIP:
+                       if (lexrc.next()) {
+                               use_tooltip = lexrc.getBool();
+                       }
+                       break;
+               case RC_USE_PIXMAP_CACHE:
+                       if (lexrc.next()) {
+                               use_pixmap_cache = lexrc.getBool();
+                       }
+                       break;
                case RC_USE_ESC_CHARS:
                        if (lexrc.next()) {
                                isp_use_esc_chars = lexrc.getBool();
@@ -982,6 +1090,11 @@ int LyXRC::read(Lexer & lexrc)
                                rtl_support = lexrc.getBool();
                        }
                        break;
+               case RC_VISUAL_CURSOR:
+                       if (lexrc.next()) {
+                               visual_cursor = lexrc.getBool();
+                       }
+                       break;
                case RC_AUTO_NUMBER:
                        if (lexrc.next()) {
                                auto_number = lexrc.getBool();
@@ -1075,7 +1188,7 @@ int LyXRC::read(Lexer & lexrc)
                        int flgs = Format::none;
                        while (!flags.empty()) {
                                string flag;
-                               flags = support::split(flags, flag, ',');
+                               flags = split(flags, flag, ',');
                                if (flag == "document")
                                        flgs |= Format::document;
                                else if (flag == "vector")
@@ -1171,6 +1284,43 @@ int LyXRC::read(Lexer & lexrc)
                                        convert<unsigned int>(lexrc.getString());
                        break;
 
+               case RC_SORT_LAYOUTS:
+                       if (lexrc.next())
+                               sort_layouts = lexrc.getBool();
+                       break;
+               case RC_GROUP_LAYOUTS:
+                       if (lexrc.next())
+                               group_layouts = lexrc.getBool();
+                       break;
+               case RC_FULL_SCREEN_LIMIT:
+                       if (lexrc.next())
+                               full_screen_limit = lexrc.getBool();
+                       break;
+               case RC_FULL_SCREEN_TOOLBARS:
+                       if (lexrc.next())
+                               full_screen_toolbars = lexrc.getBool();
+                       break;
+               case RC_FULL_SCREEN_SCROLLBAR:
+                       if (lexrc.next())
+                               full_screen_scrollbar = lexrc.getBool();
+                       break;
+               case RC_FULL_SCREEN_TABBAR:
+                       if (lexrc.next())
+                               full_screen_tabbar = lexrc.getBool();
+                       break;
+               case RC_FULL_SCREEN_WIDTH:
+                       if (lexrc.next())
+                               full_screen_width = lexrc.getInteger();
+                       break;
+               case RC_OPEN_BUFFERS_IN_TABS:
+                       if (lexrc.next())
+                               open_buffers_in_tabs = lexrc.getBool();
+                               break;
+               case RC_USE_BUNDLED_FORMAT:
+                       if (lexrc.next())
+                               use_bundled_format = lexrc.getBool();
+                               break;
+
                case RC_LAST: break; // this is just a dummy
                }
        }
@@ -1202,7 +1352,7 @@ void LyXRC::print() const
 
 class SameMover {
 public:
-       typedef std::pair<std::string, SpecialisedMover> Data;
+       typedef pair<string, SpecialisedMover> Data;
 
        SameMover(Data const & comparison)
                : comparison_(comparison) {}
@@ -1333,7 +1483,22 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
-
+       case RC_SORT_LAYOUTS:
+               if (ignore_system_lyxrc ||
+                   sort_layouts != system_lyxrc.sort_layouts) {
+                       os << "# Sort layouts alphabetically.\n"
+                          << "\\sort_layouts " << convert<string>(sort_layouts) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_GROUP_LAYOUTS:
+               if (ignore_system_lyxrc ||
+                   group_layouts != system_lyxrc.group_layouts) {
+                       os << "# Group layouts by their category.\n"
+                          << "\\group_layouts " << convert<string>(group_layouts) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
        case RC_VIEWDVI_PAPEROPTION:
                if (ignore_system_lyxrc ||
                    view_dvi_paper_option
@@ -1552,26 +1717,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
-       case RC_SCREEN_GEOMETRY_HEIGHT:
-               if (ignore_system_lyxrc ||
-                   geometry_height != system_lyxrc.geometry_height) {
-                       os << "\\screen_geometry_height " << geometry_height
-                          << '\n';
-               }
-               if (tag != RC_LAST)
-                       break;
-       case RC_SCREEN_GEOMETRY_WIDTH:
-               if (ignore_system_lyxrc ||
-                   geometry_width != system_lyxrc.geometry_width) {
-                       os << "\\screen_geometry_width " << geometry_width
-                          << '\n';
-               }
-               if (tag != RC_LAST)
-                       break;
-       case RC_SCREEN_GEOMETRY_XYSAVED:
+       case RC_GEOMETRY_SESSION:
                if (ignore_system_lyxrc ||
-                   geometry_xysaved != system_lyxrc.geometry_xysaved) {
-                       os << "\\screen_geometry_xysaved " << convert<string>(geometry_xysaved)
+                   allow_geometry_session != system_lyxrc.allow_geometry_session) {
+                       os << "\\allow_geometry_session " << convert<string>(allow_geometry_session)
                           << '\n';
                }
                if (tag != RC_LAST)
@@ -1585,6 +1734,19 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_MACRO_EDIT_STYLE:
+               if (ignore_system_lyxrc ||
+                   macro_edit_style
+                   != system_lyxrc.macro_edit_style) {
+                       os << "\\macro_edit_style ";
+                       switch (macro_edit_style) {
+                       case MACRO_EDIT_INLINE_BOX: os << "0\n"; break;
+                       case MACRO_EDIT_INLINE: os << "1\n"; break;
+                       case MACRO_EDIT_LIST: os << "2\n"; break;
+                       }
+               }
+               if (tag != RC_LAST)
+                       break;
        case RC_DIALOGS_ICONIFY_WITH_MAIN:
                if (ignore_system_lyxrc ||
                    dialogs_iconify_with_main
@@ -1654,39 +1816,102 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                        break;
        case RC_SCREEN_FONT_SIZES:
                if (ignore_system_lyxrc ||
-                   font_sizes[Font::SIZE_TINY]
-                   != system_lyxrc.font_sizes[Font::SIZE_TINY] ||
-                   font_sizes[Font::SIZE_SCRIPT]
-                   != system_lyxrc.font_sizes[Font::SIZE_SCRIPT] ||
-                   font_sizes[Font::SIZE_FOOTNOTE]
-                   != system_lyxrc.font_sizes[Font::SIZE_FOOTNOTE] ||
-                   font_sizes[Font::SIZE_SMALL]
-                   != system_lyxrc.font_sizes[Font::SIZE_SMALL] ||
-                   font_sizes[Font::SIZE_NORMAL]
-                   != system_lyxrc.font_sizes[Font::SIZE_NORMAL] ||
-                   font_sizes[Font::SIZE_LARGE]
-                   != system_lyxrc.font_sizes[Font::SIZE_LARGE] ||
-                   font_sizes[Font::SIZE_LARGER]
-                   != system_lyxrc.font_sizes[Font::SIZE_LARGER] ||
-                   font_sizes[Font::SIZE_LARGEST]
-                   != system_lyxrc.font_sizes[Font::SIZE_LARGEST] ||
-                   font_sizes[Font::SIZE_HUGE]
-                   != system_lyxrc.font_sizes[Font::SIZE_HUGE] ||
-                   font_sizes[Font::SIZE_HUGER]
-                   != system_lyxrc.font_sizes[Font::SIZE_HUGER]) {
+                   font_sizes[FONT_SIZE_TINY]
+                   != system_lyxrc.font_sizes[FONT_SIZE_TINY] ||
+                   font_sizes[FONT_SIZE_SCRIPT]
+                   != system_lyxrc.font_sizes[FONT_SIZE_SCRIPT] ||
+                   font_sizes[FONT_SIZE_FOOTNOTE]
+                   != system_lyxrc.font_sizes[FONT_SIZE_FOOTNOTE] ||
+                   font_sizes[FONT_SIZE_SMALL]
+                   != system_lyxrc.font_sizes[FONT_SIZE_SMALL] ||
+                   font_sizes[FONT_SIZE_NORMAL]
+                   != system_lyxrc.font_sizes[FONT_SIZE_NORMAL] ||
+                   font_sizes[FONT_SIZE_LARGE]
+                   != system_lyxrc.font_sizes[FONT_SIZE_LARGE] ||
+                   font_sizes[FONT_SIZE_LARGER]
+                   != system_lyxrc.font_sizes[FONT_SIZE_LARGER] ||
+                   font_sizes[FONT_SIZE_LARGEST]
+                   != system_lyxrc.font_sizes[FONT_SIZE_LARGEST] ||
+                   font_sizes[FONT_SIZE_HUGE]
+                   != system_lyxrc.font_sizes[FONT_SIZE_HUGE] ||
+                   font_sizes[FONT_SIZE_HUGER]
+                   != system_lyxrc.font_sizes[FONT_SIZE_HUGER]) {
                        os.setf(ios::fixed);
                        os.precision(2);
                        os << "\\screen_font_sizes"
-                          << ' ' << font_sizes[Font::SIZE_TINY]
-                          << ' ' << font_sizes[Font::SIZE_SCRIPT]
-                          << ' ' << font_sizes[Font::SIZE_FOOTNOTE]
-                          << ' ' << font_sizes[Font::SIZE_SMALL]
-                          << ' ' << font_sizes[Font::SIZE_NORMAL]
-                          << ' ' << font_sizes[Font::SIZE_LARGE]
-                          << ' ' << font_sizes[Font::SIZE_LARGER]
-                          << ' ' << font_sizes[Font::SIZE_LARGEST]
-                          << ' ' << font_sizes[Font::SIZE_HUGE]
-                          << ' ' << font_sizes[Font::SIZE_HUGER]
+                          << ' ' << font_sizes[FONT_SIZE_TINY]
+                          << ' ' << font_sizes[FONT_SIZE_SCRIPT]
+                          << ' ' << font_sizes[FONT_SIZE_FOOTNOTE]
+                          << ' ' << font_sizes[FONT_SIZE_SMALL]
+                          << ' ' << font_sizes[FONT_SIZE_NORMAL]
+                          << ' ' << font_sizes[FONT_SIZE_LARGE]
+                          << ' ' << font_sizes[FONT_SIZE_LARGER]
+                          << ' ' << font_sizes[FONT_SIZE_LARGEST]
+                          << ' ' << font_sizes[FONT_SIZE_HUGE]
+                          << ' ' << font_sizes[FONT_SIZE_HUGER]
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_FULL_SCREEN_LIMIT:
+               if (ignore_system_lyxrc ||
+                   full_screen_limit != system_lyxrc.full_screen_limit) {
+                       os << "\\fullscreen_limit "
+                          << convert<string>(full_screen_limit)
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_FULL_SCREEN_TOOLBARS:
+               if (ignore_system_lyxrc ||
+                   full_screen_toolbars != system_lyxrc.full_screen_toolbars) {
+                       os << "\\fullscreen_toolbars "
+                          << convert<string>(full_screen_toolbars)
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_FULL_SCREEN_SCROLLBAR:
+               if (ignore_system_lyxrc ||
+                   full_screen_scrollbar != system_lyxrc.full_screen_scrollbar) {
+                       os << "\\fullscreen_scrollbar "
+                          << convert<string>(full_screen_scrollbar)
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_FULL_SCREEN_TABBAR:
+               if (ignore_system_lyxrc ||
+                   full_screen_tabbar != system_lyxrc.full_screen_tabbar) {
+                       os << "\\fullscreen_tabbar "
+                          << convert<string>(full_screen_tabbar)
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_FULL_SCREEN_WIDTH:
+               if (ignore_system_lyxrc ||
+                   full_screen_width != system_lyxrc.full_screen_width) {
+                       os << "\\fullscreen_width "
+                          << convert<string>(full_screen_width)
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_OPEN_BUFFERS_IN_TABS:
+               if (ignore_system_lyxrc ||
+                   open_buffers_in_tabs != system_lyxrc.open_buffers_in_tabs) {
+                       os << "\\open_buffers_in_tabs "
+                          << convert<string>(open_buffers_in_tabs)
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_USE_BUNDLED_FORMAT:
+               if (ignore_system_lyxrc ||
+                   use_bundled_format != system_lyxrc.use_bundled_format) {
+                       os << "\\use_bundled_format "
+                          << convert<string>(use_bundled_format)
                           << '\n';
                }
                if (tag != RC_LAST)
@@ -1928,6 +2153,84 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_MOUSE_WHEEL_SPEED:
+               if (ignore_system_lyxrc ||
+                   mouse_wheel_speed != system_lyxrc.mouse_wheel_speed) {
+                       os << "\\mouse_wheel_speed " << mouse_wheel_speed << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_INLINE_DELAY:
+               if (ignore_system_lyxrc ||
+                   completion_inline_delay != system_lyxrc.completion_inline_delay) {
+                       os << "\\completion_inline_delay " << completion_inline_delay << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_INLINE_MATH:
+               if (ignore_system_lyxrc ||
+                   completion_inline_math != system_lyxrc.completion_inline_math) {
+                       os << "\\completion_inline_math "
+                               << convert<string>(completion_inline_math) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_INLINE_TEXT:
+               if (ignore_system_lyxrc ||
+                   completion_inline_text != system_lyxrc.completion_inline_text) {
+                       os << "\\completion_inline_text "
+                               << convert<string>(completion_inline_text) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_INLINE_DOTS:
+               if (ignore_system_lyxrc ||
+                   completion_inline_dots != system_lyxrc.completion_inline_dots) {
+                       os << "\\completion_inline_dots "
+                               << convert<string>(completion_inline_dots) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_POPUP_DELAY:
+               if (ignore_system_lyxrc ||
+                   completion_popup_delay != system_lyxrc.completion_popup_delay) {
+                       os << "\\completion_popup_delay " << completion_popup_delay << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_POPUP_MATH:
+               if (ignore_system_lyxrc ||
+                   completion_popup_math != system_lyxrc.completion_popup_math) {
+                       os << "\\completion_popup_math "
+                               << convert<string>(completion_popup_math) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_POPUP_TEXT:
+               if (ignore_system_lyxrc ||
+                   completion_popup_text != system_lyxrc.completion_popup_text) {
+                       os << "\\completion_popup_text "
+                               << convert<string>(completion_popup_text) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_CURSOR_TEXT:
+               if (ignore_system_lyxrc ||
+                   completion_cursor_text != system_lyxrc.completion_cursor_text) {
+                       os << "\\completion_cursor_text "
+                          << convert<string>(completion_cursor_text) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_COMPLETION_POPUP_AFTER_COMPLETE:
+               if (ignore_system_lyxrc ||
+                   completion_popup_after_complete
+                   != system_lyxrc.completion_popup_after_complete) {
+                       os << "\\completion_popup_after_complete "
+                               << convert<string>(completion_popup_after_complete) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
        case RC_NUMLASTFILES:
                if (ignore_system_lyxrc ||
                    num_lastfiles != system_lyxrc.num_lastfiles) {
@@ -1943,6 +2246,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_EXAMPLEPATH:
+               if (ignore_system_lyxrc ||
+                   example_path != system_lyxrc.example_path) {
+                       string const path = os::external_path(example_path);
+                       os << "\\example_path \"" << path << "\"\n";
+               }
+               if (tag != RC_LAST)
+                       break;
        case RC_TEMPLATEPATH:
                if (ignore_system_lyxrc ||
                    template_path != system_lyxrc.template_path) {
@@ -2064,6 +2375,20 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_USE_TOOLTIP:
+               if (ignore_system_lyxrc ||
+                   use_tooltip != system_lyxrc.use_tooltip) {
+                       os << "\\use_tooltip "
+                          << convert<string>(use_tooltip)
+                          << '\n';
+               }
+       case RC_USE_PIXMAP_CACHE:
+               if (ignore_system_lyxrc ||
+                   use_pixmap_cache != system_lyxrc.use_pixmap_cache) {
+                       os << "\\use_pixmap_cache "
+                          << convert<string>(use_pixmap_cache)
+                          << '\n';
+               }
        case RC_PERS_DICT:
                if (isp_pers_dict != system_lyxrc.isp_pers_dict) {
                        string const path = os::external_path(isp_pers_dict);
@@ -2093,6 +2418,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_VISUAL_CURSOR:
+               if (ignore_system_lyxrc ||
+                       visual_cursor != system_lyxrc.visual_cursor) {
+                       os << "\\visual_cursor " << convert<string>(visual_cursor) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
        case RC_LANGUAGE_PACKAGE:
                if (ignore_system_lyxrc ||
                    language_package != system_lyxrc.language_package) {
@@ -2218,12 +2550,12 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                                   << cit->shortcut() << "\" \""
                                   << cit->viewer() << "\" \""
                                   << cit->editor() << "\" \"";
-                               std::vector<string> flags;
+                               vector<string> flags;
                                if (cit->documentFormat())
                                        flags.push_back("document");
                                if (cit->vectorFormat())
                                        flags.push_back("vector");
-                               os << support::getStringFromVector(flags);
+                               os << getStringFromVector(flags);
                                os << "\"\n";
                        }
                }
@@ -2284,10 +2616,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 
                for (; it != end; ++it) {
                        Movers::const_iterator const sysit =
-                               std::find_if(sysbegin, sysend, SameMover(*it));
+                               find_if(sysbegin, sysend, SameMover(*it));
                        if (sysit == sysend) {
-                               std::string const & fmt = it->first;
-                               std::string const & command =
+                               string const & fmt = it->first;
+                               string const & command =
                                        it->second.command();
 
                                os << "\\copier " << fmt
@@ -2374,6 +2706,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen.");
                break;
 
+       case RC_SHOW_MACRO_LABEL:
+               str = _("Show a small box around a Math Macro with the macro name when the cursor is inside.");
+               break;
+
        case RC_CUSTOM_EXPORT_COMMAND:
                break;
 
@@ -2385,6 +2721,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\".");
                break;
 
+       case RC_DEFFILE:
+               str = _("Command definition file. Can either specify an absolute path, or LyX will look in its global and local commands/ directories.");
+               break;
+
        case RC_DEFAULT_LANGUAGE:
                str = _("New documents will be assigned this language.");
                break;
@@ -2410,6 +2750,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Specify additional chars that can be part of a word.");
                break;
 
+       case RC_EXAMPLEPATH:
+               str = _("The path that LyX will set when offering to choose an example. An empty value selects the directory LyX was started from.");
+               break;
+
        case RC_FONT_ENCODING:
                str = _("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages.");
                break;
@@ -2482,6 +2826,47 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Select to control the highlighting of words with a language foreign to that of the document.");
                break;
 
+       case RC_MOUSE_WHEEL_SPEED:
+               str = bformat(_("The scrolling speed of the mouse wheel."),
+                     maxlastfiles);
+               break;
+
+       case RC_COMPLETION_POPUP_DELAY:
+               str = _("The completion popup delay.");
+               break;
+
+       case RC_COMPLETION_POPUP_MATH:
+               str = _("Select to display the completion popup in math mode.");
+               break;
+
+       case RC_COMPLETION_POPUP_TEXT:
+               str = _("Select to display the completion popup in text mode.");
+               break;
+
+       case RC_COMPLETION_POPUP_AFTER_COMPLETE:
+               str = _("Show the completion popup without delay after non-unique completion attempt.");
+               break;
+
+       case RC_COMPLETION_POPUP_TEXT:
+               str = _("Show a small triangle on the cursor to indicate that a completion is available.");
+               break;
+
+       case RC_COMPLETION_POPUP_DELAY:
+               str = _("The inline completion delay.");
+               break;
+
+       case RC_COMPLETION_INLINE_MATH:
+               str = _("Select to display the inline completion in math mode.");
+               break;
+
+       case RC_COMPLETION_INLINE_TEXT:
+               str = _("Select to display the inline completion in text mode.");
+               break;
+
+       case RC_COMPLETION_INLINE_DOTS:
+               str = _("Use \"...\" to shorten long completions.");
+               break;
+
        case RC_NUMLASTFILES:
                str = bformat(_("Maximal number of lastfiles. Up to %1$d can appear in the file menu."),
                        maxlastfiles);
@@ -2586,6 +2971,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic).");
                break;
 
+       case RC_VISUAL_CURSOR:
+               str = _("Select to have visual bidi cursor movement, unselect for logical movement.");
+               break;
+
        case RC_SCREEN_DPI:
                str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
                break;
@@ -2614,13 +3003,8 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper.");
                break;
 
-       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;
-
-       case RC_SCREEN_GEOMETRY_XYSAVED:
-               str = _("Allow session manager to save and restore windows position.");
+       case RC_GEOMETRY_SESSION:
+               str = _("Allow session manager to save and restore windows geometry.");
                break;
 
        case RC_SERVERPIPE:
@@ -2669,6 +3053,14 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Specify whether to pass the -T input encoding option to ispell. Enable this if you cannot check the spelling of words containing accented letters. This may not work with all dictionaries.");
                break;
 
+       case RC_USE_TOOLTIP:
+               str = _("Enable the automatic appearance of tool tips in the work area.");
+               break;
+
+       case RC_USE_PIXMAP_CACHE:
+               str = _("Enable the pixmap cache that might improve performance on Mac and Windows.");
+               break;
+
        case RC_USE_SPELL_LIB:
                break;