A little more lv cleanup.

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index cc57cffb97c5212a45983d79dd51db5b4c478904..c68e83cd29ea8d2dede3cf531e4207bbfd8e1f4f 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -22,6 +22,7 @@
 
 #include "support/strfwd.h"
 
+#include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ -95,7 +96,6 @@ public:
                RC_KBMAP,
                RC_KBMAP_PRIMARY,
                RC_KBMAP_SECONDARY,
-               RC_LABEL_INIT_LENGTH,
                RC_LANGUAGE_AUTO_BEGIN,
                RC_LANGUAGE_AUTO_END,
                RC_LANGUAGE_COMMAND_BEGIN,
@@ -113,7 +113,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,
@@ -141,6 +140,7 @@ public:
                RC_PRINT_ADAPTOUTPUT,
                RC_PRINT_COMMAND,
                RC_RTL_SUPPORT,
+               RC_SAVE_COMPRESSED,
                RC_SCREEN_DPI,
                RC_SCREEN_FONT_ROMAN,
                RC_SCREEN_FONT_ROMAN_FOUNDRY,
@@ -155,9 +155,11 @@ public:
                RC_SERVERPIPE,
                RC_SET_COLOR,
                RC_SHOW_BANNER,
+               RC_SINGLE_CLOSE_TAB_BUTTON,
                RC_SORT_LAYOUTS,
                RC_SPELL_COMMAND,
                RC_SPELLCHECK_CONTINUOUSLY,
+               RC_SPELLCHECK_NOTES,
                RC_SPELLCHECKER,
                RC_SPLITINDEX_COMMAND,
                RC_TEMPDIRPATH,
@@ -197,6 +199,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 +264,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
@@ -296,6 +303,8 @@ public:
        bool use_lastfilepos;
        /// load files from last session automatically
        bool load_session;
+       /// do we save new documents as compressed by default
+       bool save_compressed;
        /// shall a backup file be created
        bool make_backup;
        /// A directory for storing backup files
@@ -347,6 +356,8 @@ public:
        std::string spellchecker_esc_chars;
        /// spellcheck continuously?
        bool spellcheck_continuously;
+       /// spellcheck notes and comments?
+       bool spellcheck_notes;
        ///
        bool use_kbmap;
        ///
@@ -388,9 +399,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;
        ///
@@ -408,8 +419,6 @@ public:
        ///
        bool dialogs_iconify_with_main;
        ///
-       int label_init_length;
-       ///
        bool display_graphics;
        ///
        bool show_banner;