X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrc.h;h=5b0882b51e18d26016ce673d7c6889bdca03ba6a;hb=c90c5e6386ce69c34c99b3594d6fa452e6a13161;hp=b683f2f8442550decf1b10398e1a8d5ecc036176;hpb=c2077c66a86949a8aa1d5918f4f7db2e2d31e610;p=lyx.git

diff --git a/src/lyxrc.h b/src/lyxrc.h
index b683f2f844..5b0882b51e 100644
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -74,11 +74,6 @@ enum LyXRCTags {
 	RC_KBMAP,
 	RC_KBMAP_PRIMARY,
 	RC_KBMAP_SECONDARY,
-#if 0
-	RC_FAX_COMMAND,
-	RC_PHONEBOOK,
-	RC_FAXPROGRAM,
-#endif
 	RC_ASCIIROFF_COMMAND,
 	RC_ASCII_LINELEN,
 	RC_NUMLASTFILES,
@@ -110,6 +105,9 @@ enum LyXRCTags {
 	RC_LANGUAGE_AUTO_END,
 	RC_LANGUAGE_COMMAND_BEGIN,
 	RC_LANGUAGE_COMMAND_END,
+	RC_LANGUAGE_COMMAND_LOCAL,
+	RC_LANGUAGE_GLOBAL_OPTIONS,
+	RC_LANGUAGE_USE_BABEL,
 	RC_DATE_INSERT_FORMAT,
 	RC_SHOW_BANNER,
 	RC_WHEEL_JUMP,
@@ -118,6 +116,7 @@ enum LyXRCTags {
 	RC_FORMAT,
 	RC_NEW_ASK_FILENAME,
 	RC_DEFAULT_LANGUAGE,
+	RC_LABEL_INIT_LENGTH,
 	RC_LAST
 };
 
@@ -129,17 +128,15 @@ enum LyXRCTags {
 	///
 	int read (string const & filename);
 	///
+	void readBindFileIfNeeded();
+	///
 	void write(string const & filename) const;
 	///
         void print() const;
 	///
 	void output(std::ostream & os) const;
-	/// Is a bind file already (or currently) read?
-	bool hasBindFile;
 	///
-	int ReadBindFile(string const & name = "cua");
-	///
-	static string getDescription( LyXRCTags );
+	static string const getDescription(LyXRCTags);
 	///
 	string bind_file;
 	///
@@ -261,14 +258,6 @@ enum LyXRCTags {
 	string font_norm_menu;
 	///
 	unsigned int autosave;
-#if 0
-	///
-	string fax_command;
-	///
-	string phone_book;
-	///
-	string fax_program;
-#endif
 	///
 	string ascii_roff_command;
 	///
@@ -316,6 +305,12 @@ enum LyXRCTags {
 	///
 	string language_command_end;
 	///
+	string language_command_local;
+	///
+	bool language_global_options; 
+	///
+	bool language_use_babel;
+	///
 	bool rtl_support;
 	///
 	bool auto_number;
@@ -331,6 +326,13 @@ enum LyXRCTags {
 	string default_language;
 	///
 	bool cursor_follows_scrollbar;
+	///
+	int label_init_length;
+private:
+	/// Is a bind file already (or currently) read?
+	bool hasBindFile;
+	///
+	int ReadBindFile(string const & name);
 };
 
 ///