X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=e8e4ee16db7af9310e793b14d6dc7339010736b1;hb=32f6c066ccad00e1580f1f2a5c1d989153e4a83b;hp=b58982276ea814280ec0b1b8c74be9916de682cf;hpb=ef79a1fe8aa4e3e09e215c67c96fe262968b989f;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index b58982276e..e8e4ee16db 100644
--- 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,
@@ -109,6 +112,7 @@ public:
 		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,
@@ -120,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,
@@ -164,7 +166,6 @@ public:
 		RC_SINGLE_CLOSE_TAB_BUTTON,
 		RC_SINGLE_INSTANCE,
 		RC_SORT_LAYOUTS,
-		RC_SPELL_COMMAND,
 		RC_SPELLCHECK_CONTINUOUSLY,
 		RC_SPELLCHECK_NOTES,
 		RC_SPELLCHECKER,
@@ -178,16 +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,
@@ -199,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;
 	///
@@ -217,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;
@@ -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;
 };