* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include "support/filetools.h"
#include "lyxtext.h"
#include "converter.h"
+#include "gettext.h"
using std::ostream;
using std::ofstream;
using std::vector;
extern LyXAction lyxaction;
-extern kb_keymap * toplevel_keymap;
+extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
+namespace {
-static
keyword_item lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
{ "\\alternate_language", LyXRC::RC_ALT_LANG },
{ "\\document_path", LyXRC::RC_DOCUMENTPATH },
{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
{ "\\exit_confirmation", LyXRC::RC_EXIT_CONFIRMATION },
-#if 0
- { "\\fax_command", LyXRC::RC_FAX_COMMAND },
- { "\\fax_program", LyXRC::RC_FAXPROGRAM },
-#endif
{ "\\font_encoding", LyXRC::RC_FONT_ENCODING },
{ "\\format", LyXRC::RC_FORMAT },
{ "\\input", LyXRC::RC_INPUT },
{ "\\kbmap", LyXRC::RC_KBMAP },
{ "\\kbmap_primary", LyXRC::RC_KBMAP_PRIMARY },
{ "\\kbmap_secondary", LyXRC::RC_KBMAP_SECONDARY },
+ { "\\label_init_length", LyXRC::RC_LABEL_INIT_LENGTH },
{ "\\language_auto_begin", LyXRC::RC_LANGUAGE_AUTO_BEGIN },
{ "\\language_auto_end", LyXRC::RC_LANGUAGE_AUTO_END },
{ "\\language_command_begin", LyXRC::RC_LANGUAGE_COMMAND_BEGIN },
{ "\\language_command_end", LyXRC::RC_LANGUAGE_COMMAND_END },
+ { "\\language_command_local", LyXRC::RC_LANGUAGE_COMMAND_LOCAL },
+ { "\\language_global_options", LyXRC::RC_LANGUAGE_GLOBAL_OPTIONS },
{ "\\language_package", LyXRC::RC_LANGUAGE_PACKAGE },
+ { "\\language_use_babel", LyXRC::RC_LANGUAGE_USE_BABEL },
{ "\\lastfiles", LyXRC::RC_LASTFILES },
{ "\\make_backup", LyXRC::RC_MAKE_BACKUP },
{ "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
{ "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS },
{ "\\personal_dictionary", LyXRC::RC_PERS_DICT },
-#if 0
- { "\\phone_book", LyXRC::RC_PHONEBOOK },
-#endif
{ "\\print_adapt_output", LyXRC::RC_PRINT_ADAPTOUTPUT },
{ "\\print_collcopies_flag", LyXRC::RC_PRINTCOLLCOPIESFLAG },
{ "\\print_command", LyXRC::RC_PRINT_COMMAND },
{ "\\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
{ "\\use_tempdir", LyXRC::RC_USETEMPDIR },
{ "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
{ "\\viewer" ,LyXRC::RC_VIEWER},
};
/* Let the range depend of the size of lyxrcTags. Alejandro 240596 */
-static const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
+const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
+
+} // namespace anon
LyXRC::LyXRC()
void LyXRC::setDefaults() {
+ bind_file = "cua";
+ hasBindFile = false;
ui_file = "default";
// Get printer from the environment. If fail, use default "",
// assuming that everything is set up correctly.
menu_font_name = "-*-helvetica-bold-r";
popup_font_name = "-*-helvetica-medium-r";
font_norm = "iso8859-1";
- font_norm_type = OTHER_ENCODING;
+ font_norm_type = ISO_8859_1;
font_norm_menu = "";
override_x_deadkeys = true;
autosave = 300;
exit_confirmation = true;
display_shortcuts = true;
// Spellchecker settings:
+#ifdef USE_PSPELL
+ use_pspell = true;
+#endif
isp_command = "ispell";
isp_accept_compound = false;
isp_use_input_encoding = false;
isp_use_pers_dict = false;
isp_use_esc_chars = false;
use_kbmap = false;
- hasBindFile = false;
rtl_support = false;
auto_number = true;
mark_foreign_language = true;
- language_package = "\\usepackage{babel}";
language_auto_begin = true;
language_auto_end = true;
+ language_global_options = true;
+ language_use_babel = true;
+ language_package = "\\usepackage{babel}";
language_command_begin = "\\selectlanguage{$$lang}";
language_command_end = "\\selectlanguage{$$lang}";
+ language_command_local = "\\foreignlanguage{$$lang}{";
default_language = "english";
//
new_ask_filename = false;
date_insert_format = "%A, %e %B %Y";
show_banner = true;
cursor_follows_scrollbar = false;
+ label_init_length = 3;
/// These variables are not stored on disk (perhaps they
// should be moved from the LyXRC class).
int LyXRC::ReadBindFile(string const & name)
{
hasBindFile = true;
- string tmp = i18nLibFileSearch("bind", name, "bind");
+ string const tmp = i18nLibFileSearch("bind", name, "bind");
lyxerr[Debug::LYXRC] << "Reading bindfile:" << tmp << endl;
- int result = read(tmp);
+ int const result = read(tmp);
if (result) {
lyxerr << "Error reading bind file: " << tmp << endl;
}
return result;
}
+void LyXRC::readBindFileIfNeeded()
+{
+ if (!hasBindFile)
+ ReadBindFile(bind_file);
+}
+
int LyXRC::read(string const & filename)
-{
- // Default bindfile.
- string bindFile = "cua";
-
+{
LyXLex lexrc(lyxrcTags, lyxrcCount);
if (lyxerr.debugging(Debug::PARSER))
lexrc.printTable(lyxerr);
lexrc.setFile(filename);
- if (!lexrc.IsOK()) return -2;
+ if (!lexrc.isOK()) return -2;
- lyxerr[Debug::INIT] << "Reading '" << filename << "'..." << endl;
+ lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl;
- while (lexrc.IsOK()) {
+ while (lexrc.isOK()) {
// By using two switches we take advantage of the compiler
// telling us if we have missed a LyXRCTags element in
// the second switch.
switch (static_cast<LyXRCTags>(le)) {
case RC_INPUT: // Include file
if (lexrc.next()) {
- string tmp = LibFileSearch(string(),
- lexrc.GetString());
+ string const tmp =
+ LibFileSearch(string(),
+ lexrc.getString());
if (read(tmp)) {
lexrc.printError("Error reading "
"included file: "+tmp);
break;
case RC_BINDFILE: // RVDK_PATCH_5
if (lexrc.next()) {
- string tmp(lexrc.GetString());
- if (bind_file.empty()) {
- // we only need the name of the first
- // bind file since that (usually)
- // includes several others.
+ string const tmp(lexrc.getString());
+ if (hasBindFile)
+ // We are already in the
+ // "actually read bind file"
+ // mode.
+ ReadBindFile(tmp);
+ else
+ // We are still in the "just
+ // remember the name of the
+ // bind file" mode.
bind_file = tmp;
- }
- ReadBindFile(tmp);
}
break;
case RC_UIFILE:
if (lexrc.next()) {
- ui_file = lexrc.GetString();
+ ui_file = lexrc.getString();
}
break;
case RC_EXIT_CONFIRMATION:
if (lexrc.next())
- exit_confirmation = lexrc.GetBool();
+ exit_confirmation = lexrc.getBool();
break;
case RC_DISPLAY_SHORTCUTS:
if (lexrc.next())
- display_shortcuts = lexrc.GetBool();
+ display_shortcuts = lexrc.getBool();
break;
case RC_KBMAP:
if (lexrc.next())
- use_kbmap = lexrc.GetBool();
+ use_kbmap = lexrc.getBool();
break;
case RC_KBMAP_PRIMARY:
if (lexrc.next()) {
- string kmap(lexrc.GetString());
+ string const kmap(lexrc.getString());
if (kmap.empty()) {
// nothing
} else if (!LibFileSearch("kbd", kmap,
case RC_KBMAP_SECONDARY:
if (lexrc.next()) {
- string kmap(lexrc.GetString());
+ string const kmap(lexrc.getString());
if (kmap.empty()) {
// nothing
} else if (!LibFileSearch("kbd", kmap,
case RC_FONT_ENCODING:
if (lexrc.next())
- fontenc = lexrc.GetString();
+ fontenc = lexrc.getString();
break;
case RC_PRINTER:
if (lexrc.next())
- printer = lexrc.GetString();
+ printer = lexrc.getString();
break;
case RC_PRINT_COMMAND:
if (lexrc.next())
- print_command = lexrc.GetString();
+ print_command = lexrc.getString();
break;
case RC_PRINTEVENPAGEFLAG:
if (lexrc.next())
- print_evenpage_flag = lexrc.GetString();
+ print_evenpage_flag = lexrc.getString();
break;
case RC_PRINTODDPAGEFLAG:
if (lexrc.next())
- print_oddpage_flag = lexrc.GetString();
+ print_oddpage_flag = lexrc.getString();
break;
case RC_PRINTPAGERANGEFLAG:
if (lexrc.next())
- print_pagerange_flag = lexrc.GetString();
+ print_pagerange_flag = lexrc.getString();
break;
case RC_PRINTCOPIESFLAG:
if (lexrc.next())
- print_copies_flag = lexrc.GetString();
+ print_copies_flag = lexrc.getString();
break;
case RC_PRINTCOLLCOPIESFLAG:
if (lexrc.next())
- print_collcopies_flag = lexrc.GetString();
+ print_collcopies_flag = lexrc.getString();
break;
case RC_PRINTREVERSEFLAG:
if (lexrc.next())
- print_reverse_flag = lexrc.GetString();
+ print_reverse_flag = lexrc.getString();
break;
case RC_PRINTLANDSCAPEFLAG:
if (lexrc.next())
- print_landscape_flag = lexrc.GetString();
+ print_landscape_flag = lexrc.getString();
break;
case RC_PRINTTOPRINTER:
if (lexrc.next())
- print_to_printer = lexrc.GetString();
+ print_to_printer = lexrc.getString();
break;
case RC_PRINT_ADAPTOUTPUT:
if (lexrc.next())
- print_adapt_output = lexrc.GetBool();
+ print_adapt_output = lexrc.getBool();
break;
case RC_PRINTTOFILE:
if (lexrc.next())
- print_to_file = lexrc.GetString();
+ print_to_file = lexrc.getString();
break;
case RC_PRINTFILEEXTENSION:
if (lexrc.next())
- print_file_extension = lexrc.GetString();
+ print_file_extension = lexrc.getString();
break;
case RC_PRINTEXSTRAOPTIONS:
if (lexrc.next())
- print_extra_options = lexrc.GetString();
+ print_extra_options = lexrc.getString();
break;
case RC_PRINTSPOOL_COMMAND:
if (lexrc.next())
- print_spool_command = lexrc.GetString();
+ print_spool_command = lexrc.getString();
break;
case RC_PRINTSPOOL_PRINTERPREFIX:
if (lexrc.next())
- print_spool_printerprefix = lexrc.GetString();
+ print_spool_printerprefix = lexrc.getString();
break;
case RC_PRINTPAPERDIMENSIONFLAG:
if (lexrc.next())
- print_paper_dimension_flag = lexrc.GetString();
+ print_paper_dimension_flag = lexrc.getString();
break;
case RC_PRINTPAPERFLAG:
if (lexrc.next())
- print_paper_flag = lexrc.GetString();
+ print_paper_flag = lexrc.getString();
break;
case RC_CUSTOM_EXPORT_COMMAND:
if (lexrc.next())
- custom_export_command = lexrc.GetString();
+ custom_export_command = lexrc.getString();
break;
case RC_CUSTOM_EXPORT_FORMAT:
if (lexrc.next())
- custom_export_format = lexrc.GetString();
+ custom_export_format = lexrc.getString();
break;
case RC_DEFAULT_PAPERSIZE:
if (lexrc.next()) {
- string size = lowercase(lexrc.GetString());
+ string const size =
+ lowercase(lexrc.getString());
if (size == "usletter")
default_papersize =
BufferParams::PAPER_USLETTER;
case RC_VIEWDVI_PAPEROPTION:
if (lexrc.next())
- view_dvi_paper_option = lexrc.GetString();
+ view_dvi_paper_option = lexrc.getString();
else
view_dvi_paper_option = "";
break;
case RC_PS_COMMAND:
if (lexrc.next())
- ps_command = lexrc.GetString();
+ ps_command = lexrc.getString();
break;
case RC_CHKTEX_COMMAND:
if (lexrc.next())
- chktex_command = lexrc.GetString();
+ chktex_command = lexrc.getString();
break;
case RC_SCREEN_DPI:
if (lexrc.next())
- dpi = lexrc.GetInteger();
+ dpi = lexrc.getInteger();
break;
case RC_SCREEN_ZOOM:
if (lexrc.next())
- zoom = lexrc.GetInteger();
+ zoom = lexrc.getInteger();
break;
case RC_WHEEL_JUMP:
if (lexrc.next())
- wheel_jump = lexrc.GetInteger();
+ wheel_jump = lexrc.getInteger();
break;
case RC_SCREEN_FONT_SIZES:
if (lexrc.next())
font_sizes[LyXFont::SIZE_TINY] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_SCRIPT] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_FOOTNOTE] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_SMALL] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_NORMAL] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_LARGE] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_LARGER] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_LARGEST] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_HUGE] =
- lexrc.GetFloat();
+ lexrc.getFloat();
if (lexrc.next())
font_sizes[LyXFont::SIZE_HUGER] =
- lexrc.GetFloat();
+ lexrc.getFloat();
break;
case RC_SCREEN_FONT_SCALABLE:
if (lexrc.next())
- use_scalable_fonts = lexrc.GetBool();
+ use_scalable_fonts = lexrc.getBool();
break;
case RC_AUTOSAVE:
if (lexrc.next())
- autosave = lexrc.GetInteger();
+ autosave = lexrc.getInteger();
break;
case RC_DOCUMENTPATH:
if (lexrc.next()) {
- document_path = ExpandPath(lexrc.GetString());
+ document_path = ExpandPath(lexrc.getString());
}
break;
case RC_TEMPLATEPATH:
if (lexrc.next())
- template_path = ExpandPath(lexrc.GetString());
+ template_path = ExpandPath(lexrc.getString());
break;
case RC_TEMPDIRPATH:
if (lexrc.next())
- tempdir_path = ExpandPath(lexrc.GetString());
+ tempdir_path = ExpandPath(lexrc.getString());
break;
case RC_USETEMPDIR:
if (lexrc.next())
- use_tempdir = lexrc.GetBool();
+ use_tempdir = lexrc.getBool();
break;
case RC_LASTFILES:
if (lexrc.next())
- lastfiles = ExpandPath(lexrc.GetString());
+ lastfiles = ExpandPath(lexrc.getString());
break;
case RC_NUMLASTFILES:
if (lexrc.next())
- num_lastfiles = lexrc.GetInteger();
+ num_lastfiles = lexrc.getInteger();
break;
case RC_CHECKLASTFILES:
if (lexrc.next())
- check_lastfiles = lexrc.GetBool();
+ check_lastfiles = lexrc.getBool();
break;
case RC_SCREEN_FONT_ROMAN:
if (lexrc.next())
- roman_font_name = lexrc.GetString();
+ roman_font_name = lexrc.getString();
break;
case RC_SCREEN_FONT_SANS:
if (lexrc.next())
- sans_font_name = lexrc.GetString();
+ sans_font_name = lexrc.getString();
break;
case RC_SCREEN_FONT_TYPEWRITER:
if (lexrc.next())
- typewriter_font_name = lexrc.GetString();
+ typewriter_font_name = lexrc.getString();
break;
case RC_SCREEN_FONT_MENU:
if (lexrc.next())
- menu_font_name = lexrc.GetString();
+ menu_font_name = lexrc.getString();
break;
case RC_SCREEN_FONT_POPUP:
if (lexrc.next())
- popup_font_name = lexrc.GetString();
+ popup_font_name = lexrc.getString();
break;
case RC_SCREEN_FONT_ENCODING:
if (lexrc.next()) {
- font_norm = lexrc.GetString();
+ font_norm = lexrc.getString();
set_font_norm_type();
}
break;
case RC_SCREEN_FONT_ENCODING_MENU:
if (lexrc.next())
- font_norm_menu = lexrc.GetString();
+ font_norm_menu = lexrc.getString();
break;
case RC_SET_COLOR:
string lyx_name, x11_name;
if (lexrc.next()) {
- lyx_name = lexrc.GetString();
+ lyx_name = lexrc.getString();
} else {
lexrc.printError("Missing color tag.");
break;
}
if (lexrc.next()) {
- x11_name = lexrc.GetString();
+ x11_name = lexrc.getString();
} else {
lexrc.printError("Missing color name for color : `$$Token'");
break;
case RC_AUTOREGIONDELETE:
// Auto region delete defaults to true
if (lexrc.next())
- auto_region_delete = lexrc.GetBool();
+ auto_region_delete = lexrc.getBool();
break;
case RC_BIND:
// we should not do an explicit binding before
// loading a bind file. So, in this case, load
// the default bind file.
- if (!hasBindFile) {
- ReadBindFile();
- bind_file = bindFile;
- }
+ readBindFileIfNeeded();
+
// !!!chb, dynamic key binding...
int action, res = 0;
string seq, cmd;
- if (lexrc.lex() == LyXLex::LEX_DATA) {
- seq = lexrc.GetString();
+ if (lexrc.next()) {
+ seq = lexrc.getString();
} else {
- lexrc.printError("Bad key sequence: `$$Token'");
+ lexrc.printError("RC_BIND: Missing key sequence");
break;
}
- if (lexrc.lex() == LyXLex::LEX_DATA) {
- cmd = lexrc.GetString();
+ if (lexrc.next(true)) {
+ cmd = lexrc.getString();
} else {
- lexrc.printError("Bad command: `$$Token'");
+ lexrc.printError("RC_BIND: missing command");
break;
}
if ((action = lyxaction.LookupFunc(cmd))>= 0) {
- if (lyxerr.debugging(Debug::KBMAP)) {
+ if (lyxerr.debugging(Debug::LYXRC)) {
lyxerr << "RC_BIND: Sequence `"
<< seq << "' Command `"
<< cmd << "' Action `"
<< action << '\'' << endl;
}
res = toplevel_keymap->bind(seq, action);
- if (res != 0) {
+ if (res != 0
+ && lyxerr.debugging(Debug::LYXRC)) {
lexrc.printError(
+ "RC_BIND: "
"Invalid key sequence `"
+ seq + '\'');
}
}
case RC_OVERRIDE_X_DEADKEYS:
if (lexrc.next())
- override_x_deadkeys = lexrc.GetBool();
+ override_x_deadkeys = lexrc.getBool();
break;
case RC_SERVERPIPE:
if (lexrc.next())
- lyxpipes = ExpandPath(lexrc.GetString());
+ lyxpipes = ExpandPath(lexrc.getString());
break;
case RC_CURSOR_FOLLOWS_SCROLLBAR:
if (lexrc.next())
- cursor_follows_scrollbar = lexrc.GetBool();
+ cursor_follows_scrollbar = lexrc.getBool();
break;
-#if 0
- case RC_FAX_COMMAND:
- if (lexrc.next())
- fax_command = lexrc.GetString();
- break;
- case RC_FAXPROGRAM:
- if (lexrc.next())
- fax_program = lexrc.GetString();
- break;
- case RC_PHONEBOOK:
- if (lexrc.next()) {
- string s = lexrc.GetString();
- if (AbsolutePath(s))
- phone_book = s;
- else
- phone_book = user_lyxdir + s;
- }
- break;
-#endif
case RC_ASCIIROFF_COMMAND:
if (lexrc.next())
- ascii_roff_command = lexrc.GetString();
+ ascii_roff_command = lexrc.getString();
break;
case RC_ASCII_LINELEN:
if (lexrc.next())
- ascii_linelen = lexrc.GetInteger();
+ ascii_linelen = lexrc.getInteger();
break;
// Spellchecker settings:
+#ifdef USE_PSPELL
+ case RC_USE_PSPELL:
+ if (lexrc.next())
+ use_pspell = lexrc.getBool();
+ break;
+#endif
case RC_SPELL_COMMAND:
if (lexrc.next())
- isp_command = lexrc.GetString();
+ isp_command = lexrc.getString();
break;
case RC_ACCEPT_COMPOUND:
if (lexrc.next())
- isp_accept_compound = lexrc.GetBool();
+ isp_accept_compound = lexrc.getBool();
break;
case RC_USE_INP_ENC:
if (lexrc.next())
- isp_use_input_encoding = lexrc.GetBool();
+ isp_use_input_encoding = lexrc.getBool();
break;
case RC_USE_ALT_LANG:
if (lexrc.next())
- isp_use_alt_lang = lexrc.GetBool();
+ isp_use_alt_lang = lexrc.getBool();
break;
case RC_USE_PERS_DICT:
if (lexrc.next())
- isp_use_pers_dict = lexrc.GetBool();
+ isp_use_pers_dict = lexrc.getBool();
break;
case RC_USE_ESC_CHARS:
if (lexrc.next())
- isp_use_esc_chars = lexrc.GetBool();
+ isp_use_esc_chars = lexrc.getBool();
break;
case RC_ALT_LANG:
if (lexrc.next())
- isp_alt_lang = lexrc.GetString();
+ isp_alt_lang = lexrc.getString();
break;
case RC_PERS_DICT:
if (lexrc.next())
- isp_pers_dict = lexrc.GetString();
+ isp_pers_dict = lexrc.getString();
break;
case RC_ESC_CHARS:
if (lexrc.next())
- isp_esc_chars = lexrc.GetString();
+ isp_esc_chars = lexrc.getString();
break;
case RC_MAKE_BACKUP:
if (lexrc.next())
- make_backup = lexrc.GetBool();
+ make_backup = lexrc.getBool();
break;
case RC_BACKUPDIR_PATH:
if (lexrc.next())
- backupdir_path = ExpandPath(lexrc.GetString());
+ backupdir_path = ExpandPath(lexrc.getString());
break;
case RC_DATE_INSERT_FORMAT:
if (lexrc.next())
- date_insert_format = lexrc.GetString();
+ date_insert_format = lexrc.getString();
break;
case RC_LANGUAGE_PACKAGE:
if (lexrc.next())
- language_package = lexrc.GetString();
+ language_package = lexrc.getString();
break;
case RC_LANGUAGE_AUTO_BEGIN:
if (lexrc.next())
- language_auto_begin = lexrc.GetBool();
+ language_auto_begin = lexrc.getBool();
break;
case RC_LANGUAGE_AUTO_END:
if (lexrc.next())
- language_auto_end = lexrc.GetBool();
+ language_auto_end = lexrc.getBool();
+ break;
+ case RC_LANGUAGE_GLOBAL_OPTIONS:
+ if (lexrc.next())
+ language_global_options = lexrc.getBool();
+ break;
+ case RC_LANGUAGE_USE_BABEL:
+ if (lexrc.next())
+ language_use_babel = lexrc.getBool();
break;
case RC_LANGUAGE_COMMAND_BEGIN:
if (lexrc.next())
- language_command_begin = lexrc.GetString();
+ language_command_begin = lexrc.getString();
break;
case RC_LANGUAGE_COMMAND_END:
if (lexrc.next())
- language_command_end = lexrc.GetString();
+ language_command_end = lexrc.getString();
+ break;
+ case RC_LANGUAGE_COMMAND_LOCAL:
+ if (lexrc.next())
+ language_command_local = lexrc.getString();
break;
case RC_RTL_SUPPORT:
if (lexrc.next())
- rtl_support = lexrc.GetBool();
+ rtl_support = lexrc.getBool();
break;
case RC_AUTO_NUMBER:
if (lexrc.next())
- auto_number = lexrc.GetBool();
+ auto_number = lexrc.getBool();
break;
case RC_MARK_FOREIGN_LANGUAGE:
if (lexrc.next())
- mark_foreign_language = lexrc.GetBool();
+ mark_foreign_language = lexrc.getBool();
break;
case RC_SHOW_BANNER:
if (lexrc.next())
- show_banner = lexrc.GetBool();
+ show_banner = lexrc.getBool();
break;
case RC_NEW_ASK_FILENAME:
if (lexrc.next())
- new_ask_filename = lexrc.GetBool();
+ new_ask_filename = lexrc.getBool();
break;
case RC_CONVERTER: {
string from, to, command, flags;
if (lexrc.next())
- from = lexrc.GetString();
+ from = lexrc.getString();
if (lexrc.next())
- to = lexrc.GetString();
+ to = lexrc.getString();
if (lexrc.next())
- command = lexrc.GetString();
+ command = lexrc.getString();
if (lexrc.next())
- flags = lexrc.GetString();
+ flags = lexrc.getString();
if (command.empty() || command == "none")
- converters.Delete(from, to);
+ converters.erase(from, to);
else
- converters.Add(from, to, command, flags);
+ converters.add(from, to, command, flags);
break;
}
case RC_VIEWER: {
string format, command;
if (lexrc.next())
- format = lexrc.GetString();
+ format = lexrc.getString();
if (lexrc.next())
- command = lexrc.GetString();
- formats.SetViewer(format, command);
+ command = lexrc.getString();
+ formats.setViewer(format, command);
break;
}
case RC_FORMAT: {
string format, extension, prettyname, shortcut;
if (lexrc.next())
- format = lexrc.GetString();
+ format = lexrc.getString();
if (lexrc.next())
- extension = lexrc.GetString();
+ extension = lexrc.getString();
if (lexrc.next())
- prettyname = lexrc.GetString();
+ prettyname = lexrc.getString();
if (lexrc.next())
- shortcut = lexrc.GetString();
+ shortcut = lexrc.getString();
if (prettyname.empty()) {
- if (converters.FormatIsUsed(format))
+ if (converters.formatIsUsed(format))
lyxerr << "Can't delete format "
<< format << endl;
else
- formats.Delete(format);
+ formats.erase(format);
} else
- formats.Add(format, extension, prettyname,
+ formats.add(format, extension, prettyname,
shortcut);
break;
}
case RC_DEFAULT_LANGUAGE:
if (lexrc.next())
- default_language = lexrc.GetString();
+ default_language = lexrc.getString();
+ break;
+
+ case RC_LABEL_INIT_LENGTH:
+ if (lexrc.next())
+ label_init_length = lexrc.getInteger();
break;
case RC_LAST: break; // this is just a dummy
}
}
+ /// Update converters data-structures
+ converters.update(formats);
+ converters.buildGraph();
+
return 0;
}
<< "### LyX, The Document Processor\n"
<< "###\n"
<< "### Copyright 1995 Matthias Ettrich\n"
- << "### Copyright 1995-2000 The LyX Team.\n"
+ << "### Copyright 1995-2001 The LyX Team.\n"
<< "###\n"
<< "### ========================================================\n"
<< "\n"
os << "\\date_insert_format \"" << date_insert_format
<< "\"\n";
}
-
+ case RC_LABEL_INIT_LENGTH:
+ if (label_init_length != system_lyxrc.label_init_length) {
+ os << "\\label_init_length " << label_init_length
+ << "\n";
+ }
+
os << "\n#\n"
<< "# SCREEN & FONTS SECTION ############################\n"
<< "#\n\n";
!= system_lyxrc.font_sizes[LyXFont::SIZE_HUGER]) {
os.setf(ios::fixed);
os.precision(2);
- os << "\\screen_font_sizes";
- os << " " << font_sizes[LyXFont::SIZE_TINY];
- os << " " << font_sizes[LyXFont::SIZE_SCRIPT];
- os << " " << font_sizes[LyXFont::SIZE_FOOTNOTE];
- os << " " << font_sizes[LyXFont::SIZE_SMALL];
- os << " " << font_sizes[LyXFont::SIZE_NORMAL];
- os << " " << font_sizes[LyXFont::SIZE_LARGE];
- os << " " << font_sizes[LyXFont::SIZE_LARGER];
- os << " " << font_sizes[LyXFont::SIZE_LARGEST];
- os << " " << font_sizes[LyXFont::SIZE_HUGE];
- os << " " << font_sizes[LyXFont::SIZE_HUGER];
- os << "\n";
- }
-
- //case RC_SET_COLOR:
- // color bindings not written to preference file.
- // And we want to be warned about that. (Lgb)
+ os << "\\screen_font_sizes"
+ << " " << font_sizes[LyXFont::SIZE_TINY]
+ << " " << font_sizes[LyXFont::SIZE_SCRIPT]
+ << " " << font_sizes[LyXFont::SIZE_FOOTNOTE]
+ << " " << font_sizes[LyXFont::SIZE_SMALL]
+ << " " << font_sizes[LyXFont::SIZE_NORMAL]
+ << " " << font_sizes[LyXFont::SIZE_LARGE]
+ << " " << font_sizes[LyXFont::SIZE_LARGER]
+ << " " << font_sizes[LyXFont::SIZE_LARGEST]
+ << " " << font_sizes[LyXFont::SIZE_HUGE]
+ << " " << font_sizes[LyXFont::SIZE_HUGER]
+ << "\n";
+ }
+
+ os << "\n#\n"
+ << "# COLOR SECTION ###################################\n"
+ << "#\n\n";
+
+ case RC_SET_COLOR:
+ for (int i = 0; i < LColor::ignore; ++i ) {
+ LColor::color lc = static_cast<LColor::color>(i);
+
+ string const col(lcolor.getX11Name(lc));
+ if (col != system_lcolor.getX11Name(lc)) {
+ os << "\\set_color \""
+ << lcolor.getLyXName(lc) << "\" \""
+ << col << "\"\n";
+ }
+ }
os << "\n#\n"
<< "# PRINTER SECTION ###################################\n"
os << "\\backupdir_path \"" << backupdir_path << "\"\n";
}
-#if 0
- os << "\n#\n"
- << "# FAX SECTION #######################################\n"
- << "#\n\n";
-
- case RC_FAX_COMMAND:
- if (fax_command != system_lyxrc.fax_command) {
- os << "\\fax_command \"" << fax_command << "\"\n";
- }
- case RC_PHONEBOOK:
- if (phone_book != system_lyxrc.phone_book) {
- os << "\\phone_book \"" << phone_book << "\"\n";
- }
- case RC_FAXPROGRAM:
- if (fax_program != system_lyxrc.fax_program) {
- os << "\\fax_program \"" << fax_program << "\"\n";
- }
-#endif
os << "\n#\n"
<< "# ASCII EXPORT SECTION ##############################\n"
<< "#\n\n";
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 \"" << use_pspell << "\"\n";
+ }
+#endif
case RC_SPELL_COMMAND:
if (isp_command != system_lyxrc.isp_command) {
os << "\\spell_command \"" << isp_command << "\"\n";
os << "\\language_package \"" << language_package
<< "\"\n";
}
+ case RC_LANGUAGE_GLOBAL_OPTIONS:
+ if (language_global_options
+ != system_lyxrc.language_global_options) {
+ os << "\\language_global_options \""
+ << tostr(language_global_options)
+ << "\"\n";
+ }
+ case RC_LANGUAGE_USE_BABEL:
+ if (language_use_babel != system_lyxrc.language_use_babel) {
+ os << "\\language_use_babel \""
+ << tostr(language_use_babel)
+ << "\"\n";
+ }
case RC_LANGUAGE_COMMAND_BEGIN:
if (language_command_begin
!= system_lyxrc.language_command_begin) {
os << "\\language_command_end \"" << language_command_end
<< "\"\n";
}
+ case RC_LANGUAGE_COMMAND_LOCAL:
+ if (language_command_local
+ != system_lyxrc.language_command_local) {
+ os << "\\language_command_local \""
+ << language_command_local
+ << "\"\n";
+ }
case RC_LANGUAGE_AUTO_BEGIN:
if (language_auto_begin != system_lyxrc.language_auto_begin) {
os << "\\language_auto_begin "
for (Formats::const_iterator cit = formats.begin();
cit != formats.end(); ++cit) {
Format const * format =
- system_formats.GetFormat(cit->name());
+ system_formats.getFormat(cit->name());
if (!format ||
format->extension() != cit->extension() ||
format->prettyname() != cit->prettyname() ||
// New/modifed formats
for (Formats::const_iterator cit = system_formats.begin();
cit != system_formats.end(); ++cit)
- if (!formats.GetFormat(cit->name()))
+ if (!formats.getFormat(cit->name()))
os << "\\format \"" << cit->name()
<< "\" \"\" \"\" \"\"\n";
case RC_VIEWER:
for (Formats::const_iterator cit = formats.begin();
cit != formats.end(); ++cit) {
Format const * format =
- system_formats.GetFormat(cit->name());
+ system_formats.getFormat(cit->name());
if ((!format || format->viewer() != cit->viewer()) &&
(format || !cit->viewer().empty()))
os << "\\viewer \"" << cit->name() << "\" \""
for (Converters::const_iterator cit = converters.begin();
cit != converters.end(); ++cit) {
Converter const * converter =
- system_converters.GetConverter(cit->from,
+ system_converters.getConverter(cit->from,
cit->to);
if (!converter ||
converter->command != cit->command ||
// New/modifed converters
for (Converters::const_iterator cit = system_converters.begin();
cit != system_converters.end(); ++cit)
- if (!converters.GetConverter(cit->from, cit->to))
+ if (!converters.getConverter(cit->from, cit->to))
os << "\\converter \"" << cit->from
<< "\" \"" << cit->to << "\" \"\" \"\"\n";
}
font_norm_type = ISO_8859_6_8;
else if (font_norm == "iso8859-9")
font_norm_type = ISO_8859_9;
+ else if (font_norm == "iso8859-15")
+ font_norm_type = ISO_8859_15;
else
font_norm_type = OTHER_ENCODING;
}
-string LyXRC::getDescription(LyXRCTags tag)
+
+string const LyXRC::getDescription(LyXRCTags tag)
{
string str;
break;
case RC_PRINTEVENPAGEFLAG:
+ str = N_("The option to print only even pages.");
+ break;
+
case RC_PRINTODDPAGEFLAG:
+ str = N_("The option to print only odd pages.");
+ break;
+
case RC_PRINTPAGERANGEFLAG:
+ str = N_("The option for specifying a comma-separated list of pages to print.");
+ break;
+
case RC_PRINTCOPIESFLAG:
+ str = N_("The option for specifying the number of copies to print.");
+ break;
+
case RC_PRINTCOLLCOPIESFLAG:
+ str = N_("The option for specifying whether the copies should be collated.");
+ break;
+
case RC_PRINTREVERSEFLAG:
+ str = N_("The option to reverse the order of the pages printed.");
+ break;
+
case RC_PRINTLANDSCAPEFLAG:
+ str = N_("The option to print out in landscape.");
+ break;
+
case RC_PRINTPAPERFLAG:
+ str = N_("The option to specify paper type.");
+ break;
+
case RC_PRINTPAPERDIMENSIONFLAG:
- str = N_("Look at the man page for your favorite print program to learn which options to use.");
+ str = N_("Option to specify the dimensions of the print paper.");
break;
case RC_PRINTTOPRINTER:
break;
case RC_PRINT_ADAPTOUTPUT:
- str = N_("Set to true for LyX to pass the name of the destination printer to your print command.");
+ str = N_("Select for LyX to pass the name of the destination printer to your print command.");
break;
case RC_PRINTTOFILE:
break;
case RC_SCREEN_ZOOM:
+ //xgettext:no-c-format
str = N_("The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper.");
break;
break;
case RC_TEMPDIRPATH:
- str = N_("The path that LyX will use to store temporary TeX output.");
+ str = N_("LyX will place its temporary directories in this path. They will be deleted when you quit LyX.");
break;
case RC_USETEMPDIR:
- str = N_("Specify to use a temporary directory to store temporary TeX output. This directory is deleted when you quit LyX.");
+ str = N_("Select if you wish to use a temporary directory structure to store temporary TeX output.");
break;
case RC_LASTFILES:
break;
case RC_AUTOREGIONDELETE:
- str = N_("Set to false if you don't want the current selection to be replaced automatically by what you type.");
+ str = N_("De-select if you don't want the current selection to be replaced automatically by what you type.");
break;
case RC_OVERRIDE_X_DEADKEYS:
- str = N_("Set to true for LyX to take over the handling of the dead keys (a.k.a. accent keys) that may be defined for your keyboard.");
+ str = N_("Select if LyX is to take over the handling of the dead keys (a.k.a. accent keys) that may be defined for your keyboard.");
break;
str = N_("Use this to set the correct mapping file for your keyboard. You'll need this if you for instance want to type German documents on an American keyboard.");
break;
-#if 0
- case RC_FAX_COMMAND:
- break;
-
- case RC_PHONEBOOK:
- break;
-
- case RC_FAXPROGRAM:
- break;
-#endif
case RC_ASCIIROFF_COMMAND:
str = N_("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used.");
break;
break;
case RC_CHECKLASTFILES:
- str = N_("Specify to check whether the lastfiles still exist.");
+ str = N_("Select to check whether the lastfiles still exist.");
break;
case RC_VIEWDVI_PAPEROPTION:
break;
case RC_ACCEPT_COMPOUND:
- str = N_("Consider run-together words, such as \"notthe\" for \"not the\", as legal words?");
+ str = N_("Consider run-together words, such as \"diskdrive\" for \"disk drive\", as legal words?");
break;
case RC_SPELL_COMMAND:
break;
case RC_MAKE_BACKUP:
- str = N_("Set to false if you don't want LyX to create backup files.");
+ str = N_("De-select if you don't want LyX to create backup files.");
break;
case RC_BACKUPDIR_PATH:
break;
case RC_RTL_SUPPORT:
- str = N_("Use to enable support of right-to-left languages (e.g. Hebrew, Arabic).");
+ str = N_("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic).");
break;
case RC_MARK_FOREIGN_LANGUAGE:
- str = N_("Use to control the highlighting of words with a language foreign to that of the document.");
+ str = N_("Select to control the highlighting of words with a language foreign to that of the document.");
break;
case RC_LANGUAGE_PACKAGE:
str = N_("The latex command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
break;
+
+ case RC_LANGUAGE_GLOBAL_OPTIONS:
+ str = N_("De-select if you don't want the language(s) used as an argument to \\documentclass.");
+ break;
+
+ case RC_LANGUAGE_USE_BABEL:
+ str = N_("De-select if you don't want babel to be used when the language of the document is the default language.");
+ break;
case RC_LANGUAGE_AUTO_BEGIN:
- str = N_("Use if a language switching command is needed at the beginning of the document.");
+ str = N_("Select if a language switching command is needed at the beginning of the document.");
break;
case RC_LANGUAGE_AUTO_END:
- str = N_("Use if a language switching command is needed at the end of the document.");
+ str = N_("Select if a language switching command is needed at the end of the document.");
break;
case RC_LANGUAGE_COMMAND_BEGIN:
case RC_LANGUAGE_COMMAND_END:
str = N_("The latex command for changing back to the language of the document.");
break;
-
+
+ case RC_LANGUAGE_COMMAND_LOCAL:
+ str = N_("The latex command for local changing of the language.");
+ break;
+
case RC_DATE_INSERT_FORMAT:
+ //xgettext:no-c-format
str = N_("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\".");
break;
case RC_SHOW_BANNER:
- str = N_("Set to false if you don't want the startup banner.");
+ str = N_("De-select if you don't want the startup banner.");
break;
case RC_WHEEL_JUMP:
case RC_DEFAULT_LANGUAGE:
str = N_("New documents will be assigned this language.");
break;
+
+ case RC_LABEL_INIT_LENGTH:
+ str = N_("Maximum number of words in the initialization string for a new label");
+ break;
default:
break;