Support for new GNU aspell library. Final pspell fix ups.

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 43075d7cde5b7e88561f0f19470eca9807add757..406a26d493e9928f97ecbe5f458093f13bcb68ff 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -1,22 +1,17 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file lyxrc.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef LYXRC_H
 #define LYXRC_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "bufferparams.h" // Just to get the enum BufferParams::PAPER_SIZE (sic)
+#include "graphics/GraphicsTypes.h"
 
 // #include <boost/utility.hpp>
 
@@ -44,7 +39,7 @@ enum LyXRCTags {
        RC_PRINTEXSTRAOPTIONS,
        RC_PRINTSPOOL_COMMAND,
        RC_PRINTSPOOL_PRINTERPREFIX,
-        RC_PRINTPAPERFLAG,
+       RC_PRINTPAPERFLAG,
        RC_PRINTPAPERDIMENSIONFLAG,
        RC_CUSTOM_EXPORT_COMMAND,
        RC_CUSTOM_EXPORT_FORMAT,
@@ -54,10 +49,13 @@ enum LyXRCTags {
        RC_SCREEN_FONT_ROMAN,
        RC_SCREEN_FONT_SANS,
        RC_SCREEN_FONT_TYPEWRITER,
-       RC_SCREEN_FONT_MENU,
-       RC_SCREEN_FONT_POPUP,
+       RC_SCREEN_FONT_ROMAN_FOUNDRY,
+       RC_SCREEN_FONT_SANS_FOUNDRY,
+       RC_SCREEN_FONT_TYPEWRITER_FOUNDRY,
        RC_SCREEN_FONT_ENCODING,
-       RC_SCREEN_FONT_ENCODING_MENU,
+       RC_POPUP_BOLD_FONT,
+       RC_POPUP_NORMAL_FONT,
+       RC_POPUP_FONT_ENCODING,
        RC_SET_COLOR,
        RC_AUTOSAVE,
        RC_DOCUMENTPATH,
@@ -66,8 +64,8 @@ enum LyXRCTags {
        RC_USETEMPDIR,
        RC_LASTFILES,
        RC_AUTOREGIONDELETE,
+       RC_AUTORESET_OPTIONS,
        RC_BIND,
-       RC_OVERRIDE_X_DEADKEYS,
        RC_SERVERPIPE,
        RC_INPUT,
        RC_BINDFILE,
@@ -95,8 +93,6 @@ enum LyXRCTags {
        RC_CHKTEX_COMMAND,
        RC_CURSOR_FOLLOWS_SCROLLBAR,
        RC_DIALOGS_ICONIFY_WITH_MAIN,
-       RC_EXIT_CONFIRMATION,
-       RC_DISPLAY_SHORTCUTS,
        RC_MAKE_BACKUP,
        RC_BACKUPDIR_PATH,
        RC_RTL_SUPPORT,
@@ -116,13 +112,15 @@ enum LyXRCTags {
        RC_CONVERTER,
        RC_VIEWER,
        RC_FORMAT,
-       RC_NEW_ASK_FILENAME,
        RC_DEFAULT_LANGUAGE,
        RC_LABEL_INIT_LENGTH,
        RC_DISPLAY_GRAPHICS,
-#ifdef USE_PSPELL      
-       RC_USE_PSPELL,
-#endif
+       RC_PREVIEW,
+       RC_PREVIEW_HASHED_LABELS,
+       RC_PREVIEW_SCALE_FACTOR,
+       RC_USE_SPELL_LIB,
+       RC_USER_NAME,
+       RC_USER_EMAIL,
        RC_LAST
 };
 
@@ -132,13 +130,13 @@ enum LyXRCTags {
        ///
        void setDefaults();
        ///
-       int read (string const & filename);
+       int read(string const & filename);
        ///
        void readBindFileIfNeeded();
        ///
        void write(string const & filename) const;
        ///
-        void print() const;
+       void print() const;
        ///
        void output(std::ostream & os) const;
        ///
@@ -177,14 +175,14 @@ enum LyXRCTags {
        string print_extra_options;
        ///
        string print_spool_command;
-        ///
+       ///
        string print_spool_printerprefix;
        ///
        string print_paper_flag;
        ///
        string print_paper_dimension_flag;
        ///
-        string custom_export_command;
+       string custom_export_command;
        ///
        string custom_export_format;
        ///
@@ -193,8 +191,8 @@ enum LyXRCTags {
        string ps_command;
        /// option for telling the dvi viewer about the paper size
        string view_dvi_paper_option;
-        /// default paper size for local xdvi/dvips/ghostview/whatever
-        BufferParams::PAPER_SIZE default_papersize;
+       /// default paper size for local xdvi/dvips/ghostview/whatever
+       BufferParams::PAPER_SIZE default_papersize;
        /// command to run chktex incl. options
        string chktex_command;
        ///
@@ -208,6 +206,8 @@ enum LyXRCTags {
        ///
        bool auto_region_delete;
        /// flag telling whether lastfiles should be checked for existance
+       bool auto_reset_options;
+       ///
        bool check_lastfiles;
        /// filename for lastfiles file
        string lastfiles;
@@ -227,8 +227,6 @@ enum LyXRCTags {
        bool use_scalable_fonts;
        /// DPI of monitor
        float dpi;
-       /// Whether lyx should handle deadkeys by itself
-       bool override_x_deadkeys;
        ///
        string fontenc;
        ///
@@ -238,9 +236,15 @@ enum LyXRCTags {
        ///
        string typewriter_font_name;
        ///
-       string menu_font_name;
+       string roman_font_foundry;
        ///
-       string popup_font_name;
+       string sans_font_foundry;
+       ///
+       string typewriter_font_foundry;
+       ///
+       string popup_bold_font;
+       ///
+       string popup_normal_font;
        ///
        string font_norm;
        ///
@@ -250,6 +254,10 @@ enum LyXRCTags {
                ///
                ISO_8859_1,
                ///
+               ISO_8859_3,
+               ///
+               ISO_8859_4,
+               ///
                ISO_8859_6_8,
                ///
                ISO_8859_9,
@@ -263,17 +271,16 @@ enum LyXRCTags {
        ///
        void set_font_norm_type();
        ///
-       string font_norm_menu;
+       string popup_font_encoding;
        ///
        unsigned int autosave;
        ///
        string ascii_roff_command;
        ///
        unsigned int ascii_linelen;
+       /// use library instead of process
+       bool use_spell_lib;
        /// Ispell command
-#ifdef USE_PSPELL      
-       bool use_pspell;
-#endif
        string isp_command;
        /// Accept compound words in spellchecker?
        bool isp_accept_compound;
@@ -293,10 +300,6 @@ enum LyXRCTags {
        string isp_esc_chars;
        ///
        bool use_kbmap;
-       /// Ask for confirmation of exit when there are unsaved documents?
-       bool exit_confirmation;
-       /// Should we display short-cut information in the minibuffer?
-       bool display_shortcuts;
        ///
        string primary_kbmap;
        ///
@@ -318,7 +321,7 @@ enum LyXRCTags {
        ///
        string language_command_local;
        ///
-       bool language_global_options; 
+       bool language_global_options;
        ///
        bool language_use_babel;
        ///
@@ -327,13 +330,9 @@ enum LyXRCTags {
        bool auto_number;
        ///
        bool mark_foreign_language;
-       ///
-       bool show_banner;
        /// Do we have to use a GUI?
        bool use_gui;
        ///
-       bool new_ask_filename;
-       ///
        string default_language;
        ///
        bool cursor_follows_scrollbar;
@@ -342,7 +341,20 @@ enum LyXRCTags {
        ///
        int label_init_length;
        ///
-       string display_graphics;
+       grfx::DisplayType display_graphics;
+       ///
+       bool show_banner;
+       ///
+       bool preview;
+       ///
+       bool preview_hashed_labels;
+       ///
+       float preview_scale_factor;
+       /// user name
+       string user_name;
+       /// user email
+       string user_email;
+
 private:
        /// Is a bind file already (or currently) read?
        bool hasBindFile;