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

diff --git a/src/lyxrc.h b/src/lyxrc.h
index ba1a8beb61..0be918fb90 100644
--- 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 "paper.h" 
+#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,
@@ -67,8 +65,6 @@ enum LyXRCTags {
 	RC_LASTFILES,
 	RC_AUTOREGIONDELETE,
 	RC_AUTORESET_OPTIONS,
-	RC_BIND,
-	RC_OVERRIDE_X_DEADKEYS,
 	RC_SERVERPIPE,
 	RC_INPUT,
 	RC_BINDFILE,
@@ -96,7 +92,6 @@ enum LyXRCTags {
 	RC_CHKTEX_COMMAND,
 	RC_CURSOR_FOLLOWS_SCROLLBAR,
 	RC_DIALOGS_ICONIFY_WITH_MAIN,
-	RC_EXIT_CONFIRMATION,
 	RC_MAKE_BACKUP,
 	RC_BACKUPDIR_PATH,
 	RC_RTL_SUPPORT,
@@ -116,16 +111,15 @@ enum LyXRCTags {
 	RC_CONVERTER,
 	RC_VIEWER,
 	RC_FORMAT,
-	RC_NEW_ASK_FILENAME,
 	RC_DEFAULT_LANGUAGE,
 	RC_LABEL_INIT_LENGTH,
 	RC_DISPLAY_GRAPHICS,
 	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
 };
 
@@ -137,8 +131,6 @@ enum LyXRCTags {
 	///
 	int read(string const & filename);
 	///
-	void readBindFileIfNeeded();
-	///
 	void write(string const & filename) const;
 	///
 	void print() const;
@@ -190,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;
 	///
@@ -232,8 +222,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;
 	///
@@ -243,6 +231,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;
@@ -279,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;
@@ -302,8 +295,6 @@ enum LyXRCTags {
 	string isp_esc_chars;
 	///
 	bool use_kbmap;
-	/// Ask for confirmation of exit when there are unsaved documents?
-	bool exit_confirmation;
 	///
 	string primary_kbmap;
 	///
@@ -334,10 +325,6 @@ enum LyXRCTags {
 	bool auto_number;
 	///
 	bool mark_foreign_language;
-	/// Do we have to use a GUI?
-	bool use_gui;
-	///
-	bool new_ask_filename;
 	///
 	string default_language;
 	///
@@ -347,7 +334,7 @@ enum LyXRCTags {
 	///
 	int label_init_length;
 	///
-	string display_graphics;
+	lyx::graphics::DisplayType display_graphics;
 	///
 	bool show_banner;
 	///
@@ -356,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;
 };
 
 ///