X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrc.h;h=0be918fb900e2b81c67d9f1e8aaa8e1e563d65c0;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=cf497b8af24e093d2dad02761134e82f8f00a032;hpb=32fc061305562995cbc12590433b1a5682d5eb94;p=lyx.git

diff --git a/src/lyxrc.h b/src/lyxrc.h
index cf497b8af2..0be918fb90 100644
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -1,22 +1,16 @@
 // -*- 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 "paper.h" 
 #include "graphics/GraphicsTypes.h"
 
 // #include <boost/utility.hpp>
@@ -71,7 +65,6 @@ enum LyXRCTags {
 	RC_LASTFILES,
 	RC_AUTOREGIONDELETE,
 	RC_AUTORESET_OPTIONS,
-	RC_BIND,
 	RC_SERVERPIPE,
 	RC_INPUT,
 	RC_BINDFILE,
@@ -124,9 +117,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
 };
 
@@ -138,8 +131,6 @@ enum LyXRCTags {
 	///
 	int read(string const & filename);
 	///
-	void readBindFileIfNeeded();
-	///
 	void write(string const & filename) const;
 	///
 	void print() const;
@@ -191,14 +182,12 @@ enum LyXRCTags {
 	string custom_export_command;
 	///
 	string custom_export_format;
-	///
-	bool pdf_mode;
 	/// postscript interpreter (in general "gs", if it is installed)
 	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;
+	PAPER_SIZE default_papersize;
 	/// command to run chktex incl. options
 	string chktex_command;
 	///
@@ -284,10 +273,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;
@@ -337,8 +325,6 @@ enum LyXRCTags {
 	bool auto_number;
 	///
 	bool mark_foreign_language;
-	/// Do we have to use a GUI?
-	bool use_gui;
 	///
 	string default_language;
 	///
@@ -348,7 +334,7 @@ enum LyXRCTags {
 	///
 	int label_init_length;
 	///
-	grfx::DisplayType display_graphics;
+	lyx::graphics::DisplayType display_graphics;
 	///
 	bool show_banner;
 	///
@@ -357,12 +343,10 @@ enum LyXRCTags {
 	bool preview_hashed_labels;
 	///
 	float preview_scale_factor;
-
-private:
-	/// Is a bind file already (or currently) read?
-	bool hasBindFile;
-	///
-	int ReadBindFile(string const & name);
+	/// user name
+	string user_name;
+	/// user email
+	string user_email;
 };
 
 ///