X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrc.C;h=f768bbe806000caa0ef2d11559467076d6b0bc74;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=ed126b1547b19c47191526a3097d33db3d36f54f;hpb=e266fd847f7c1ec14c9802c85f19f1193bfdbf7c;p=lyx.git diff --git a/src/lyxrc.C b/src/lyxrc.C index ed126b1547..f768bbe806 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1,37 +1,37 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. +/** + * \file lyxrc.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * ====================================================== */ + * Full author contact details are available in file CREDITS + */ #include -#ifdef __GNUG__ -#pragma implementation "lyxrc.h" -#endif - #include #include #include - -#include "debug.h" +#include #include "lyxrc.h" -#include "kbmap.h" -#include "LyXAction.h" -#include "lyxserver.h" -#include "lyx_main.h" + +#include "debug.h" #include "intl.h" -#include "tex-strings.h" -#include "support/path.h" -#include "support/filetools.h" -#include "lyxtext.h" #include "converter.h" +#include "format.h" #include "gettext.h" +#include "lyxlex.h" +#include "lyxfont.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 "support/translator.h" + +using namespace lyx::support; using std::ostream; using std::ofstream; @@ -40,11 +40,16 @@ using std::ios; using std::endl; using std::vector; -extern LyXAction lyxaction; -extern boost::scoped_ptr toplevel_keymap; +namespace lyx { +namespace graphics { +/// The translator between the DisplayType and the corresponding lyx string. +extern Translator displayTranslator; +} +} namespace { +// when adding something to this array keep it sorted! keyword_item lyxrcTags[] = { { "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND }, { "\\alternate_language", LyXRC::RC_ALT_LANG }, @@ -55,7 +60,6 @@ keyword_item lyxrcTags[] = { { "\\auto_reset_options", LyXRC::RC_AUTORESET_OPTIONS }, { "\\autosave", LyXRC::RC_AUTOSAVE }, { "\\backupdir_path", LyXRC::RC_BACKUPDIR_PATH }, - { "\\bind", LyXRC::RC_BIND }, { "\\bind_file", LyXRC::RC_BINDFILE }, { "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES }, { "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND }, @@ -68,10 +72,8 @@ keyword_item lyxrcTags[] = { { "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE }, { "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN }, { "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS }, - { "\\display_shortcuts", LyXRC::RC_DISPLAY_SHORTCUTS }, { "\\document_path", LyXRC::RC_DOCUMENTPATH }, { "\\escape_chars", LyXRC::RC_ESC_CHARS }, - { "\\exit_confirmation", LyXRC::RC_EXIT_CONFIRMATION }, { "\\font_encoding", LyXRC::RC_FONT_ENCODING }, { "\\format", LyXRC::RC_FORMAT }, { "\\input", LyXRC::RC_INPUT }, @@ -90,10 +92,14 @@ keyword_item lyxrcTags[] = { { "\\lastfiles", LyXRC::RC_LASTFILES }, { "\\make_backup", LyXRC::RC_MAKE_BACKUP }, { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE }, - { "\\new_ask_filename", LyXRC::RC_NEW_ASK_FILENAME }, { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES }, - { "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS }, { "\\personal_dictionary", LyXRC::RC_PERS_DICT }, + { "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT }, + { "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING }, + { "\\popup_normal_font", LyXRC::RC_POPUP_NORMAL_FONT }, + { "\\preview", LyXRC::RC_PREVIEW }, + { "\\preview_hashed_labels", LyXRC::RC_PREVIEW_HASHED_LABELS }, + { "\\preview_scale_factor", LyXRC::RC_PREVIEW_SCALE_FACTOR }, { "\\print_adapt_output", LyXRC::RC_PRINT_ADAPTOUTPUT }, { "\\print_collcopies_flag", LyXRC::RC_PRINTCOLLCOPIESFLAG }, { "\\print_command", LyXRC::RC_PRINT_COMMAND }, @@ -104,8 +110,8 @@ keyword_item lyxrcTags[] = { { "\\print_landscape_flag", LyXRC::RC_PRINTLANDSCAPEFLAG }, { "\\print_oddpage_flag", LyXRC::RC_PRINTODDPAGEFLAG }, { "\\print_pagerange_flag", LyXRC::RC_PRINTPAGERANGEFLAG }, - { "\\print_paper_dimension_flag", LyXRC::RC_PRINTPAPERDIMENSIONFLAG }, - { "\\print_paper_flag", LyXRC::RC_PRINTPAPERFLAG }, + { "\\print_paper_dimension_flag", LyXRC::RC_PRINTPAPERDIMENSIONFLAG }, + { "\\print_paper_flag", LyXRC::RC_PRINTPAPERFLAG }, { "\\print_reverse_flag", LyXRC::RC_PRINTREVERSEFLAG }, { "\\print_spool_command", LyXRC::RC_PRINTSPOOL_COMMAND }, { "\\print_spool_printerprefix", LyXRC::RC_PRINTSPOOL_PRINTERPREFIX }, @@ -116,14 +122,20 @@ keyword_item lyxrcTags[] = { { "\\rtl", LyXRC::RC_RTL_SUPPORT }, { "\\screen_dpi", LyXRC::RC_SCREEN_DPI }, { "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING }, - { "\\screen_font_encoding_menu", LyXRC::RC_SCREEN_FONT_ENCODING_MENU }, - { "\\screen_font_menu", LyXRC::RC_SCREEN_FONT_MENU }, - { "\\screen_font_popup", LyXRC::RC_SCREEN_FONT_POPUP }, + // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002 + { "\\screen_font_encoding_menu", LyXRC::RC_POPUP_FONT_ENCODING }, + // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002 + { "\\screen_font_menu", LyXRC::RC_POPUP_BOLD_FONT }, + // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002 + { "\\screen_font_popup", LyXRC::RC_POPUP_NORMAL_FONT }, { "\\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 }, + { "\\screen_font_sans_foundry", LyXRC::RC_SCREEN_FONT_SANS_FOUNDRY }, { "\\screen_font_scalable", LyXRC::RC_SCREEN_FONT_SCALABLE }, { "\\screen_font_sizes", LyXRC::RC_SCREEN_FONT_SIZES }, { "\\screen_font_typewriter", LyXRC::RC_SCREEN_FONT_TYPEWRITER }, + { "\\screen_font_typewriter_foundry", LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY }, { "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM }, { "\\serverpipe", LyXRC::RC_SERVERPIPE }, { "\\set_color", LyXRC::RC_SET_COLOR }, @@ -136,22 +148,23 @@ keyword_item lyxrcTags[] = { { "\\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 }, { "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION }, - { "\\viewer" ,LyXRC::RC_VIEWER}, + { "\\viewer" ,LyXRC::RC_VIEWER}, { "\\wheel_jump", LyXRC::RC_WHEEL_JUMP } }; -/* Let the range depend of the size of lyxrcTags. Alejandro 240596 */ const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item); } // namespace anon -LyXRC::LyXRC() +LyXRC::LyXRC() { setDefaults(); } @@ -159,7 +172,6 @@ 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. @@ -178,19 +190,19 @@ 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 = ""; - default_papersize = BufferParams::PAPER_USLETTER; + view_dvi_paper_option.erase(); + default_papersize = PAPER_USLETTER; custom_export_format = "ps"; chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"; fontenc = "default"; dpi = 75; // Because a screen typically is wider than a piece of paper: zoom = 150; - wheel_jump = 100; + wheel_jump = 5; // Default LaTeX font size: font_sizes[LyXFont::SIZE_TINY] = 5.0; font_sizes[LyXFont::SIZE_SCRIPT] = 7.0; @@ -203,15 +215,14 @@ void LyXRC::setDefaults() { 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"; - menu_font_name = "-*-helvetica-bold-r"; - popup_font_name = "-*-helvetica-medium-r"; + 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"; font_norm_type = ISO_8859_1; - font_norm_menu = ""; - override_x_deadkeys = true; + popup_font_encoding.erase(); autosave = 300; auto_region_delete = true; auto_reset_options = false; @@ -219,14 +230,10 @@ void LyXRC::setDefaults() { num_lastfiles = 4; check_lastfiles = true; make_backup = true; - backupdir_path = ""; - exit_confirmation = true; - display_graphics = "mono"; - display_shortcuts = true; + backupdir_path.erase(); + display_graphics = lyx::graphics::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; @@ -243,56 +250,54 @@ void LyXRC::setDefaults() { 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; + show_banner = true; // date_insert_format = "%A, %e %B %Y"; - show_banner = true; cursor_follows_scrollbar = false; dialogs_iconify_with_main = false; label_init_length = 3; + preview = 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::support::user_name(); + user_email = lyx::support::user_email(); -int LyXRC::ReadBindFile(string const & name) -{ - hasBindFile = true; - string const tmp = i18nLibFileSearch("bind", name, "bind"); - lyxerr[Debug::LYXRC] << "Reading bindfile:" << tmp << endl; - int const result = read(tmp); - if (result) { - lyxerr << "Error reading bind file: " << tmp << endl; - } - return result; + if (user_email.empty()) + user_email = _("email address unknown"); } -void LyXRC::readBindFileIfNeeded() + +namespace { + +void oldFontFormat(string & family, string & foundry) { - if (!hasBindFile) - ReadBindFile(bind_file); + if (family.empty() || family[0] != '-') + return; + foundry = token(family, '-', 1); + family = token(family, '-', 2); + if (foundry == "*") + foundry.erase(); } +} // namespace anon + int LyXRC::read(string const & filename) -{ +{ LyXLex lexrc(lyxrcTags, lyxrcCount); if (lyxerr.debugging(Debug::PARSER)) lexrc.printTable(lyxerr); - + lexrc.setFile(filename); if (!lexrc.isOK()) return -2; - + lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl; - + while (lexrc.isOK()) { // By using two switches we take advantage of the compiler // telling us if we have missed a LyXRCTags element in @@ -305,17 +310,17 @@ int LyXRC::read(string const & filename) switch (le) { case LyXLex::LEX_UNDEF: lexrc.printError("Unknown tag `$$Token'"); - continue; + continue; case LyXLex::LEX_FEOF: - continue; + continue; default: break; } switch (static_cast(le)) { case RC_INPUT: // Include file - if (lexrc.next()) { + if (lexrc.next()) { string const tmp = LibFileSearch(string(), - lexrc.getString()); + lexrc.getString()); if (read(tmp)) { lexrc.printError("Error reading " "included file: "+tmp); @@ -324,346 +329,392 @@ int LyXRC::read(string const & filename) break; case RC_BINDFILE: // RVDK_PATCH_5 if (lexrc.next()) { - 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; + bind_file = lexrc.getString(); } break; - - case RC_UIFILE: + + case RC_UIFILE: if (lexrc.next()) { ui_file = lexrc.getString(); } break; - - case RC_EXIT_CONFIRMATION: - if (lexrc.next()) - exit_confirmation = lexrc.getBool(); - break; - + case RC_AUTORESET_OPTIONS: - if (lexrc.next()) + if (lexrc.next()) { auto_reset_options = lexrc.getBool(); + } break; case RC_DISPLAY_GRAPHICS: - if (lexrc.next()) - display_graphics = lexrc.getString(); - break; - - case RC_DISPLAY_SHORTCUTS: - if (lexrc.next()) - display_shortcuts = lexrc.getBool(); + if (lexrc.next()) { + display_graphics = lyx::graphics::displayTranslator.find(lexrc.getString()); + } break; case RC_KBMAP: - if (lexrc.next()) + if (lexrc.next()) { use_kbmap = lexrc.getBool(); + } break; - + case RC_KBMAP_PRIMARY: if (lexrc.next()) { string const kmap(lexrc.getString()); if (kmap.empty()) { // nothing - } else if (!LibFileSearch("kbd", kmap, - "kmap").empty()) + } else if (!LibFileSearch("kbd", kmap, + "kmap").empty()) { primary_kbmap = kmap; - else + } else { lexrc.printError("LyX: Keymap `$$Token' not found"); + } } break; - + case RC_KBMAP_SECONDARY: if (lexrc.next()) { string const kmap(lexrc.getString()); if (kmap.empty()) { // nothing - } else if (!LibFileSearch("kbd", kmap, - "kmap").empty()) + } else if (!LibFileSearch("kbd", kmap, + "kmap").empty()) { secondary_kbmap = kmap; - else + } else { lexrc.printError("LyX: Keymap `$$Token' not found"); + } } break; - + case RC_FONT_ENCODING: - if (lexrc.next()) + if (lexrc.next()) { fontenc = lexrc.getString(); + } break; - + case RC_PRINTER: - if (lexrc.next()) + if (lexrc.next()) { printer = lexrc.getString(); + } break; - + case RC_PRINT_COMMAND: - if (lexrc.next()) + if (lexrc.next()) { print_command = lexrc.getString(); + } break; - + case RC_PRINTEVENPAGEFLAG: - if (lexrc.next()) + if (lexrc.next()) { print_evenpage_flag = lexrc.getString(); + } break; - + case RC_PRINTODDPAGEFLAG: - if (lexrc.next()) + if (lexrc.next()) { print_oddpage_flag = lexrc.getString(); + } break; - + case RC_PRINTPAGERANGEFLAG: - if (lexrc.next()) + if (lexrc.next()) { print_pagerange_flag = lexrc.getString(); + } break; - + case RC_PRINTCOPIESFLAG: - if (lexrc.next()) + if (lexrc.next()) { print_copies_flag = lexrc.getString(); + } break; - + case RC_PRINTCOLLCOPIESFLAG: - if (lexrc.next()) + if (lexrc.next()) { print_collcopies_flag = lexrc.getString(); + } break; - + case RC_PRINTREVERSEFLAG: - if (lexrc.next()) + if (lexrc.next()) { print_reverse_flag = lexrc.getString(); + } break; - + case RC_PRINTLANDSCAPEFLAG: - if (lexrc.next()) + if (lexrc.next()) { print_landscape_flag = lexrc.getString(); + } break; - + case RC_PRINTTOPRINTER: - if (lexrc.next()) + if (lexrc.next()) { print_to_printer = lexrc.getString(); + } break; - + case RC_PRINT_ADAPTOUTPUT: - if (lexrc.next()) + if (lexrc.next()) { print_adapt_output = lexrc.getBool(); + } break; - + case RC_PRINTTOFILE: - if (lexrc.next()) + if (lexrc.next()) { print_to_file = lexrc.getString(); + } break; - + case RC_PRINTFILEEXTENSION: - if (lexrc.next()) + if (lexrc.next()) { print_file_extension = lexrc.getString(); + } break; - + case RC_PRINTEXSTRAOPTIONS: - if (lexrc.next()) + if (lexrc.next()) { print_extra_options = lexrc.getString(); + } break; - + case RC_PRINTSPOOL_COMMAND: - if (lexrc.next()) + if (lexrc.next()) { print_spool_command = lexrc.getString(); + } break; - + case RC_PRINTSPOOL_PRINTERPREFIX: - if (lexrc.next()) + if (lexrc.next()) { print_spool_printerprefix = lexrc.getString(); + } break; - - case RC_PRINTPAPERDIMENSIONFLAG: - if (lexrc.next()) + + case RC_PRINTPAPERDIMENSIONFLAG: + if (lexrc.next()) { print_paper_dimension_flag = lexrc.getString(); + } break; - - case RC_PRINTPAPERFLAG: - if (lexrc.next()) + + case RC_PRINTPAPERFLAG: + if (lexrc.next()) { print_paper_flag = lexrc.getString(); + } break; - + case RC_CUSTOM_EXPORT_COMMAND: - if (lexrc.next()) + if (lexrc.next()) { custom_export_command = lexrc.getString(); + } break; - + case RC_CUSTOM_EXPORT_FORMAT: - if (lexrc.next()) + if (lexrc.next()) { custom_export_format = lexrc.getString(); + } break; case RC_DEFAULT_PAPERSIZE: - if (lexrc.next()) { - string const size = - lowercase(lexrc.getString()); + if (lexrc.next()) { + string const size = + ascii_lowercase(lexrc.getString()); if (size == "usletter") - default_papersize = - BufferParams::PAPER_USLETTER; + default_papersize = + PAPER_USLETTER; else if (size == "legal") - default_papersize = - BufferParams::PAPER_LEGALPAPER; + default_papersize = + PAPER_LEGALPAPER; else if (size == "executive") - default_papersize = - BufferParams::PAPER_EXECUTIVEPAPER; + default_papersize = + PAPER_EXECUTIVEPAPER; else if (size == "a3") - default_papersize = - BufferParams::PAPER_A3PAPER; + default_papersize = + PAPER_A3PAPER; else if (size == "a4") - default_papersize = - BufferParams::PAPER_A4PAPER; + default_papersize = + PAPER_A4PAPER; else if (size == "a5") - default_papersize = - BufferParams::PAPER_A5PAPER; + default_papersize = + PAPER_A5PAPER; else if (size == "b5") - default_papersize = - BufferParams::PAPER_B5PAPER; + default_papersize = + PAPER_B5PAPER; } break; case RC_VIEWDVI_PAPEROPTION: - if (lexrc.next()) + if (lexrc.next()) { view_dvi_paper_option = lexrc.getString(); - else - view_dvi_paper_option = ""; + } else { + view_dvi_paper_option.erase(); + } break; case RC_PS_COMMAND: - if (lexrc.next()) + if (lexrc.next()) { ps_command = lexrc.getString(); + } break; - + case RC_CHKTEX_COMMAND: - if (lexrc.next()) + if (lexrc.next()) { chktex_command = lexrc.getString(); + } break; - + case RC_SCREEN_DPI: - if (lexrc.next()) + if (lexrc.next()) { dpi = lexrc.getInteger(); + } break; - + case RC_SCREEN_ZOOM: - if (lexrc.next()) + if (lexrc.next()) { zoom = lexrc.getInteger(); + } break; case RC_WHEEL_JUMP: - if (lexrc.next()) + if (lexrc.next()) { wheel_jump = lexrc.getInteger(); + } break; - + case RC_SCREEN_FONT_SIZES: - if (lexrc.next()) + if (lexrc.next()) { font_sizes[LyXFont::SIZE_TINY] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_SCRIPT] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_FOOTNOTE] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_SMALL] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_NORMAL] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_LARGE] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_LARGER] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_LARGEST] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_HUGE] = lexrc.getFloat(); - if (lexrc.next()) + } + if (lexrc.next()) { font_sizes[LyXFont::SIZE_HUGER] = lexrc.getFloat(); + } break; - - case RC_SCREEN_FONT_SCALABLE: - if (lexrc.next()) - use_scalable_fonts = lexrc.getBool(); + + case RC_SCREEN_FONT_SCALABLE: + if (lexrc.next()) { + use_scalable_fonts = lexrc.getBool(); + } break; - + case RC_AUTOSAVE: - if (lexrc.next()) + if (lexrc.next()) { autosave = lexrc.getInteger(); + } break; - + case RC_DOCUMENTPATH: if (lexrc.next()) { document_path = ExpandPath(lexrc.getString()); } break; - + case RC_TEMPLATEPATH: - if (lexrc.next()) + if (lexrc.next()) { template_path = ExpandPath(lexrc.getString()); + } break; - + case RC_TEMPDIRPATH: - if (lexrc.next()) + if (lexrc.next()) { tempdir_path = ExpandPath(lexrc.getString()); + } break; - + case RC_USETEMPDIR: - if (lexrc.next()) + if (lexrc.next()) { use_tempdir = lexrc.getBool(); + } break; - + case RC_LASTFILES: - if (lexrc.next()) + if (lexrc.next()) { lastfiles = ExpandPath(lexrc.getString()); + } break; - - case RC_NUMLASTFILES: - if (lexrc.next()) - num_lastfiles = lexrc.getInteger(); + + case RC_NUMLASTFILES: + if (lexrc.next()) { + num_lastfiles = lexrc.getInteger(); + } break; - - case RC_CHECKLASTFILES: - if (lexrc.next()) - check_lastfiles = lexrc.getBool(); + + case RC_CHECKLASTFILES: + if (lexrc.next()) { + check_lastfiles = lexrc.getBool(); + } break; - + case RC_SCREEN_FONT_ROMAN: - if (lexrc.next()) + if (lexrc.next()) { roman_font_name = lexrc.getString(); + oldFontFormat(roman_font_name, + roman_font_foundry); + } break; - + case RC_SCREEN_FONT_SANS: - if (lexrc.next()) + if (lexrc.next()) { sans_font_name = lexrc.getString(); + oldFontFormat(sans_font_name, sans_font_foundry); + } break; - + case RC_SCREEN_FONT_TYPEWRITER: - if (lexrc.next()) + if (lexrc.next()) { typewriter_font_name = lexrc.getString(); + oldFontFormat(typewriter_font_name, + typewriter_font_foundry); + } break; - - case RC_SCREEN_FONT_MENU: - if (lexrc.next()) - menu_font_name = lexrc.getString(); + + case RC_SCREEN_FONT_ROMAN_FOUNDRY: + if (lexrc.next()) { + roman_font_foundry = lexrc.getString(); + } break; - - case RC_SCREEN_FONT_POPUP: - if (lexrc.next()) - popup_font_name = lexrc.getString(); + + case RC_SCREEN_FONT_SANS_FOUNDRY: + if (lexrc.next()) { + sans_font_foundry = lexrc.getString(); + } + break; + + case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY: + if (lexrc.next()) { + typewriter_font_foundry = lexrc.getString(); + } break; - + case RC_SCREEN_FONT_ENCODING: if (lexrc.next()) { font_norm = lexrc.getString(); @@ -671,279 +722,312 @@ int LyXRC::read(string const & filename) } break; - case RC_SCREEN_FONT_ENCODING_MENU: - if (lexrc.next()) - font_norm_menu = lexrc.getString(); + case RC_POPUP_BOLD_FONT: + if (lexrc.next()) { + popup_bold_font = lexrc.getString(); + } + break; + + case RC_POPUP_NORMAL_FONT: + if (lexrc.next()) { + popup_normal_font = lexrc.getString(); + } + break; + + case RC_POPUP_FONT_ENCODING: + if (lexrc.next()) { + popup_font_encoding = lexrc.getString(); + } break; case RC_SET_COLOR: { string lyx_name, x11_name; - if (lexrc.next()) { + if (lexrc.next()) { lyx_name = lexrc.getString(); } else { lexrc.printError("Missing color tag."); break; } - + if (lexrc.next()) { x11_name = lexrc.getString(); } else { - lexrc.printError("Missing color name for color : `$$Token'"); + lexrc.printError("Missing color name for color: `$$Token'"); break; } - if (!lcolor.setColor(lyx_name, x11_name)) + if (!lcolor.setColor(lyx_name, x11_name)) { lyxerr << "Bad lyxrc set_color for " << lyx_name << endl; + } break; } case RC_AUTOREGIONDELETE: // Auto region delete defaults to true - if (lexrc.next()) - 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. - readBindFileIfNeeded(); - - // !!!chb, dynamic key binding... - int action = 0; - string::size_type res = 0; - string seq, cmd; - - if (lexrc.next()) { - seq = lexrc.getString(); - } else { - lexrc.printError("RC_BIND: Missing key sequence"); - break; - } - - if (lexrc.next(true)) { - cmd = lexrc.getString(); - } else { - lexrc.printError("RC_BIND: missing command"); - break; - } - - if ((action = lyxaction.LookupFunc(cmd))>= 0) { - if (lyxerr.debugging(Debug::LYXRC)) { - lyxerr << "RC_BIND: Sequence `" - << seq << "' Command `" - << cmd << "' Action `" - << action << '\'' << endl; - } - res = toplevel_keymap->bind(seq, action); - if (res != 0 - && lyxerr.debugging(Debug::LYXRC)) { - lexrc.printError( - "RC_BIND: " - "Invalid key sequence `" - + seq + '\''); - } - } else {// cmd is the last token read. - lexrc.printError( - "Unknown LyX function `$$Token'"); + if (lexrc.next()) { + auto_region_delete = lexrc.getBool(); } break; - } - case RC_OVERRIDE_X_DEADKEYS: - if (lexrc.next()) - override_x_deadkeys = lexrc.getBool(); - break; case RC_SERVERPIPE: - if (lexrc.next()) + if (lexrc.next()) { lyxpipes = ExpandPath(lexrc.getString()); + } break; - + case RC_CURSOR_FOLLOWS_SCROLLBAR: - if (lexrc.next()) + if (lexrc.next()) { cursor_follows_scrollbar = lexrc.getBool(); + } break; case RC_DIALOGS_ICONIFY_WITH_MAIN: - if (lexrc.next()) + if (lexrc.next()) { dialogs_iconify_with_main = lexrc.getBool(); + } break; case RC_ASCIIROFF_COMMAND: - if (lexrc.next()) + if (lexrc.next()) { ascii_roff_command = lexrc.getString(); + } break; case RC_ASCII_LINELEN: - if (lexrc.next()) + if (lexrc.next()) { ascii_linelen = lexrc.getInteger(); + } break; // Spellchecker settings: -#ifdef USE_PSPELL - case RC_USE_PSPELL: - if (lexrc.next()) - use_pspell = lexrc.getBool(); + case RC_USE_SPELL_LIB: + if (lexrc.next()) { + use_spell_lib = lexrc.getBool(); + } break; -#endif case RC_SPELL_COMMAND: - if (lexrc.next()) + if (lexrc.next()) { isp_command = lexrc.getString(); + } break; case RC_ACCEPT_COMPOUND: - if (lexrc.next()) + if (lexrc.next()) { isp_accept_compound = lexrc.getBool(); + } break; case RC_USE_INP_ENC: - if (lexrc.next()) + if (lexrc.next()) { isp_use_input_encoding = lexrc.getBool(); + } break; case RC_USE_ALT_LANG: - if (lexrc.next()) + if (lexrc.next()) { isp_use_alt_lang = lexrc.getBool(); + } break; case RC_USE_PERS_DICT: - if (lexrc.next()) + if (lexrc.next()) { isp_use_pers_dict = lexrc.getBool(); + } break; case RC_USE_ESC_CHARS: - if (lexrc.next()) + if (lexrc.next()) { isp_use_esc_chars = lexrc.getBool(); + } break; case RC_ALT_LANG: - if (lexrc.next()) + if (lexrc.next()) { isp_alt_lang = lexrc.getString(); + } break; case RC_PERS_DICT: - if (lexrc.next()) + if (lexrc.next()) { isp_pers_dict = lexrc.getString(); + } break; case RC_ESC_CHARS: - if (lexrc.next()) + if (lexrc.next()) { isp_esc_chars = lexrc.getString(); + } break; case RC_MAKE_BACKUP: - if (lexrc.next()) - make_backup = lexrc.getBool(); + if (lexrc.next()) { + make_backup = lexrc.getBool(); + } break; case RC_BACKUPDIR_PATH: - if (lexrc.next()) + if (lexrc.next()) { backupdir_path = ExpandPath(lexrc.getString()); + } break; case RC_DATE_INSERT_FORMAT: - if (lexrc.next()) + if (lexrc.next()) { date_insert_format = lexrc.getString(); + } break; case RC_LANGUAGE_PACKAGE: - if (lexrc.next()) + if (lexrc.next()) { language_package = lexrc.getString(); + } break; case RC_LANGUAGE_AUTO_BEGIN: - if (lexrc.next()) + if (lexrc.next()) { language_auto_begin = lexrc.getBool(); + } break; case RC_LANGUAGE_AUTO_END: - if (lexrc.next()) + if (lexrc.next()) { language_auto_end = lexrc.getBool(); + } break; case RC_LANGUAGE_GLOBAL_OPTIONS: - if (lexrc.next()) + if (lexrc.next()) { language_global_options = lexrc.getBool(); + } break; case RC_LANGUAGE_USE_BABEL: - if (lexrc.next()) + if (lexrc.next()) { language_use_babel = lexrc.getBool(); + } break; case RC_LANGUAGE_COMMAND_BEGIN: - if (lexrc.next()) + if (lexrc.next()) { language_command_begin = lexrc.getString(); + } break; case RC_LANGUAGE_COMMAND_END: - if (lexrc.next()) + if (lexrc.next()) { language_command_end = lexrc.getString(); + } break; case RC_LANGUAGE_COMMAND_LOCAL: - if (lexrc.next()) + if (lexrc.next()) { language_command_local = lexrc.getString(); + } break; case RC_RTL_SUPPORT: - if (lexrc.next()) + if (lexrc.next()) { rtl_support = lexrc.getBool(); + } break; case RC_AUTO_NUMBER: - if (lexrc.next()) + if (lexrc.next()) { auto_number = lexrc.getBool(); + } break; case RC_MARK_FOREIGN_LANGUAGE: - if (lexrc.next()) + if (lexrc.next()) { mark_foreign_language = lexrc.getBool(); + } break; - case RC_SHOW_BANNER: - if (lexrc.next()) - show_banner = lexrc.getBool(); - break; - - case RC_NEW_ASK_FILENAME: - if (lexrc.next()) - new_ask_filename = lexrc.getBool(); - break; + case RC_CONVERTER: { string from, to, command, flags; - if (lexrc.next()) + if (lexrc.next()) { from = lexrc.getString(); - if (lexrc.next()) + } + if (lexrc.next()) { to = lexrc.getString(); - if (lexrc.next()) + } + if (lexrc.next()) { command = lexrc.getString(); - if (lexrc.next()) + } + if (lexrc.next()) { flags = lexrc.getString(); - if (command.empty() || command == "none") + } + if (command.empty() + || token(command, ' ', 0) == "none") { converters.erase(from, to); - else + } else { converters.add(from, to, command, flags); + } break; } case RC_VIEWER: { string format, command; - if (lexrc.next()) + if (lexrc.next()) { format = lexrc.getString(); - if (lexrc.next()) + } + if (lexrc.next()) { command = lexrc.getString(); + if (token(command, ' ', 0) == "none") + command.erase(); + } formats.setViewer(format, command); break; } case RC_FORMAT: { string format, extension, prettyname, shortcut; - if (lexrc.next()) + if (lexrc.next()) { format = lexrc.getString(); - if (lexrc.next()) + } + if (lexrc.next()) { extension = lexrc.getString(); - if (lexrc.next()) + } + if (lexrc.next()) { prettyname = lexrc.getString(); - if (lexrc.next()) + } + if (lexrc.next()) { shortcut = lexrc.getString(); + } if (prettyname.empty()) { - if (converters.formatIsUsed(format)) + if (converters.formatIsUsed(format)) { lyxerr << "Can't delete format " << format << endl; - else + } else { formats.erase(format); - - } else + } + } else { formats.add(format, extension, prettyname, shortcut); + } break; } case RC_DEFAULT_LANGUAGE: - if (lexrc.next()) + if (lexrc.next()) { default_language = lexrc.getString(); + } break; case RC_LABEL_INIT_LENGTH: - if (lexrc.next()) + if (lexrc.next()) { label_init_length = lexrc.getInteger(); + } + break; + + case RC_SHOW_BANNER: + if (lexrc.next()) { + show_banner = lexrc.getBool(); + } + break; + + case RC_PREVIEW: + if (lexrc.next()) { + preview = lexrc.getBool(); + } + break; + + case RC_PREVIEW_HASHED_LABELS: + if (lexrc.next()) { + preview_hashed_labels = lexrc.getBool(); + } + break; + + case RC_PREVIEW_SCALE_FACTOR: + if (lexrc.next()) { + preview_scale_factor = lexrc.getFloat(); + } + break; + + case RC_USER_NAME: + if (lexrc.next()) + user_name = lexrc.getString(); + break; + + case RC_USER_EMAIL: + if (lexrc.next()) + user_email = lexrc.getString(); break; case RC_LAST: break; // this is just a dummy @@ -989,7 +1073,7 @@ void LyXRC::output(ostream & os) const << "# This file is written by LyX, if you want to make your own\n" << "# modifications you should do them from inside LyX and save\n" << "\n"; - + // Why the switch you might ask. It is a trick to ensure that all // the elements in the LyXRCTags enum is handled. As you can see // there are no breaks at all. So it is just a huge fall-through. @@ -1000,8 +1084,6 @@ void LyXRC::output(ostream & os) const case RC_LAST: case RC_INPUT: // input/include files are not done here - case RC_BIND: - // bindings is not written to the preferences file. case RC_BINDFILE: if (bind_file != system_lyxrc.bind_file) { os << "\\bind_file " << bind_file << "\n"; @@ -1012,12 +1094,7 @@ void LyXRC::output(ostream & os) const os << "\n#\n" << "# MISC SECTION ######################################\n" << "#\n\n"; - - case RC_SHOW_BANNER: - if (show_banner != system_lyxrc.show_banner) { - os << "# Set to false to inhibit the startup banner.\n" - << "\\show_banner " << tostr(show_banner) << "\n"; - } + // bind files are not done here. case RC_UIFILE: if (ui_file != system_lyxrc.ui_file) { @@ -1028,44 +1105,31 @@ void LyXRC::output(ostream & os) const os << "# Set to false to inhibit automatic replacement of\n" << "# the current selection.\n" << "\\auto_region_delete " << tostr(auto_region_delete) - << "\n"; + << '\n'; } case RC_AUTORESET_OPTIONS: if (auto_reset_options != system_lyxrc.auto_reset_options) { os << "# Set to false to inhibit automatic reset of\n" << "# the class options to defaults on class change.\n" << "\\auto_reset_options " << tostr(auto_reset_options) - << "\n"; + << '\n'; } case RC_AUTOSAVE: if (autosave != system_lyxrc.autosave) { os << "# The time interval between auto-saves in seconds.\n" - << "\\autosave " << autosave << "\n"; - } - case RC_EXIT_CONFIRMATION: - if (exit_confirmation != system_lyxrc.exit_confirmation) { - os << "# Ask for confirmation before exit if there are\n" - << "# unsaved changed documents.\n" - << "\\exit_confirmation " << tostr(exit_confirmation) - << "\n"; + << "\\autosave " << autosave << '\n'; } case RC_DISPLAY_GRAPHICS: if (display_graphics != system_lyxrc.display_graphics) { os << "# Display graphics within LyX\n" - << "# no|mono|gray|color\n" - << "\\display_graphics " << display_graphics - << "\n"; - } - - case RC_DISPLAY_SHORTCUTS: - if (display_shortcuts != system_lyxrc.display_shortcuts) { - os << "# Display name of the last command executed,\n" - << "# with a list of short-cuts in the minibuffer.\n" - << "\\display_shortcuts " << tostr(display_shortcuts) - << "\n"; + << "# monochrome|grayscale|color|none\n" + << "\\display_graphics " + << lyx::graphics::displayTranslator.find(display_graphics) + << '\n'; } + case RC_VIEWDVI_PAPEROPTION: - if (view_dvi_paper_option + if (view_dvi_paper_option != system_lyxrc.view_dvi_paper_option) { os << "# Options used to specify paper size to the\n" << "# view_dvi_command (e.g. -paper)\n" @@ -1077,21 +1141,21 @@ void LyXRC::output(ostream & os) const os << "# The default papersize to use.\n" << "\\default_papersize \""; switch (default_papersize) { - case BufferParams::PAPER_USLETTER: + case PAPER_USLETTER: os << "usletter"; break; - case BufferParams::PAPER_LEGALPAPER: + case PAPER_LEGALPAPER: os << "legal"; break; - case BufferParams::PAPER_EXECUTIVEPAPER: + case PAPER_EXECUTIVEPAPER: os << "executive"; break; - case BufferParams::PAPER_A3PAPER: + case PAPER_A3PAPER: os << "a3"; break; - case BufferParams::PAPER_A4PAPER: + case PAPER_A4PAPER: os << "a4"; break; - case BufferParams::PAPER_A5PAPER: + case PAPER_A5PAPER: os << "a5"; break; - case BufferParams::PAPER_B5PAPER: + case PAPER_B5PAPER: os << "b5"; break; - case BufferParams::PAPER_DEFAULT: break; + case PAPER_DEFAULT: break; } os << "\"\n"; } @@ -1106,7 +1170,7 @@ void LyXRC::output(ostream & os) const } case RC_KBMAP: if (use_kbmap != system_lyxrc.use_kbmap) { - os << "\\kbmap " << tostr(use_kbmap) << "\n"; + os << "\\kbmap " << tostr(use_kbmap) << '\n'; } case RC_KBMAP_PRIMARY: if (primary_kbmap != system_lyxrc.primary_kbmap) { @@ -1129,73 +1193,123 @@ void LyXRC::output(ostream & os) const case RC_LABEL_INIT_LENGTH: if (label_init_length != system_lyxrc.label_init_length) { os << "\\label_init_length " << label_init_length - << "\n"; + << '\n'; + } + + case RC_USER_NAME: + os << "\\user_name \"" << user_name << "\"\n"; + + case RC_USER_EMAIL: + os << "\\user_email \"" << user_email << "\"\n"; + + case RC_SHOW_BANNER: + if (show_banner != system_lyxrc.show_banner) { + os << "\\show_banner " << tostr(show_banner) << '\n'; + } + + case RC_PREVIEW: + if (preview != system_lyxrc.preview) { + os << "\\preview " << tostr(preview) << '\n'; + } + + case RC_PREVIEW_HASHED_LABELS: + if (preview_hashed_labels != + system_lyxrc.preview_hashed_labels) { + os << "\\preview_hashed_labels " + << tostr(preview_hashed_labels) << '\n'; + } + + case RC_PREVIEW_SCALE_FACTOR: + if (preview_scale_factor != system_lyxrc.preview_scale_factor) { + os << "\\preview_scale_factor " + << preview_scale_factor << '\n'; } os << "\n#\n" << "# SCREEN & FONTS SECTION ############################\n" << "#\n\n"; - + + case RC_POPUP_NORMAL_FONT: + if (popup_normal_font != system_lyxrc.popup_normal_font) { + os << "\\popup_normal_font \"" << popup_normal_font + << "\"\n"; + } + case RC_POPUP_BOLD_FONT: + if (popup_bold_font != system_lyxrc.popup_bold_font) { + os << "\\popup_bold_font \"" << popup_bold_font + << "\"\n"; + } + case RC_POPUP_FONT_ENCODING: + if (popup_font_encoding != system_lyxrc.popup_font_encoding) { + os << "\\popup_font_encoding \"" << popup_font_encoding + << "\"\n"; + } case RC_SCREEN_DPI: if (dpi != system_lyxrc.dpi) { - os << "\\screen_dpi " << dpi << "\n"; + os << "\\screen_dpi " << dpi << '\n'; } case RC_SCREEN_ZOOM: if (zoom != system_lyxrc.zoom) { - os << "\\screen_zoom " << zoom << "\n"; + os << "\\screen_zoom " << zoom << '\n'; } case RC_WHEEL_JUMP: if (wheel_jump != system_lyxrc.wheel_jump) { - os << "\\wheel_jump " << wheel_jump << "\n"; + os << "\\wheel_jump " << wheel_jump << '\n'; } case RC_CURSOR_FOLLOWS_SCROLLBAR: if (cursor_follows_scrollbar != system_lyxrc.cursor_follows_scrollbar) { os << "\\cursor_follows_scrollbar " - << tostr(cursor_follows_scrollbar) << "\n"; + << tostr(cursor_follows_scrollbar) << '\n'; } case RC_DIALOGS_ICONIFY_WITH_MAIN: if (dialogs_iconify_with_main != system_lyxrc.dialogs_iconify_with_main) { os << "\\dialogs_iconify_with_main " - << tostr(dialogs_iconify_with_main) << "\n"; + << tostr(dialogs_iconify_with_main) << '\n'; } case RC_SCREEN_FONT_ROMAN: if (roman_font_name != system_lyxrc.roman_font_name) { os << "\\screen_font_roman \"" << roman_font_name << "\"\n"; } + case RC_SCREEN_FONT_ROMAN_FOUNDRY: + if (roman_font_foundry != system_lyxrc.roman_font_foundry) { + os << "\\screen_font_roman_foundry \"" << roman_font_foundry + << "\"\n"; + } case RC_SCREEN_FONT_SANS: if (sans_font_name != system_lyxrc.sans_font_name) { os << "\\screen_font_sans \"" << sans_font_name << "\"\n"; } + case RC_SCREEN_FONT_SANS_FOUNDRY: + if (sans_font_foundry != system_lyxrc.sans_font_foundry) { + os << "\\screen_font_sans_foundry \"" << sans_font_foundry + << "\"\n"; + } case RC_SCREEN_FONT_TYPEWRITER: if (typewriter_font_name != system_lyxrc.typewriter_font_name) { os << "\\screen_font_typewriter \"" << typewriter_font_name << "\"\n"; } + case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY: + if (typewriter_font_foundry != system_lyxrc.typewriter_font_foundry) { + os << "\\screen_font_typewriter_foundry \"" + << typewriter_font_foundry << "\"\n"; + } + case RC_SCREEN_FONT_SCALABLE: if (use_scalable_fonts != system_lyxrc.use_scalable_fonts) { os << "\\screen_font_scalable " << tostr(use_scalable_fonts) - << "\n"; + << '\n'; } case RC_SCREEN_FONT_ENCODING: if (font_norm != system_lyxrc.font_norm) { os << "\\screen_font_encoding \"" << font_norm << "\"\n"; } - case RC_SCREEN_FONT_POPUP: - if (popup_font_name != system_lyxrc.popup_font_name) { - os << "\\screen_font_popup \"" << popup_font_name - << "\"\n"; - } - case RC_SCREEN_FONT_MENU: - if (menu_font_name != system_lyxrc.menu_font_name) { - os << "\\screen_font_menu \"" << menu_font_name - << "\"\n"; - } case RC_SCREEN_FONT_SIZES: if (font_sizes[LyXFont::SIZE_TINY] != system_lyxrc.font_sizes[LyXFont::SIZE_TINY] || @@ -1220,27 +1334,27 @@ void LyXRC::output(ostream & os) const os.setf(ios::fixed); os.precision(2); 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"; - } - + << ' ' << 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 ) { + for (int i = 0; i < LColor::ignore; ++i) { LColor::color lc = static_cast(i); - + string const col(lcolor.getX11Name(lc)); if (col != system_lcolor.getX11Name(lc)) { os << "\\set_color \"" @@ -1248,11 +1362,11 @@ void LyXRC::output(ostream & os) const << col << "\"\n"; } } - + os << "\n#\n" << "# PRINTER SECTION ###################################\n" << "#\n\n"; - + case RC_PRINTER: if (printer != system_lyxrc.printer) { os << "\\printer \"" << printer << "\"\n"; @@ -1261,7 +1375,7 @@ void LyXRC::output(ostream & os) const if (print_adapt_output != system_lyxrc.print_adapt_output) { os << "\\print_adapt_output " << tostr(print_adapt_output) - << "\n"; + << '\n'; } case RC_PRINT_COMMAND: if (print_command != system_lyxrc.print_command) { @@ -1310,7 +1424,7 @@ void LyXRC::output(ostream & os) const } case RC_PRINTCOPIESFLAG: if (print_copies_flag != system_lyxrc.print_copies_flag) { - os << "\\print_copies_flag \"" << print_copies_flag + os << "\\print_copies_flag \"" << print_copies_flag << "\"\n"; } case RC_PRINTCOLLCOPIESFLAG: @@ -1350,7 +1464,7 @@ void LyXRC::output(ostream & os) const os << "\n#\n" << "# EXPORT SECTION ####################################\n" << "#\n\n"; - + case RC_CUSTOM_EXPORT_COMMAND: if (custom_export_command != system_lyxrc.custom_export_command) { @@ -1368,7 +1482,7 @@ void LyXRC::output(ostream & os) const os << "\n#\n" << "# TEX SECTION #######################################\n" << "#\n\n"; - + case RC_FONT_ENCODING: if (fontenc != system_lyxrc.fontenc) { os << "\\font_encoding \"" << fontenc << "\"\n"; @@ -1388,12 +1502,12 @@ void LyXRC::output(ostream & os) const } case RC_NUMLASTFILES: if (num_lastfiles != system_lyxrc.num_lastfiles) { - os << "\\num_lastfiles " << num_lastfiles << "\n"; + os << "\\num_lastfiles " << num_lastfiles << '\n'; } case RC_CHECKLASTFILES: if (check_lastfiles != system_lyxrc.check_lastfiles) { os << "\\check_lastfiles " << tostr(check_lastfiles) - << "\n"; + << '\n'; } case RC_TEMPLATEPATH: if (template_path != system_lyxrc.template_path) { @@ -1405,15 +1519,15 @@ void LyXRC::output(ostream & os) const } case RC_USETEMPDIR: if (use_tempdir != system_lyxrc.use_tempdir) { - os << "\\use_tempdir " << tostr(use_tempdir) << "\n"; + os << "\\use_tempdir " << tostr(use_tempdir) << '\n'; } case RC_ASCII_LINELEN: if (ascii_linelen != system_lyxrc.ascii_linelen) { - os << "\\ascii_linelen " << ascii_linelen << "\n"; + os << "\\ascii_linelen " << ascii_linelen << '\n'; } case RC_MAKE_BACKUP: if (make_backup != system_lyxrc.make_backup) { - os << "\\make_backup " << tostr(make_backup) << "\n"; + os << "\\make_backup " << tostr(make_backup) << '\n'; } case RC_BACKUPDIR_PATH: if (backupdir_path != system_lyxrc.backupdir_path) { @@ -1433,12 +1547,10 @@ void LyXRC::output(ostream & os) const 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"; + 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"; @@ -1446,12 +1558,12 @@ void LyXRC::output(ostream & os) const case RC_ACCEPT_COMPOUND: if (isp_accept_compound != system_lyxrc.isp_accept_compound) { os << "\\accept_compound " << tostr(isp_accept_compound) - << "\n"; + << '\n'; } case RC_USE_ALT_LANG: if (isp_use_alt_lang != system_lyxrc.isp_use_alt_lang) { os << "\\use_alt_language " << tostr(isp_use_alt_lang) - << "\n"; + << '\n'; } case RC_ALT_LANG: if (isp_alt_lang != system_lyxrc.isp_alt_lang) { @@ -1461,7 +1573,7 @@ void LyXRC::output(ostream & os) const case RC_USE_ESC_CHARS: if (isp_use_esc_chars != system_lyxrc.isp_use_esc_chars) { os << "\\use_escape_chars " << tostr(isp_use_esc_chars) - << "\n"; + << '\n'; } case RC_ESC_CHARS: if (isp_esc_chars != system_lyxrc.isp_esc_chars) { @@ -1471,7 +1583,7 @@ void LyXRC::output(ostream & os) const if (isp_use_pers_dict != system_lyxrc.isp_use_pers_dict) { os << "\\use_personal_dictionary " << tostr(isp_use_pers_dict) - << "\n"; + << '\n'; } case RC_PERS_DICT: if (isp_pers_dict != system_lyxrc.isp_pers_dict) { @@ -1483,7 +1595,7 @@ void LyXRC::output(ostream & os) const != system_lyxrc.isp_use_input_encoding) { os << "\\use_input_encoding " << tostr(isp_use_input_encoding) - << "\n"; + << '\n'; } os << "\n#\n" @@ -1492,7 +1604,7 @@ void LyXRC::output(ostream & os) const case RC_RTL_SUPPORT: if (rtl_support != system_lyxrc.rtl_support) { - os << "\\rtl " << tostr(rtl_support) << "\n"; + os << "\\rtl " << tostr(rtl_support) << '\n'; } case RC_LANGUAGE_PACKAGE: if (language_package != system_lyxrc.language_package) { @@ -1534,47 +1646,32 @@ void LyXRC::output(ostream & os) const } case RC_LANGUAGE_AUTO_BEGIN: if (language_auto_begin != system_lyxrc.language_auto_begin) { - os << "\\language_auto_begin " - << tostr(language_auto_begin) << "\n"; + os << "\\language_auto_begin " + << tostr(language_auto_begin) << '\n'; } case RC_LANGUAGE_AUTO_END: if (language_auto_end != system_lyxrc.language_auto_end) { - os << "\\language_auto_end " - << tostr(language_auto_end) << "\n"; + os << "\\language_auto_end " + << tostr(language_auto_end) << '\n'; } case RC_MARK_FOREIGN_LANGUAGE: if (mark_foreign_language != system_lyxrc.mark_foreign_language) { os << "\\mark_foreign_language " << - tostr(mark_foreign_language) << "\n"; + tostr(mark_foreign_language) << '\n'; } os << "\n#\n" << "# 2nd MISC SUPPORT SECTION ##########################\n" << "#\n\n"; - case RC_OVERRIDE_X_DEADKEYS: - if (override_x_deadkeys != system_lyxrc.override_x_deadkeys) { - os << "\\override_x_deadkeys " - << tostr(override_x_deadkeys) << "\n"; - } - case RC_SCREEN_FONT_ENCODING_MENU: - if (font_norm_menu != system_lyxrc.font_norm_menu) { - os << "\\screen_font_encoding_menu \"" << font_norm_menu - << "\"\n"; - } case RC_AUTO_NUMBER: if (auto_number != system_lyxrc.auto_number) { - os << "\\auto_number " << tostr(auto_number) << "\n"; - } - case RC_NEW_ASK_FILENAME: - if (new_ask_filename != system_lyxrc.new_ask_filename) { - os << "\\new_ask_filename " << tostr(new_ask_filename) - << "\n"; + os << "\\auto_number " << tostr(auto_number) << '\n'; } case RC_DEFAULT_LANGUAGE: if (default_language != system_lyxrc.default_language) { - os << "\\default_language " << default_language << "\n"; + os << "\\default_language " << default_language << '\n'; } os << "\n#\n" @@ -1601,12 +1698,12 @@ void LyXRC::output(ostream & os) const for (Formats::const_iterator cit = system_formats.begin(); cit != system_formats.end(); ++cit) if (!formats.getFormat(cit->name())) - os << "\\format \"" << cit->name() + os << "\\format \"" << cit->name() << "\" \"\" \"\" \"\"\n"; case RC_VIEWER: for (Formats::const_iterator cit = formats.begin(); cit != formats.end(); ++cit) { - Format const * format = + Format const * format = system_formats.getFormat(cit->name()); if ((!format || format->viewer() != cit->viewer()) && (format || !cit->viewer().empty())) @@ -1638,8 +1735,9 @@ void LyXRC::output(ostream & os) const for (Converters::const_iterator cit = system_converters.begin(); cit != system_converters.end(); ++cit) if (!converters.getConverter(cit->from, cit->to)) - os << "\\converter \"" << cit->from + os << "\\converter \"" << cit->from << "\" \"" << cit->to << "\" \"\" \"\"\n"; + } os.flush(); } @@ -1650,6 +1748,10 @@ void LyXRC::set_font_norm_type() font_norm_type = ISO_10646_1; else if (font_norm == "iso8859-1") font_norm_type = ISO_8859_1; + else if (font_norm == "iso8859-3") + font_norm_type = ISO_8859_3; + else if (font_norm == "iso8859-4") + font_norm_type = ISO_8859_4; else if (font_norm == "iso8859-6.8x") font_norm_type = ISO_8859_6_8; else if (font_norm == "iso8859-9") @@ -1661,344 +1763,339 @@ void LyXRC::set_font_norm_type() } -string const LyXRC::getDescription(LyXRCTags tag) +string const LyXRC::getDescription(LyXRCTags tag) { string str; - + switch (tag) { case RC_FONT_ENCODING: - str = N_("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages."); + str = _("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages."); break; - + case RC_PRINTER: - str = N_("The default printer to print on. If none is specified, LyX will use the environment variable PRINTER."); + str = _("The default printer to print on. If none is specified, LyX will use the environment variable PRINTER."); break; - + case RC_PRINT_COMMAND: - str = N_("Your favorite print program, e.g. \"dvips\", \"dvilj4\"."); + str = _("Your favorite print program, e.g. \"dvips\", \"dvilj4\"."); break; - + case RC_PRINTEVENPAGEFLAG: - str = N_("The option to print only even pages."); + str = _("The option to print only even pages."); break; case RC_PRINTODDPAGEFLAG: - str = N_("The option to print only odd pages."); + str = _("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."); + str = _("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."); + str = _("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."); + str = _("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."); + str = _("The option to reverse the order of the pages printed."); break; case RC_PRINTLANDSCAPEFLAG: - str = N_("The option to print out in landscape."); + str = _("The option to print out in landscape."); break; - case RC_PRINTPAPERFLAG: - str = N_("The option to specify paper type."); + case RC_PRINTPAPERFLAG: + str = _("The option to specify paper type."); break; case RC_PRINTPAPERDIMENSIONFLAG: - str = N_("Option to specify the dimensions of the print paper."); + str = _("Option to specify the dimensions of the print paper."); break; - + case RC_PRINTTOPRINTER: - str = N_("Option to pass to the print program to print on a specific printer."); + str = _("Option to pass to the print program to print on a specific printer."); break; - + case RC_PRINT_ADAPTOUTPUT: - str = N_("Select for LyX to pass the name of the destination printer to your print command."); + str = _("Select for LyX to pass the name of the destination printer to your print command."); break; - + case RC_PRINTTOFILE: - str = N_("Option to pass to the print program to print to a file."); + str = _("Option to pass to the print program to print to a file."); break; - + case RC_PRINTFILEEXTENSION: - str = N_("Extension of printer program output file. Usually \".ps\"."); + str = _("Extension of printer program output file. Usually \".ps\"."); break; - + case RC_PRINTEXSTRAOPTIONS: - str = N_("Extra options to pass to printing program after everything else, but before the filename of the DVI file to be printed."); + str = _("Extra options to pass to printing program after everything else, but before the filename of the DVI file to be printed."); break; - + case RC_PRINTSPOOL_COMMAND: - str = N_("When set, this printer option automatically prints to a file and then calls a separate print spooling program on that file with the given name and arguments."); + str = _("When set, this printer option automatically prints to a file and then calls a separate print spooling program on that file with the given name and arguments."); break; - + case RC_PRINTSPOOL_PRINTERPREFIX: - str = N_("If you specify a printer name in the print dialog, the following argument is prepended along with the printer name after the spool command."); + str = _("If you specify a printer name in the print dialog, the following argument is prepended along with the printer name after the spool command."); break; - + case RC_SCREEN_DPI: - str = N_("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here."); + 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_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."); + str = _("The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper."); break; - + case RC_SCREEN_FONT_SIZES: - str = N_("The font sizes used for calculating the scaling of the screen fonts."); + str = _("The font sizes used for calculating the scaling of the screen fonts."); break; - + case RC_SCREEN_FONT_ROMAN: case RC_SCREEN_FONT_SANS: case RC_SCREEN_FONT_TYPEWRITER: - str = N_("The screen fonts used to display the text while editing."); + str = _("The screen fonts used to display the text while editing."); break; - - case RC_SCREEN_FONT_MENU: - str = N_("The font for menus (and groups titles in popups)."); + + case RC_POPUP_BOLD_FONT: + str = _("The bold font in the dialogs."); break; - - case RC_SCREEN_FONT_POPUP: - str = N_("The font for popups."); + + case RC_POPUP_NORMAL_FONT: + str = _("The normal font in the dialogs."); break; - + case RC_SCREEN_FONT_ENCODING: - str = N_("The encoding for the screen fonts."); + str = _("The encoding for the screen fonts."); break; - - case RC_SCREEN_FONT_ENCODING_MENU: - str = N_("The encoding for the menu/popups fonts."); + + case RC_POPUP_FONT_ENCODING: + str = _("The encoding for the menu/popups fonts."); break; - + case RC_SET_COLOR: break; - + case RC_AUTOSAVE: - str = N_("The time interval between auto-saves (in seconds). 0 means no auto-save."); + str = _("The time interval between auto-saves (in seconds). 0 means no auto-save."); break; - + case RC_DOCUMENTPATH: - str = N_("The default path for your documents."); + str = _("The default path for your documents. An empty value selects the directory LyX was started from."); break; - + case RC_TEMPLATEPATH: - str = N_("The path that LyX will set when offering to choose a template."); + str = _("The path that LyX will set when offering to choose a template. An empty value selects the directory LyX was started from."); break; - + case RC_TEMPDIRPATH: - str = N_("LyX will place its temporary directories in this path. They will be deleted when you quit LyX."); + str = _("LyX will place its temporary directories in this path. They will be deleted when you quit LyX."); break; - + case RC_USETEMPDIR: - str = N_("Select if you wish to use a temporary directory structure to store temporary TeX output."); + str = _("Select if you wish to use a temporary directory structure to store temporary TeX output."); break; - + case RC_LASTFILES: - str = N_("The file where the last-files information should be stored."); + str = _("The file where the last-files information should be stored."); break; - + case RC_AUTOREGIONDELETE: - str = N_("De-select if you don't want the current selection to be replaced automatically by what you type."); + str = _("De-select if you don't want the current selection to be replaced automatically by what you type."); break; case RC_AUTORESET_OPTIONS: - str = N_("De-select if you don't want the class options to be reset to defaults after class change."); + str = _("De-select if you don't want the class options to be reset to defaults after class change."); break; - - case RC_OVERRIDE_X_DEADKEYS: - 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; - case RC_SERVERPIPE: - str = N_("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users."); + str = _("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users."); break; case RC_BINDFILE: - str = N_("Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories."); + str = _("Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories."); break; case RC_UIFILE: - str = N_("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories."); + str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories."); break; - + case RC_KBMAP: case RC_KBMAP_PRIMARY: case RC_KBMAP_SECONDARY: - 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."); + str = _("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; 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."); + str = _("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; - + case RC_ASCII_LINELEN: - str = N_("This is the maximum line length of an exported ASCII file (LaTeX, SGML or plain text)."); + str = _("This is the maximum line length of an exported ASCII file (LaTeX, SGML or plain text)."); break; - + case RC_NUMLASTFILES: - str = N_("Maximal number of lastfiles. Up to 9 can appear in the file menu."); + str = _("Maximal number of lastfiles. Up to 9 can appear in the file menu."); break; - + case RC_CHECKLASTFILES: - str = N_("Select to check whether the lastfiles still exist."); + str = _("Select to check whether the lastfiles still exist."); break; - + case RC_VIEWDVI_PAPEROPTION: - str = N_("Specify the paper command to DVI viewer (leave empty or use \"-paper\")"); + str = _("Specify the paper command to DVI viewer (leave empty or use \"-paper\")"); break; - + case RC_DEFAULT_PAPERSIZE: - str = N_("Specify the default paper size."); + str = _("Specify the default paper size."); break; - + case RC_PS_COMMAND: break; - + case RC_ACCEPT_COMPOUND: - str = N_("Consider run-together words, such as \"diskdrive\" for \"disk drive\", as legal words?"); + str = _("Consider run-together words, such as \"diskdrive\" for \"disk drive\", as legal words?"); break; - + case RC_SPELL_COMMAND: - str = N_("What command runs the spell checker?"); + str = _("What command runs the spell checker?"); break; - + case RC_USE_INP_ENC: - str = N_("Specify whether to pass the -T input encoding option to ispell. Enable this if you can't spellcheck words with international letters in them. This may not work with all dictionaries."); + str = _("Specify whether to pass the -T input encoding option to ispell. Enable this if you can't spellcheck words with international letters in them. This may not work with all dictionaries."); break; - + case RC_USE_ALT_LANG: case RC_ALT_LANG: - str = N_("Specify an alternate language. The default is to use the language of the document."); + str = _("Specify an alternate language. The default is to use the language of the document."); break; - + case RC_USE_PERS_DICT: case RC_PERS_DICT: - str = N_("Specify an alternate personal dictionary file. E.g. \".ispell_english\"."); + str = _("Specify an alternate personal dictionary file. E.g. \".ispell_english\"."); break; - + case RC_USE_ESC_CHARS: case RC_ESC_CHARS: - str = N_("Specify additional chars that can be part of a word."); + str = _("Specify additional chars that can be part of a word."); 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 = _("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: - str = N_("Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\" Refer to the ChkTeX documentation."); + str = _("Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\" Refer to the ChkTeX documentation."); break; - + case RC_CURSOR_FOLLOWS_SCROLLBAR: - str = N_("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen."); + str = _("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen."); break; - + case RC_DIALOGS_ICONIFY_WITH_MAIN: - str = N_("Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)"); - break; - - case RC_EXIT_CONFIRMATION: - str = N_("Sets whether LyX asks for a second confirmation to exit when you have changed documents. (LyX will still ask to save changed documents.)"); + str = _("Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)"); break; - + case RC_DISPLAY_GRAPHICS: - str = N_("Select how LyX will display any graphics."); - break; - - case RC_DISPLAY_SHORTCUTS: - str = N_("LyX continously displays names of last command executed, along with a list of defined short-cuts for it in the minibuffer. Set to false if LyX seems slow."); + str = _("Select how LyX will display any graphics."); break; - + case RC_MAKE_BACKUP: - str = N_("De-select if you don't want LyX to create backup files."); + str = _("De-select if you don't want LyX to create backup files."); break; - + case RC_BACKUPDIR_PATH: - str = N_("The path for storing backup files. If it is an empty string, LyX will store the backup file in the same directory as the original file."); + str = _("The path for storing backup files. If it is an empty string, LyX will store the backup file in the same directory as the original file."); break; case RC_RTL_SUPPORT: - str = N_("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)."); + str = _("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)."); break; - + case RC_MARK_FOREIGN_LANGUAGE: - str = N_("Select to control the highlighting of words with a language foreign to that of the document."); + str = _("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}\"."); + str = _("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."); + str = _("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."); + str = _("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_("Select if a language switching command is needed at the beginning of the document."); + str = _("Select if a language switching command is needed at the beginning of the document."); break; - + case RC_LANGUAGE_AUTO_END: - str = N_("Select if a language switching command is needed at the end of the document."); + str = _("Select if a language switching command is needed at the end of the document."); break; - + case RC_LANGUAGE_COMMAND_BEGIN: - str = N_("The latex command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language."); + str = _("The LaTeX command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language."); break; - + case RC_LANGUAGE_COMMAND_END: - str = N_("The latex command for changing back to the language of the document."); + str = _("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."); + str = _("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\"."); + str = _("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_("De-select if you don't want the startup banner."); + str = _("De-select if you don't want the startup banner."); break; - + case RC_WHEEL_JUMP: - str = N_("The wheel movement factor (for mice with wheels or five button mice)."); + str = _("The number of lines that are scrolled by mice with wheels or five button mice."); break; - + case RC_CONVERTER: break; - + case RC_VIEWER: break; - + case RC_FORMAT: break; - - case RC_NEW_ASK_FILENAME: - str = N_("This sets the behaviour if you want to be asked for a filename when creating a new document or wait until you save it and be asked then."); - break; - + case RC_DEFAULT_LANGUAGE: - str = N_("New documents will be assigned this language."); + str = _("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"); + str = _("Maximum number of words in the initialization string for a new label"); + break; + + case RC_PREVIEW: + str = _("Shows a typeset preview of things such as math"); + break; + + case RC_PREVIEW_HASHED_LABELS: + str = _("Previewed equations will have \"(#)\" labels rather than numbered ones"); + break; + + case RC_PREVIEW_SCALE_FACTOR: + str = _("Scale the preview size to suit."); break; - + default: break; }