#include <config.h>
-#ifdef __GNUG__
-#pragma implementation "lyxrc.h"
-#endif
-
#include <fstream>
#include <iomanip>
#include <iostream>
#include <boost/scoped_ptr.hpp>
-#include "debug.h"
-
#include "lyxrc.h"
+
+#include "debug.h"
#include "kbmap.h"
#include "LyXAction.h"
#include "intl.h"
+#include "converter.h"
+#include "format.h"
+#include "gettext.h"
+#include "lyxlex.h"
+
#include "support/path.h"
+#include "support/tostr.h"
#include "support/filetools.h"
#include "support/LAssert.h"
+#include "support/lstrings.h"
#include "support/userinfo.h"
-#include "converter.h"
-#include "gettext.h"
-#include "lyxlex.h"
using std::ostream;
using std::ofstream;
{ "\\use_escape_chars", LyXRC::RC_USE_ESC_CHARS },
{ "\\use_input_encoding", LyXRC::RC_USE_INP_ENC },
{ "\\use_personal_dictionary", LyXRC::RC_USE_PERS_DICT },
-#ifdef USE_PSPELL
- { "\\use_pspell", LyXRC::RC_USE_PSPELL },
-#endif
+ // compatibility with versions older than 1.4.0 only
+ { "\\use_pspell", LyXRC::RC_USE_SPELL_LIB },
+ { "\\use_spell_lib", LyXRC::RC_USE_SPELL_LIB },
{ "\\use_tempdir", LyXRC::RC_USETEMPDIR },
{ "\\user_email", LyXRC::RC_USER_EMAIL },
{ "\\user_name", LyXRC::RC_USER_NAME },
font_sizes[LyXFont::SIZE_HUGE] = 20.74;
font_sizes[LyXFont::SIZE_HUGER] = 24.88;
use_scalable_fonts = true;
- roman_font_name = "times";
- sans_font_name = "helvetica";
- typewriter_font_name = "courier";
+ roman_font_name = "";
+ sans_font_name = "";
+ typewriter_font_name = "";
popup_bold_font = "-*-helvetica-bold-r";
popup_normal_font = "-*-helvetica-medium-r";
font_norm = "iso8859-1";
backupdir_path.erase();
display_graphics = grfx::ColorDisplay;
// Spellchecker settings:
-#ifdef USE_PSPELL
- use_pspell = true;
-#endif
+ use_spell_lib = true;
isp_command = "ispell";
isp_accept_compound = false;
isp_use_input_encoding = false;
preview_hashed_labels = false;
preview_scale_factor = 0.9;
- /// These variables are not stored on disk (perhaps they
- // should be moved from the LyXRC class).
- use_gui = true;
- pdf_mode = false;
-
user_name = lyx::user_name();
-
+
user_email = lyx::user_email();
if (user_email.empty())
}
break;
// Spellchecker settings:
-#ifdef USE_PSPELL
- case RC_USE_PSPELL:
+ case RC_USE_SPELL_LIB:
if (lexrc.next()) {
- use_pspell = lexrc.getBool();
+ use_spell_lib = lexrc.getBool();
}
break;
-#endif
case RC_SPELL_COMMAND:
if (lexrc.next()) {
isp_command = lexrc.getString();
if (lexrc.next())
user_email = lexrc.getString();
break;
-
+
case RC_LAST: break; // this is just a dummy
}
}
os << "\\user_name \"" << user_name << "\"\n";
case RC_USER_EMAIL:
- os << "\\user_email " << user_email << "\n";
+ os << "\\user_email \"" << user_email << "\"\n";
case RC_SHOW_BANNER:
if (show_banner != system_lyxrc.show_banner) {
os << "\n#\n"
<< "# SPELLCHECKER SECTION ##############################\n"
<< "#\n\n";
-#ifdef USE_PSPELL
- case RC_USE_PSPELL:
- if (use_pspell != system_lyxrc.use_pspell) {
- os << "\\use_pspell " << tostr(use_pspell) << '\n';
+ case RC_USE_SPELL_LIB:
+ if (use_spell_lib != system_lyxrc.use_spell_lib) {
+ os << "\\use_spell_lib " << tostr(use_spell_lib) << '\n';
}
-#endif
case RC_SPELL_COMMAND:
if (isp_command != system_lyxrc.isp_command) {
os << "\\spell_command \"" << isp_command << "\"\n";