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

diff --git a/src/LyXRC.h b/src/LyXRC.h
index cc57cffb97..af28ce0129 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -22,6 +22,7 @@
 
 #include "support/strfwd.h"
 
+#include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ -113,7 +114,6 @@ public:
 		RC_NOMENCL_COMMAND,
 		RC_NUMLASTFILES,
 		RC_OPEN_BUFFERS_IN_TABS,
-		RC_SINGLE_CLOSE_TAB_BUTTON,
 		RC_PARAGRAPH_MARKERS,
 		RC_PATH_PREFIX,
 		RC_PERS_DICT,
@@ -155,6 +155,7 @@ public:
 		RC_SERVERPIPE,
 		RC_SET_COLOR,
 		RC_SHOW_BANNER,
+		RC_SINGLE_CLOSE_TAB_BUTTON,
 		RC_SORT_LAYOUTS,
 		RC_SPELL_COMMAND,
 		RC_SPELLCHECK_CONTINUOUSLY,
@@ -197,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;
@@ -257,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
@@ -388,9 +394,9 @@ public:
 	///
 	std::string default_view_format;
 	/// all available viewers
-	std::vector<std::pair<std::string, std::string> > viewer_alternatives;
+	Alternatives viewer_alternatives;
 	/// all available editors
-	std::vector<std::pair<std::string, std::string> > editor_alternatives;
+	Alternatives editor_alternatives;
 	///
 	bool mac_like_word_movement;
 	///