Partial fox for bug #6622: Display \utilde on screen correctly.

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 7429105a4e3f0733d8bfc8ad47cf86961828cef6..e8e4ee16db7af9310e793b14d6dc7339010736b1 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -65,6 +65,7 @@ public:
                RC_CONVERTER_CACHE_MAXAGE,
                RC_COPIER,
                RC_CURSOR_FOLLOWS_SCROLLBAR,
+               RC_CURSOR_WIDTH,
                RC_DATE_INSERT_FORMAT,
                RC_DEFAULT_DECIMAL_POINT,
                RC_DEFAULT_LANGUAGE,
@@ -79,7 +80,8 @@ public:
                RC_EXAMPLEPATH,
                RC_EXPORT_OVERWRITE,
                RC_FONT_ENCODING,
-               RC_FORMAT,
+               RC_FORCE_PAINT_SINGLE_CHAR,
+               RC_FILEFORMAT,
                RC_FORWARD_SEARCH_DVI,
                RC_FORWARD_SEARCH_PDF,
                RC_FULL_SCREEN_LIMIT,
@@ -92,6 +94,7 @@ public:
                RC_GROUP_LAYOUTS,
                RC_GUI_LANGUAGE,
                RC_HUNSPELLDIR_PATH,
+               RC_ICON_SET,
                RC_INDEX_ALTERNATIVES,
                RC_INDEX_COMMAND,
                RC_INPUT,
@@ -106,10 +109,12 @@ public:
                RC_LANGUAGE_COMMAND_END,
                RC_LANGUAGE_COMMAND_LOCAL,
                RC_LANGUAGE_GLOBAL_OPTIONS,
-               RC_LANGUAGE_PACKAGE,
-               RC_LANGUAGE_USE_BABEL,
+               RC_LANGUAGE_CUSTOM_PACKAGE,
+               RC_LANGUAGE_PACKAGE_SELECTION,
                RC_LOADSESSION,
+               RC_LYXRCFORMAT,
                RC_MACRO_EDIT_STYLE,
+               RC_MAC_DONTSWAP_CTRL_META,
                RC_MAC_LIKE_WORD_MOVEMENT,
                RC_MAKE_BACKUP,
                RC_MARK_FOREIGN_LANGUAGE,
@@ -119,9 +124,7 @@ public:
                RC_OPEN_BUFFERS_IN_TABS,
                RC_PARAGRAPH_MARKERS,
                RC_PATH_PREFIX,
-               RC_PERS_DICT,
                RC_PLAINTEXT_LINELEN,
-               RC_PLAINTEXT_ROFF_COMMAND,
                RC_PREVIEW,
                RC_PREVIEW_HASHED_LABELS,
                RC_PREVIEW_SCALE_FACTOR,
@@ -161,8 +164,8 @@ public:
                RC_SET_COLOR,
                RC_SHOW_BANNER,
                RC_SINGLE_CLOSE_TAB_BUTTON,
+               RC_SINGLE_INSTANCE,
                RC_SORT_LAYOUTS,
-               RC_SPELL_COMMAND,
                RC_SPELLCHECK_CONTINUOUSLY,
                RC_SPELLCHECK_NOTES,
                RC_SPELLCHECKER,
@@ -176,15 +179,10 @@ public:
                RC_USELASTFILEPOS,
                RC_USER_EMAIL,
                RC_USER_NAME,
-               RC_USETEMPDIR,
-               RC_USE_ALT_LANG,
                RC_USE_CONVERTER_CACHE,
-               RC_USE_ESC_CHARS,
-               RC_USE_INP_ENC,
-               RC_USE_PERS_DICT,
+               RC_USE_SYSTEM_COLORS,
                RC_USE_TOOLTIP,
                RC_USE_PIXMAP_CACHE,
-               RC_USE_SPELL_LIB,
                RC_VIEWDVI_PAPEROPTION,
                RC_VIEWER,
                RC_VIEWER_ALTERNATIVES,
@@ -196,17 +194,24 @@ public:
        LyXRC();
        ///
        void setDefaults();
+       /// \param check_format: whether to try to convert the file format,
+       /// if it is not current. this should only be true, really, for the
+       /// user's own preferences file.
+       bool read(support::FileName const & filename, bool check_format);
        ///
-       int read(support::FileName const & filename);
-       ///
-       int read(std::istream &);
+       bool read(std::istream &);
 private:
+       enum ReturnValues {
+               ReadOK,
+               ReadError,
+               FormatMismatch
+       };
        ///
-       int read(Lexer &);
+       ReturnValues read(Lexer &, bool check_format);
 public:
-       /// 
+       ///
        typedef std::set<std::string> CommandSet;
-       /// maps a format to a set of commands that can be used to 
+       /// maps a format to a set of commands that can be used to
        /// edit or view it.
        typedef std::map<std::string, CommandSet> Alternatives;
        ///
@@ -214,7 +219,7 @@ public:
                   bool ignore_system_lyxrc) const;
        /// write rc. If a specific tag is given, only output that one.
        void write(std::ostream & os,
-                  bool ignore_system_lyxrc, 
+                  bool ignore_system_lyxrc,
                   std::string const & tag = std::string()) const;
        ///
        void print() const;
@@ -351,6 +356,8 @@ public:
        bool paragraph_markers;
        /// Use tooltips?
        bool use_tooltip;
+       /// Use the colors from current system theme?
+       bool use_system_colors;
        /// Use pixmap cache?
        bool use_pixmap_cache;
        /// Spellchecker engine: aspell, hunspell, etc
@@ -374,7 +381,7 @@ public:
        ///
        std::string date_insert_format;
        ///
-       std::string language_package;
+       std::string language_custom_package;
        ///
        bool language_auto_begin;
        ///
@@ -388,7 +395,14 @@ public:
        ///
        bool language_global_options;
        ///
-       bool language_use_babel;
+       enum LangPackageSelection {
+               LP_AUTO = 0,
+               LP_BABEL,
+               LP_CUSTOM,
+               LP_NONE
+       };
+       ///
+       LangPackageSelection language_package_selection;
        ///
        bool rtl_support;
        /// bidi cursor movement: true = visual, false = logical
@@ -408,6 +422,8 @@ public:
        /// all available editors
        Alternatives editor_alternatives;
        ///
+       bool mac_dontswap_ctrl_meta;
+       ///
        bool mac_like_word_movement;
        ///
        bool cursor_follows_scrollbar;
@@ -443,6 +459,8 @@ public:
        std::string user_name;
        /// user email
        std::string user_email;
+       /// icon set name
+       std::string icon_set;
        /// True if the TeX engine cannot handle posix paths
        bool windows_style_tex_paths;
        /// True if the TeX engine can handle file names containing spaces
@@ -496,6 +514,8 @@ public:
        ///
        bool single_close_tab_button;
        ///
+       bool single_instance;
+       ///
        std::string forward_search_dvi;
        ///
        std::string forward_search_pdf;
@@ -508,10 +528,14 @@ public:
                SCROLL_WHEEL_ZOOM_OFF,
                SCROLL_WHEEL_ZOOM_CTRL,
                SCROLL_WHEEL_ZOOM_SHIFT,
-               SCROLL_WHEEL_ZOOM_OPTION
+               SCROLL_WHEEL_ZOOM_ALT
        };
        ///
-       ScrollWheelZoom scroll_whell_zoom;
+       ScrollWheelZoom scroll_wheel_zoom;
+       ///
+       bool force_paint_single_char;
+       ///
+       int cursor_width;
 };