X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=af28ce0129a2cfe53c35786b69bfa2d5812790b5;hb=021f51e19b3751f8f15d8bd89f7aa6a109624b29;hp=a1004c360e901d9b3c4b51e9562723111b4617a5;hpb=3e18652f8e2ed4777de927f0442068e1827e8acf;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index a1004c360e..af28ce0129 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -22,8 +22,10 @@
 
 #include "support/strfwd.h"
 
+#include <map>
 #include <set>
 #include <string>
+#include <vector>
 
 
 namespace lyx {
@@ -40,8 +42,6 @@ public:
 		RC_ACCEPT_COMPOUND = 1,
 		RC_ALT_LANG,
 		RC_AUTOCORRECTION_MATH,
-		RC_PLAINTEXT_LINELEN,
-		RC_PLAINTEXT_ROFF_COMMAND,
 		RC_AUTOREGIONDELETE,
 		RC_AUTORESET_OPTIONS,
 		RC_AUTOSAVE,
@@ -65,16 +65,15 @@ public:
 		RC_CONVERTER_CACHE_MAXAGE,
 		RC_COPIER,
 		RC_CURSOR_FOLLOWS_SCROLLBAR,
-		RC_MAC_LIKE_WORD_MOVEMENT,
 		RC_DATE_INSERT_FORMAT,
-		RC_DEFFILE,
 		RC_DEFAULT_LANGUAGE,
 		RC_DEFAULT_VIEW_FORMAT,
-		RC_GUI_LANGUAGE,
 		RC_DEFAULT_PAPERSIZE,
+		RC_DEFFILE,
 		RC_DIALOGS_ICONIFY_WITH_MAIN,
 		RC_DISPLAY_GRAPHICS,
 		RC_DOCUMENTPATH,
+		RC_EDITOR_ALTERNATIVES,
 		RC_ESC_CHARS,
 		RC_EXAMPLEPATH,
 		RC_FONT_ENCODING,
@@ -87,6 +86,8 @@ public:
 		RC_FULL_SCREEN_WIDTH,
 		RC_GEOMETRY_SESSION,
 		RC_GROUP_LAYOUTS,
+		RC_GUI_LANGUAGE,
+		RC_HUNSPELLDIR_PATH,
 		RC_INDEX_ALTERNATIVES,
 		RC_INDEX_COMMAND,
 		RC_INPUT,
@@ -106,13 +107,18 @@ public:
 		RC_LANGUAGE_USE_BABEL,
 		RC_LOADSESSION,
 		RC_MACRO_EDIT_STYLE,
+		RC_MAC_LIKE_WORD_MOVEMENT,
 		RC_MAKE_BACKUP,
 		RC_MARK_FOREIGN_LANGUAGE,
 		RC_MOUSE_WHEEL_SPEED,
 		RC_NOMENCL_COMMAND,
 		RC_NUMLASTFILES,
+		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,
@@ -149,10 +155,11 @@ public:
 		RC_SERVERPIPE,
 		RC_SET_COLOR,
 		RC_SHOW_BANNER,
-		RC_OPEN_BUFFERS_IN_TABS,
+		RC_SINGLE_CLOSE_TAB_BUTTON,
 		RC_SORT_LAYOUTS,
 		RC_SPELL_COMMAND,
 		RC_SPELLCHECK_CONTINUOUSLY,
+		RC_SPELLCHECKER,
 		RC_SPLITINDEX_COMMAND,
 		RC_TEMPDIRPATH,
 		RC_TEMPLATEPATH,
@@ -174,6 +181,7 @@ public:
 		RC_USE_SPELL_LIB,
 		RC_VIEWDVI_PAPEROPTION,
 		RC_VIEWER,
+		RC_VIEWER_ALTERNATIVES,
 		RC_VISUAL_CURSOR,
 		RC_LAST
 	};
@@ -190,6 +198,11 @@ private:
 	///
 	int read(Lexer &);
 public:
+	/// 
+	typedef std::set<std::string> CommandSet;
+	/// maps a format to a set of commands that can be used to 
+	/// edit or view it.
+	typedef std::map<std::string, CommandSet> Alternatives;
 	///
 	void write(support::FileName const & filename,
 		   bool ignore_system_lyxrc) const;
@@ -250,13 +263,13 @@ public:
 	/// command to run chktex incl. options
 	std::string chktex_command;
 	/// all available commands to run bibtex incl. options
-	std::set<std::string> bibtex_alternatives;
+	CommandSet bibtex_alternatives;
 	/// command to run bibtex incl. options
 	std::string bibtex_command;
 	/// command to run japanese bibtex incl. options
 	std::string jbibtex_command;
 	/// all available index commands incl. options
-	std::set<std::string> index_alternatives;
+	CommandSet index_alternatives;
 	/// command to run makeindex incl. options or other index programs
 	std::string index_command;
 	/// command to run japanese index program incl. options
@@ -276,6 +289,8 @@ public:
 	///
 	std::string thesaurusdir_path;
 	///
+	std::string hunspelldir_path;
+	///
 	bool auto_region_delete;
 	/// flag telling whether lastfiles should be checked for existance
 	bool auto_reset_options;
@@ -324,22 +339,16 @@ public:
 	unsigned int plaintext_linelen;
 	/// Accept compound words in spellchecker?
 	bool spellchecker_accept_compound;
-	/// Pass input encoding switch to the spellchecker?
-	bool spellchecker_use_input_encoding;
-	/// Use alternate language?
-	bool spellchecker_use_alt_lang;
-	/// Use personal dictionary?
-	bool spellchecker_use_pers_dict;
+	/// End of paragraph markers?
+	bool paragraph_markers;
 	/// Use tooltips?
 	bool use_tooltip;
 	/// Use pixmap cache?
 	bool use_pixmap_cache;
-	/// Use escape chars?
-	bool spellchecker_use_esc_chars;
+	/// Spellchecker engine: aspell, hunspell, etc
+	std::string spellchecker;
 	/// Alternate language for spellchecker
 	std::string spellchecker_alt_lang;
-	/// Alternate personal dictionary file for the spellchecker
-	std::string spellchecker_pers_dict;
 	/// Escape characters
 	std::string spellchecker_esc_chars;
 	/// spellcheck continuously?
@@ -384,6 +393,10 @@ public:
 	std::string gui_language;
 	///
 	std::string default_view_format;
+	/// all available viewers
+	Alternatives viewer_alternatives;
+	/// all available editors
+	Alternatives editor_alternatives;
 	///
 	bool mac_like_word_movement;
 	///
@@ -417,7 +430,7 @@ public:
 	///
 	bool preview_hashed_labels;
 	///
-	std::string preview_scale_factor;
+	double preview_scale_factor;
 	/// user name
 	std::string user_name;
 	/// user email
@@ -472,6 +485,8 @@ public:
 	bool completion_popup_after_complete;
 	///
 	bool open_buffers_in_tabs;
+	///
+	bool single_close_tab_button;
 };
 
 
@@ -486,6 +501,7 @@ public:
 	operator LyXRC::PreviewStatus() const { return val_; }
 };
 
+void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new);
 
 ///
 extern LyXRC lyxrc;