ws changes and some cruft removal, slight cleanup

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 9828ec4bcc58885c9bc303996ca7ee3990bea133..95f463fe8fe3bb07b8364fed4280d48625e900be 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -182,11 +182,11 @@ void LyXRC::setDefaults() {
        print_file_extension = ".ps";
        print_paper_flag = "-t";
        print_paper_dimension_flag = "-T";
-       document_path = GetEnvPath("HOME");
+       document_path.erase();
        tempdir_path = "/tmp";
        use_tempdir = true;
        ps_command = "gs";
-       view_dvi_paper_option = "";
+       view_dvi_paper_option.erase();
        default_papersize = BufferParams::PAPER_USLETTER;
        custom_export_format = "ps";
        chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
@@ -214,7 +214,7 @@ void LyXRC::setDefaults() {
        popup_normal_font = "-*-helvetica-medium-r";
        font_norm = "iso8859-1";
        font_norm_type = ISO_8859_1;
-       popup_font_encoding = "";
+       popup_font_encoding.erase();
        override_x_deadkeys = true;
        autosave = 300;
        auto_region_delete = true;
@@ -223,9 +223,9 @@ void LyXRC::setDefaults() {
        num_lastfiles = 4;
        check_lastfiles = true;
        make_backup = true;
-       backupdir_path = "";
+       backupdir_path.erase();
        exit_confirmation = true;
-       display_graphics = "mono";
+       display_graphics = "color";
        display_shortcuts = true;
        // Spellchecker settings:
 #ifdef USE_PSPELL      
@@ -535,7 +535,7 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next())
                                view_dvi_paper_option = lexrc.getString();
                        else 
-                               view_dvi_paper_option = "";
+                               view_dvi_paper_option.erase();
                        break;
 
                case RC_PS_COMMAND:
@@ -1246,7 +1246,7 @@ void LyXRC::output(ostream & os) const
                   << "#\n\n";
                
        case RC_SET_COLOR:
-               for (int i = 0; i < LColor::ignore; ++i ) {
+               for (int i = 0; i < LColor::ignore; ++i) {
                        LColor::color lc = static_cast<LColor::color>(i);
                        
                        string const col(lcolor.getX11Name(lc));
@@ -1444,7 +1444,7 @@ void LyXRC::output(ostream & os) const
 #ifdef USE_PSPELL
        case RC_USE_PSPELL:
                if (use_pspell != system_lyxrc.use_pspell) {
-                       os << "\\use_pspell \"" << use_pspell << "\"\n";
+                       os << "\\use_pspell " << tostr(use_pspell) << "\n";
                }
 #endif
        case RC_SPELL_COMMAND:
@@ -1897,7 +1897,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
                
        case RC_SCREEN_FONT_SCALABLE:
-               str = N_("Allow the use of scalable screen fonts? If false, LyX will use the closest existing size for a match. Use this if the scalable fonts look bad and you have many fixed size fonts.");
+               str = N_("Allow bitmap fonts to be resized. If you are using a bitmap font, selecting this option may make some fonts look blocky in LyX. Deselecting this option makes LyX use the nearest bitmap font size available, instead of scaling.");
                break;
                
        case RC_CHKTEX_COMMAND: