Restore the version number position on the splash screen

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 58183c412758271cdcae1fae9edd5458bdbc156f..fb61503b769b13200a2826d337fe275f05183540 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -137,7 +137,6 @@ keyword_item lyxrcTags[] = {
        { "\\printer", LyXRC::RC_PRINTER },
        { "\\rtl", LyXRC::RC_RTL_SUPPORT },
        { "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
-       { "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING },
        { "\\screen_font_roman", LyXRC::RC_SCREEN_FONT_ROMAN },
        { "\\screen_font_roman_foundry", LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY },
        { "\\screen_font_sans", LyXRC::RC_SCREEN_FONT_SANS },
@@ -237,7 +236,6 @@ void LyXRC::setDefaults() {
        roman_font_name = "";
        sans_font_name = "";
        typewriter_font_name = "";
-       font_norm = "iso8859-1";
        autosave = 300;
        auto_region_delete = true;
        auto_reset_options = false;
@@ -312,7 +310,7 @@ int LyXRC::read(FileName const & filename)
        lexrc.setFile(filename);
        if (!lexrc.isOK()) return -2;
 
-       lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl;
+       LYXERR(Debug::LYXRC) << "Reading '" << filename << "'..." << endl;
 
        return read(lexrc);
 }
@@ -327,7 +325,7 @@ int LyXRC::read(std::istream & is)
        lexrc.setStream(is);
        if (!lexrc.isOK()) return -2;
 
-       lyxerr[Debug::LYXRC] << "Reading istream..." << endl;
+       LYXERR(Debug::LYXRC) << "Reading istream..." << endl;
 
        return read(lexrc);
 }
@@ -796,12 +794,6 @@ int LyXRC::read(LyXLex & lexrc)
                        }
                        break;
 
-               case RC_SCREEN_FONT_ENCODING:
-                       if (lexrc.next()) {
-                               font_norm = lexrc.getString();
-                       }
-                       break;
-
                case RC_SET_COLOR:
                {
                        string lyx_name, x11_name;
@@ -1551,12 +1543,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                           << convert<string>(use_scalable_fonts)
                           << '\n';
                }
-       case RC_SCREEN_FONT_ENCODING:
-               if (ignore_system_lyxrc ||
-                   font_norm != system_lyxrc.font_norm) {
-                       os << "\\screen_font_encoding \"" << font_norm
-                          << "\"\n";
-               }
        case RC_SCREEN_FONT_SIZES:
                if (ignore_system_lyxrc ||
                    font_sizes[LyXFont::SIZE_TINY]
@@ -2372,10 +2358,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
                break;
 
-       case RC_SCREEN_FONT_ENCODING:
-               str = _("The encoding for the screen fonts.");
-               break;
-
        case RC_SCREEN_FONT_ROMAN:
        case RC_SCREEN_FONT_SANS:
        case RC_SCREEN_FONT_TYPEWRITER: