Remove the XOpenIM test as lyxlookup.C has been buried.

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index a8a1951aebd7ebd1619ae84adf7ef1c58513bc64..cf497b8af24e093d2dad02761134e82f8f00a032 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -55,6 +55,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,
@@ -69,7 +72,6 @@ enum LyXRCTags {
        RC_AUTOREGIONDELETE,
        RC_AUTORESET_OPTIONS,
        RC_BIND,
-       RC_OVERRIDE_X_DEADKEYS,
        RC_SERVERPIPE,
        RC_INPUT,
        RC_BINDFILE,
@@ -231,8 +233,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;
        ///
@@ -242,6 +242,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;
@@ -351,7 +357,7 @@ enum LyXRCTags {
        bool preview_hashed_labels;
        ///
        float preview_scale_factor;
-       
+
 private:
        /// Is a bind file already (or currently) read?
        bool hasBindFile;