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 4d4dcf6c5f7dd5b6429a12e3270ccdea396522be..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,6 +80,7 @@ public:
                RC_EXAMPLEPATH,
                RC_EXPORT_OVERWRITE,
                RC_FONT_ENCODING,
+               RC_FORCE_PAINT_SINGLE_CHAR,
                RC_FILEFORMAT,
                RC_FORWARD_SEARCH_DVI,
                RC_FORWARD_SEARCH_PDF,
@@ -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,
@@ -191,21 +194,20 @@ public:
        LyXRC();
        ///
        void setDefaults();
-       ///
-       bool read(support::FileName const & filename);
+       /// \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);
        ///
        bool read(std::istream &);
 private:
        enum ReturnValues {
                ReadOK,
-               FileError,
                ReadError,
                FormatMismatch
        };
        ///
-       ReturnValues readWithoutConv(support::FileName const &);
-       ///
-       ReturnValues read(Lexer &);
+       ReturnValues read(Lexer &, bool check_format);
 public:
        ///
        typedef std::set<std::string> CommandSet;
@@ -457,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
@@ -528,6 +532,10 @@ public:
        };
        ///
        ScrollWheelZoom scroll_wheel_zoom;
+       ///
+       bool force_paint_single_char;
+       ///
+       int cursor_width;
 };