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 33312a8f1bd42e3ff899861bacb9efb26ad548e3..406a26d493e9928f97ecbe5f458093f13bcb68ff 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -1,22 +1,17 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxrc.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * 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>
 
@@ -54,6 +49,9 @@ enum LyXRCTags {
        RC_SCREEN_FONT_ROMAN,
        RC_SCREEN_FONT_SANS,
        RC_SCREEN_FONT_TYPEWRITER,
+       RC_SCREEN_FONT_ROMAN_FOUNDRY,
+       RC_SCREEN_FONT_SANS_FOUNDRY,
+       RC_SCREEN_FONT_TYPEWRITER_FOUNDRY,
        RC_SCREEN_FONT_ENCODING,
        RC_POPUP_BOLD_FONT,
        RC_POPUP_NORMAL_FONT,
@@ -68,7 +66,6 @@ enum LyXRCTags {
        RC_AUTOREGIONDELETE,
        RC_AUTORESET_OPTIONS,
        RC_BIND,
-       RC_OVERRIDE_X_DEADKEYS,
        RC_SERVERPIPE,
        RC_INPUT,
        RC_BINDFILE,
@@ -121,9 +118,9 @@ enum LyXRCTags {
        RC_PREVIEW,
        RC_PREVIEW_HASHED_LABELS,
        RC_PREVIEW_SCALE_FACTOR,
-#ifdef USE_PSPELL
-       RC_USE_PSPELL,
-#endif
+       RC_USE_SPELL_LIB,
+       RC_USER_NAME,
+       RC_USER_EMAIL,
        RC_LAST
 };
 
@@ -230,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;
        ///
@@ -241,6 +236,12 @@ enum LyXRCTags {
        ///
        string typewriter_font_name;
        ///
+       string roman_font_foundry;
+       ///
+       string sans_font_foundry;
+       ///
+       string typewriter_font_foundry;
+       ///
        string popup_bold_font;
        ///
        string popup_normal_font;
@@ -277,10 +278,9 @@ enum LyXRCTags {
        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;
@@ -341,7 +341,7 @@ enum LyXRCTags {
        ///
        int label_init_length;
        ///
-       string display_graphics;
+       grfx::DisplayType display_graphics;
        ///
        bool show_banner;
        ///
@@ -350,7 +350,11 @@ enum LyXRCTags {
        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;