X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrc.C;h=3831760b44648442190fda92949012cef80c69eb;hb=98c966c64594611e469313314abd1e59524adb4a;hp=8a50c1cdb7f0753f10457dc7834884abed24f0a2;hpb=9625f5e2300339330e099ccea259c46667ea1461;p=lyx.git diff --git a/src/lyxrc.C b/src/lyxrc.C index 8a50c1cdb7..3831760b44 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1,10 +1,10 @@ /* This file is part of * ====================================================== - * + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ @@ -23,272 +23,147 @@ #include "lyxrc.h" #include "kbmap.h" #include "LyXAction.h" -#include "lyxserver.h" #include "lyx_main.h" #include "intl.h" -#include "tex-strings.h" #include "support/path.h" #include "support/filetools.h" #include "lyxtext.h" #include "converter.h" +#include "gettext.h" using std::ostream; using std::ofstream; using std::cout; using std::ios; using std::endl; +using std::vector; -// this is crappy... why are those colors command line arguments and -// not in lyxrc?? (Matthias) -// Because nobody put them there. (Asger) - -extern bool cursor_follows_scrollbar; extern LyXAction lyxaction; -extern kb_keymap * toplevel_keymap; - - -enum LyXRCTags { - RC_FONT_ENCODING = 1, - RC_PRINTER, - RC_PRINT_COMMAND, - RC_PRINTEVENPAGEFLAG, - RC_PRINTODDPAGEFLAG, - RC_PRINTPAGERANGEFLAG, - RC_PRINTCOPIESFLAG, - RC_PRINTCOLLCOPIESFLAG, - RC_PRINTREVERSEFLAG, - RC_PRINTLANDSCAPEFLAG, - RC_PRINTTOPRINTER, - RC_PRINT_ADAPTOUTPUT, - RC_PRINTTOFILE, - RC_PRINTFILEEXTENSION, - RC_PRINTEXSTRAOPTIONS, - RC_PRINTSPOOL_COMMAND, - RC_PRINTSPOOL_PRINTERPREFIX, - RC_PRINTPAPERFLAG, - RC_PRINTPAPERDIMENSIONFLAG, - RC_CUSTOM_EXPORT_COMMAND, - RC_CUSTOM_EXPORT_FORMAT, - RC_LATEX_COMMAND, - RC_LITERATE_COMMAND, - RC_LITERATE_EXTENSION, - RC_LITERATE_ERROR_FILTER, - RC_BUILD_COMMAND, - RC_BUILD_ERROR_FILTER, - RC_SCREEN_DPI, - RC_SCREEN_ZOOM, - RC_SCREEN_FONT_SIZES, - RC_SCREEN_FONT_ROMAN, - RC_SCREEN_FONT_SANS, - RC_SCREEN_FONT_TYPEWRITER, - RC_SCREEN_FONT_MENU, - RC_SCREEN_FONT_POPUP, - RC_SCREEN_FONT_ENCODING, - RC_SCREEN_FONT_ENCODING_MENU, - RC_SET_COLOR, - RC_AUTOSAVE, - RC_DOCUMENTPATH, - RC_TEMPLATEPATH, - RC_TEMPDIRPATH, - RC_USETEMPDIR, - RC_LASTFILES, - RC_AUTOREGIONDELETE, - RC_BIND, - RC_OVERRIDE_X_DEADKEYS, - RC_SERVERPIPE, - RC_INPUT, - RC_BINDFILE, - RC_UIFILE, - RC_KBMAP, - RC_KBMAP_PRIMARY, - RC_KBMAP_SECONDARY, - RC_FAX_COMMAND, - RC_PHONEBOOK, - RC_FAXPROGRAM, - RC_ASCIIROFF_COMMAND, - RC_ASCII_LINELEN, - RC_NUMLASTFILES, - RC_CHECKLASTFILES, - RC_VIEWDVI_COMMAND, - RC_VIEWDVI_PAPEROPTION, - RC_DEFAULT_PAPERSIZE, - RC_PS_COMMAND, - RC_VIEWPS_COMMAND, - RC_VIEWPSPIC_COMMAND, - RC_ACCEPT_COMPOUND, - RC_SPELL_COMMAND, - RC_USE_INP_ENC, - RC_USE_ALT_LANG, - RC_USE_PERS_DICT, - RC_USE_ESC_CHARS, - RC_SCREEN_FONT_SCALABLE, - RC_ALT_LANG, - RC_PERS_DICT, - RC_ESC_CHARS, - RC_CHKTEX_COMMAND, - RC_CURSOR_FOLLOWS_SCROLLBAR, - RC_EXIT_CONFIRMATION, - RC_DISPLAY_SHORTCUTS, - RC_RELYX_COMMAND, - RC_HTML_COMMAND, - RC_MAKE_BACKUP, - RC_BACKUPDIR_PATH, - RC_RTL_SUPPORT, - RC_AUTO_NUMBER, - RC_MARK_FOREIGN_LANGUAGE, - RC_LANGUAGE_PACKAGE, - RC_LANGUAGE_AUTO_BEGIN, - RC_LANGUAGE_AUTO_END, - RC_LANGUAGE_COMMAND_BEGIN, - RC_LANGUAGE_COMMAND_END, - RC_PDFLATEX_COMMAND, - RC_PDF_MODE, - RC_VIEWPDF_COMMAND, - RC_PDF_TO_PS_COMMAND, - RC_DVI_TO_PS_COMMAND, - RC_DATE_INSERT_FORMAT, - RC_SHOW_BANNER, - RC_USE_GUI, - RC_LINUXDOC_TO_LYX_COMMAND, - RC_LINUXDOC_TO_HTML_COMMAND, - RC_LINUXDOC_TO_LATEX_COMMAND, - RC_DOCBOOK_TO_DVI_COMMAND, - RC_DOCBOOK_TO_HTML_COMMAND, - RC_DOCBOOK_TO_PDF_COMMAND, - RC_WHEEL_JUMP, - RC_CONVERTER, - RC_VIEWER, - RC_NEW_ASK_FILENAME, - RC_LAST -}; +extern boost::scoped_ptr toplevel_keymap; +namespace { -static keyword_item lyxrcTags[] = { - { "\\accept_compound", RC_ACCEPT_COMPOUND }, - { "\\alternate_language", RC_ALT_LANG }, - { "\\ascii_linelen", RC_ASCII_LINELEN }, - { "\\ascii_roff_command", RC_ASCIIROFF_COMMAND }, - { "\\auto_number", RC_AUTO_NUMBER }, - { "\\auto_region_delete", RC_AUTOREGIONDELETE }, - { "\\autosave", RC_AUTOSAVE }, - { "\\backupdir_path", RC_BACKUPDIR_PATH }, - { "\\bind", RC_BIND }, - { "\\bind_file", RC_BINDFILE }, - { "\\build_command", RC_BUILD_COMMAND }, - { "\\build_error_filter", RC_BUILD_ERROR_FILTER }, - { "\\check_lastfiles", RC_CHECKLASTFILES }, - { "\\chktex_command", RC_CHKTEX_COMMAND }, - { "\\converter", RC_CONVERTER }, - { "\\cursor_follows_scrollbar", RC_CURSOR_FOLLOWS_SCROLLBAR }, - { "\\custom_export_command", RC_CUSTOM_EXPORT_COMMAND }, - { "\\custom_export_format", RC_CUSTOM_EXPORT_FORMAT }, - { "\\date_insert_format", RC_DATE_INSERT_FORMAT }, - { "\\default_papersize", RC_DEFAULT_PAPERSIZE }, - { "\\display_shortcuts", RC_DISPLAY_SHORTCUTS }, - { "\\docbook_to_dvi_command", RC_DOCBOOK_TO_DVI_COMMAND }, - { "\\docbook_to_html_command", RC_DOCBOOK_TO_HTML_COMMAND }, - { "\\docbook_to_pdf_command", RC_DOCBOOK_TO_PDF_COMMAND }, - { "\\document_path", RC_DOCUMENTPATH }, - { "\\dvi_to_ps_command", RC_DVI_TO_PS_COMMAND }, - { "\\escape_chars", RC_ESC_CHARS }, - { "\\exit_confirmation", RC_EXIT_CONFIRMATION }, - { "\\fax_command", RC_FAX_COMMAND }, - { "\\fax_program", RC_FAXPROGRAM }, - { "\\font_encoding", RC_FONT_ENCODING }, - { "\\html_command", RC_HTML_COMMAND }, - { "\\input", RC_INPUT }, - { "\\kbmap", RC_KBMAP }, - { "\\kbmap_primary", RC_KBMAP_PRIMARY }, - { "\\kbmap_secondary", RC_KBMAP_SECONDARY }, - { "\\language_auto_begin", RC_LANGUAGE_AUTO_BEGIN }, - { "\\language_auto_end", RC_LANGUAGE_AUTO_END }, - { "\\language_command_begin", RC_LANGUAGE_COMMAND_BEGIN }, - { "\\language_command_end", RC_LANGUAGE_COMMAND_END }, - { "\\language_package", RC_LANGUAGE_PACKAGE }, - { "\\lastfiles", RC_LASTFILES }, - { "\\latex_command", RC_LATEX_COMMAND }, - { "\\linuxdoc_to_html_command", RC_LINUXDOC_TO_HTML_COMMAND }, - { "\\linuxdoc_to_latex_command", RC_LINUXDOC_TO_LATEX_COMMAND }, - { "\\linuxdoc_to_lyx_command", RC_LINUXDOC_TO_LYX_COMMAND }, - { "\\literate_command", RC_LITERATE_COMMAND }, - { "\\literate_error_filter", RC_LITERATE_ERROR_FILTER }, - { "\\literate_extension", RC_LITERATE_EXTENSION }, - { "\\make_backup", RC_MAKE_BACKUP }, - { "\\mark_foreign_language", RC_MARK_FOREIGN_LANGUAGE }, - { "\\new_ask_filename", RC_NEW_ASK_FILENAME }, - { "\\num_lastfiles", RC_NUMLASTFILES }, - { "\\override_x_deadkeys", RC_OVERRIDE_X_DEADKEYS }, - { "\\pdf_mode", RC_PDF_MODE }, - { "\\pdf_to_ps_command", RC_PDF_TO_PS_COMMAND }, - { "\\pdflatex_command", RC_PDFLATEX_COMMAND }, - { "\\personal_dictionary", RC_PERS_DICT }, - { "\\phone_book", RC_PHONEBOOK }, - { "\\print_adapt_output", RC_PRINT_ADAPTOUTPUT }, - { "\\print_collcopies_flag", RC_PRINTCOLLCOPIESFLAG }, - { "\\print_command", RC_PRINT_COMMAND }, - { "\\print_copies_flag", RC_PRINTCOPIESFLAG }, - { "\\print_evenpage_flag", RC_PRINTEVENPAGEFLAG }, - { "\\print_extra_options", RC_PRINTEXSTRAOPTIONS }, - { "\\print_file_extension", RC_PRINTFILEEXTENSION }, - { "\\print_landscape_flag", RC_PRINTLANDSCAPEFLAG }, - { "\\print_oddpage_flag", RC_PRINTODDPAGEFLAG }, - { "\\print_pagerange_flag", RC_PRINTPAGERANGEFLAG }, - { "\\print_paper_dimension_flag", RC_PRINTPAPERDIMENSIONFLAG }, - { "\\print_paper_flag", RC_PRINTPAPERFLAG }, - { "\\print_reverse_flag", RC_PRINTREVERSEFLAG }, - { "\\print_spool_command", RC_PRINTSPOOL_COMMAND }, - { "\\print_spool_printerprefix", RC_PRINTSPOOL_PRINTERPREFIX }, - { "\\print_to_file", RC_PRINTTOFILE }, - { "\\print_to_printer", RC_PRINTTOPRINTER }, - { "\\printer", RC_PRINTER }, - { "\\ps_command", RC_PS_COMMAND }, - { "\\relyx_command", RC_RELYX_COMMAND }, - { "\\rtl", RC_RTL_SUPPORT }, - { "\\screen_dpi", RC_SCREEN_DPI }, - { "\\screen_font_encoding", RC_SCREEN_FONT_ENCODING }, - { "\\screen_font_encoding_menu", RC_SCREEN_FONT_ENCODING_MENU }, - { "\\screen_font_menu", RC_SCREEN_FONT_MENU }, - { "\\screen_font_popup", RC_SCREEN_FONT_POPUP }, - { "\\screen_font_roman", RC_SCREEN_FONT_ROMAN }, - { "\\screen_font_sans", RC_SCREEN_FONT_SANS }, - { "\\screen_font_scalable", RC_SCREEN_FONT_SCALABLE }, - { "\\screen_font_sizes", RC_SCREEN_FONT_SIZES }, - { "\\screen_font_typewriter", RC_SCREEN_FONT_TYPEWRITER }, - { "\\screen_zoom", RC_SCREEN_ZOOM }, - { "\\serverpipe", RC_SERVERPIPE }, - { "\\set_color", RC_SET_COLOR }, - { "\\show_banner", RC_SHOW_BANNER }, - { "\\spell_command", RC_SPELL_COMMAND }, - { "\\tempdir_path", RC_TEMPDIRPATH }, - { "\\template_path", RC_TEMPLATEPATH }, - { "\\ui_file", RC_UIFILE }, - { "\\use_alt_language", RC_USE_ALT_LANG }, - { "\\use_escape_chars", RC_USE_ESC_CHARS }, - { "\\use_gui", RC_USE_GUI }, - { "\\use_input_encoding", RC_USE_INP_ENC }, - { "\\use_personal_dictionary", RC_USE_PERS_DICT }, - { "\\use_tempdir", RC_USETEMPDIR }, - { "\\view_dvi_command", RC_VIEWDVI_COMMAND }, - { "\\view_dvi_paper_option", RC_VIEWDVI_PAPEROPTION }, - { "\\view_pdf_command", RC_VIEWPDF_COMMAND }, - { "\\view_ps_command", RC_VIEWPS_COMMAND }, - { "\\view_pspic_command", RC_VIEWPSPIC_COMMAND }, - { "\\viewer" ,RC_VIEWER}, - { "\\wheel_jump", RC_WHEEL_JUMP } + { "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND }, + { "\\alternate_language", LyXRC::RC_ALT_LANG }, + { "\\ascii_linelen", LyXRC::RC_ASCII_LINELEN }, + { "\\ascii_roff_command", LyXRC::RC_ASCIIROFF_COMMAND }, + { "\\auto_number", LyXRC::RC_AUTO_NUMBER }, + { "\\auto_region_delete", LyXRC::RC_AUTOREGIONDELETE }, + { "\\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 }, + { "\\converter", LyXRC::RC_CONVERTER }, + { "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR }, + { "\\custom_export_command", LyXRC::RC_CUSTOM_EXPORT_COMMAND }, + { "\\custom_export_format", LyXRC::RC_CUSTOM_EXPORT_FORMAT }, + { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT }, + { "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE }, + { "\\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 }, + { "\\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 }, + { "\\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 }, + { "\\print_adapt_output", LyXRC::RC_PRINT_ADAPTOUTPUT }, + { "\\print_collcopies_flag", LyXRC::RC_PRINTCOLLCOPIESFLAG }, + { "\\print_command", LyXRC::RC_PRINT_COMMAND }, + { "\\print_copies_flag", LyXRC::RC_PRINTCOPIESFLAG }, + { "\\print_evenpage_flag", LyXRC::RC_PRINTEVENPAGEFLAG }, + { "\\print_extra_options", LyXRC::RC_PRINTEXSTRAOPTIONS }, + { "\\print_file_extension", LyXRC::RC_PRINTFILEEXTENSION }, + { "\\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_reverse_flag", LyXRC::RC_PRINTREVERSEFLAG }, + { "\\print_spool_command", LyXRC::RC_PRINTSPOOL_COMMAND }, + { "\\print_spool_printerprefix", LyXRC::RC_PRINTSPOOL_PRINTERPREFIX }, + { "\\print_to_file", LyXRC::RC_PRINTTOFILE }, + { "\\print_to_printer", LyXRC::RC_PRINTTOPRINTER }, + { "\\printer", LyXRC::RC_PRINTER }, + { "\\ps_command", LyXRC::RC_PS_COMMAND }, + { "\\rtl", LyXRC::RC_RTL_SUPPORT }, + { "\\screen_dpi", LyXRC::RC_SCREEN_DPI }, + { "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING }, + // 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_sans", LyXRC::RC_SCREEN_FONT_SANS }, + { "\\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_zoom", LyXRC::RC_SCREEN_ZOOM }, + { "\\serverpipe", LyXRC::RC_SERVERPIPE }, + { "\\set_color", LyXRC::RC_SET_COLOR }, + { "\\show_banner", LyXRC::RC_SHOW_BANNER }, + { "\\spell_command", LyXRC::RC_SPELL_COMMAND }, + { "\\tempdir_path", LyXRC::RC_TEMPDIRPATH }, + { "\\template_path", LyXRC::RC_TEMPLATEPATH }, + { "\\ui_file", LyXRC::RC_UIFILE }, + { "\\use_alt_language", LyXRC::RC_USE_ALT_LANG }, + { "\\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}, + { "\\wheel_jump", LyXRC::RC_WHEEL_JUMP } }; /* 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() +LyXRC::LyXRC() { setDefaults(); } 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. @@ -307,30 +182,14 @@ 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; - pdf_mode = false; - latex_command = "latex"; - pdflatex_command = "pdflatex"; - pdf_to_ps_command = "pdf2ps"; - dvi_to_ps_command = "dvips"; - literate_command = "none"; - literate_extension = "none"; - literate_error_filter = "cat"; - build_command = "make"; - build_error_filter = "cat"; - relyx_command = "reLyX"; ps_command = "gs"; - view_ps_command = "ghostview -swap"; - view_pspic_command = "ghostview"; - view_dvi_command = "xdvi"; - view_dvi_paper_option = "-paper"; - view_pdf_command = "xpdf"; + view_dvi_paper_option.erase(); default_papersize = BufferParams::PAPER_USLETTER; custom_export_format = "ps"; chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"; - html_command = "tth -t"; fontenc = "default"; dpi = 75; // Because a screen typically is wider than a piece of paper: @@ -351,22 +210,27 @@ void LyXRC::setDefaults() { roman_font_name = "-*-times"; sans_font_name = "-*-helvetica"; typewriter_font_name = "-*-courier"; - menu_font_name = "-*-helvetica-bold-r"; - popup_font_name = "-*-helvetica-medium-r"; + popup_bold_font = "-*-helvetica-bold-r"; + popup_normal_font = "-*-helvetica-medium-r"; font_norm = "iso8859-1"; - font_norm_type = OTHER_ENCODING; - font_norm_menu = ""; + font_norm_type = ISO_8859_1; + popup_font_encoding.erase(); override_x_deadkeys = true; autosave = 300; auto_region_delete = true; + auto_reset_options = false; ascii_linelen = 65; num_lastfiles = 4; check_lastfiles = true; make_backup = true; - backupdir_path = ""; + backupdir_path.erase(); exit_confirmation = true; + display_graphics = "color"; display_shortcuts = true; // Spellchecker settings: +#ifdef USE_PSPELL + use_pspell = true; +#endif isp_command = "ispell"; isp_accept_compound = false; isp_use_input_encoding = false; @@ -374,62 +238,65 @@ void LyXRC::setDefaults() { 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; - use_gui = true; - - /// - linuxdoc_to_latex_command="none"; - linuxdoc_to_lyx_command="none"; - linuxdoc_to_html_command="none"; + cursor_follows_scrollbar = false; + dialogs_iconify_with_main = false; + label_init_length = 3; - docbook_to_dvi_command="none"; - docbook_to_html_command="none"; - docbook_to_pdf_command="none"; + /// These variables are not stored on disk (perhaps they + // should be moved from the LyXRC class). + use_gui = true; + pdf_mode = false; } 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; - - lyxerr[Debug::INIT] << "Reading '" << filename << "'..." << endl; - - while (lexrc.IsOK()) { + 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 // the second switch. @@ -438,19 +305,20 @@ int LyXRC::read(string const & filename) // compiler. int le = lexrc.lex(); - switch(le) { + 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()) { - string tmp = LibFileSearch(string(), - lexrc.GetString()); + if (lexrc.next()) { + string const tmp = + LibFileSearch(string(), + lexrc.getString()); if (read(tmp)) { lexrc.printError("Error reading " "included file: "+tmp); @@ -459,421 +327,356 @@ int LyXRC::read(string const & filename) 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: + + 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_AUTORESET_OPTIONS: + 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(); + 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, - "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 kmap(lexrc.GetString()); + 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()) - 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(); - break; - - case RC_PRINTPAPERDIMENSIONFLAG: - if (lexrc.next()) - print_paper_dimension_flag = lexrc.GetString(); - break; - - case RC_PRINTPAPERFLAG: - if (lexrc.next()) - print_paper_flag = lexrc.GetString(); - break; - - case RC_CUSTOM_EXPORT_COMMAND: - if (lexrc.next()) - custom_export_command = lexrc.GetString(); - break; - - case RC_CUSTOM_EXPORT_FORMAT: - if (lexrc.next()) - custom_export_format = lexrc.GetString(); + print_spool_printerprefix = lexrc.getString(); break; - case RC_PDF_MODE: + case RC_PRINTPAPERDIMENSIONFLAG: if (lexrc.next()) - pdf_mode = lexrc.GetBool(); - break; - - case RC_LATEX_COMMAND: - if (lexrc.next()) - latex_command = lexrc.GetString(); + print_paper_dimension_flag = lexrc.getString(); break; - case RC_PDFLATEX_COMMAND: + case RC_PRINTPAPERFLAG: if (lexrc.next()) - pdflatex_command = lexrc.GetString(); + print_paper_flag = lexrc.getString(); break; - case RC_PDF_TO_PS_COMMAND: + case RC_CUSTOM_EXPORT_COMMAND: if (lexrc.next()) - pdf_to_ps_command = lexrc.GetString(); + custom_export_command = lexrc.getString(); break; - case RC_DVI_TO_PS_COMMAND: - if (lexrc.next()) - dvi_to_ps_command = lexrc.GetString(); - break; - - case RC_LITERATE_COMMAND: - if (lexrc.next()) - literate_command = lexrc.GetString(); - break; - - case RC_LITERATE_EXTENSION: - if (lexrc.next()) - literate_extension = lexrc.GetString(); - break; - - case RC_LITERATE_ERROR_FILTER: - if (lexrc.next()) - literate_error_filter = lexrc.GetString(); - break; - - case RC_BUILD_COMMAND: - if (lexrc.next()) - build_command = lexrc.GetString(); - break; - - case RC_BUILD_ERROR_FILTER: - if (lexrc.next()) - build_error_filter = lexrc.GetString(); - break; - - case RC_RELYX_COMMAND: + case RC_CUSTOM_EXPORT_FORMAT: if (lexrc.next()) - relyx_command = lexrc.GetString(); + custom_export_format = lexrc.getString(); break; - + case RC_DEFAULT_PAPERSIZE: - if (lexrc.next()) { - string size = lowercase(lexrc.GetString()); + if (lexrc.next()) { + string const size = + lowercase(lexrc.getString()); if (size == "usletter") - default_papersize = + default_papersize = BufferParams::PAPER_USLETTER; else if (size == "legal") - default_papersize = + default_papersize = BufferParams::PAPER_LEGALPAPER; else if (size == "executive") - default_papersize = + default_papersize = BufferParams::PAPER_EXECUTIVEPAPER; else if (size == "a3") - default_papersize = + default_papersize = BufferParams::PAPER_A3PAPER; else if (size == "a4") - default_papersize = + default_papersize = BufferParams::PAPER_A4PAPER; else if (size == "a5") - default_papersize = + default_papersize = BufferParams::PAPER_A5PAPER; else if (size == "b5") - default_papersize = + default_papersize = BufferParams::PAPER_B5PAPER; } break; - case RC_VIEWDVI_COMMAND: - if (lexrc.next()) - view_dvi_command = lexrc.GetString(); - break; case RC_VIEWDVI_PAPEROPTION: if (lexrc.next()) - view_dvi_paper_option = lexrc.GetString(); - else - view_dvi_paper_option = ""; + view_dvi_paper_option = lexrc.getString(); + else + view_dvi_paper_option.erase(); break; - case RC_VIEWPDF_COMMAND: - if (lexrc.next()) - view_pdf_command = lexrc.GetString(); - break; - case RC_PS_COMMAND: if (lexrc.next()) - ps_command = lexrc.GetString(); - break; - - case RC_VIEWPS_COMMAND: - if (lexrc.next()) - view_ps_command = lexrc.GetString(); - break; - - case RC_VIEWPSPIC_COMMAND: - if (lexrc.next()) - view_pspic_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_HTML_COMMAND: - if (lexrc.next()) - html_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(); + + case RC_SCREEN_FONT_SCALABLE: + if (lexrc.next()) + 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(); + + 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()) - 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(); - break; - - case RC_SCREEN_FONT_MENU: - if (lexrc.next()) - menu_font_name = lexrc.GetString(); + typewriter_font_name = lexrc.getString(); break; - - case RC_SCREEN_FONT_POPUP: - if (lexrc.next()) - 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: + case RC_POPUP_BOLD_FONT: if (lexrc.next()) - font_norm_menu = lexrc.GetString(); + 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: @@ -881,14 +684,14 @@ int LyXRC::read(string const & filename) 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; @@ -902,50 +705,50 @@ int LyXRC::read(string const & filename) } case RC_AUTOREGIONDELETE: // Auto region delete defaults to true - if (lexrc.next()) - auto_region_delete = lexrc.GetBool(); + 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. - if (!hasBindFile) { - ReadBindFile(); - bind_file = bindFile; - } + readBindFileIfNeeded(); + // !!!chb, dynamic key binding... - int action, res = 0; + int action = 0; + string::size_type 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.c_str()))>= 0) { - if (lyxerr.debugging(Debug::KBMAP)) { + + 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.c_str(), - action); - if (res != 0) { + res = toplevel_keymap->bind(seq, kb_action(action)); + if (res != string::npos + && lyxerr.debugging(Debug::LYXRC)) { lexrc.printError( + "RC_BIND: " "Invalid key sequence `" - + seq + '\''); + + seq + '\''); } } else {// cmd is the last token read. lexrc.printError( @@ -955,195 +758,205 @@ int LyXRC::read(string const & filename) } 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; - case RC_FAX_COMMAND: - if (lexrc.next()) - fax_command = lexrc.GetString(); - break; - case RC_FAXPROGRAM: + case RC_DIALOGS_ICONIFY_WITH_MAIN: if (lexrc.next()) - fax_program = lexrc.GetString(); + dialogs_iconify_with_main = lexrc.getBool(); break; - case RC_PHONEBOOK: - if (lexrc.next()) { - string s = lexrc.GetString(); - if (AbsolutePath(s)) - phone_book = s; - else - phone_book = user_lyxdir + s; - } - break; + case RC_ASCIIROFF_COMMAND: - if (lexrc.next()) - ascii_roff_command = lexrc.GetString(); + if (lexrc.next()) + 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(); + if (lexrc.next()) + 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(); - break; - case RC_USE_GUI: - if (lexrc.next()) - use_gui = lexrc.GetBool(); - break; - case RC_LINUXDOC_TO_LYX_COMMAND: - if ( lexrc.next()) - linuxdoc_to_lyx_command = lexrc.GetString(); - break; - case RC_LINUXDOC_TO_HTML_COMMAND: - if ( lexrc.next()) - linuxdoc_to_html_command = lexrc.GetString(); + show_banner = lexrc.getBool(); break; - case RC_LINUXDOC_TO_LATEX_COMMAND: - if ( lexrc.next()) - linuxdoc_to_latex_command = lexrc.GetString(); - break; - case RC_DOCBOOK_TO_DVI_COMMAND: - if ( lexrc.next()) - docbook_to_dvi_command = lexrc.GetString(); - break; - case RC_DOCBOOK_TO_HTML_COMMAND: - if ( lexrc.next()) - docbook_to_html_command = lexrc.GetString(); - break; - case RC_DOCBOOK_TO_PDF_COMMAND: - if ( lexrc.next()) - docbook_to_pdf_command = lexrc.GetString(); - break; - + case RC_NEW_ASK_FILENAME: - if ( lexrc.next()) - new_ask_filename = lexrc.GetBool(); + if (lexrc.next()) + new_ask_filename = lexrc.getBool(); break; - case RC_CONVERTER: - { + 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(); - command = subst(command, "$$FName", "'$$FName'"); - command = subst(command, "$$BaseName", "'$$BaseName'"); - command = subst(command, "$$OutName", "'$$OutName'"); - Converter::Add(from, to, command, flags); + flags = lexrc.getString(); + if (command.empty() || command == "none") + converters.erase(from, to); + else + converters.add(from, to, command, flags); break; } - case RC_VIEWER: - { + case RC_VIEWER: { string format, command; if (lexrc.next()) - format = lexrc.GetString(); + format = lexrc.getString(); if (lexrc.next()) - command = lexrc.GetString(); - command = subst(command, "$$FName", "'$$FName'"); - 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(); + if (lexrc.next()) + extension = lexrc.getString(); + if (lexrc.next()) + prettyname = lexrc.getString(); + if (lexrc.next()) + shortcut = lexrc.getString(); + if (prettyname.empty()) { + if (converters.formatIsUsed(format)) + lyxerr << "Can't delete format " + << format << endl; + else + formats.erase(format); + + } else + formats.add(format, extension, prettyname, + shortcut); + break; + } + case RC_DEFAULT_LANGUAGE: + if (lexrc.next()) + 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; } @@ -1172,404 +985,664 @@ void LyXRC::output(ostream & os) const << "### 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" << "# 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. // The nice thing is that we will get a warning from the compiler // if we forget an element. LyXRCTags tag = RC_LAST; - switch(tag) { + switch (tag) { 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: - os << "\\bind_file " << bind_file << "\n"; - + if (bind_file != system_lyxrc.bind_file) { + os << "\\bind_file " << bind_file << "\n"; + } // // Misc Section // os << "\n#\n" << "# MISC SECTION ######################################\n" << "#\n\n"; - - case RC_SHOW_BANNER: - os << "# Set to false to inhibit the startup banner.\n" - << "\\show_banner " << tostr(show_banner) << "\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: - os << "\\ui_file \"" << ui_file << "\"\n"; + if (ui_file != system_lyxrc.ui_file) { + os << "\\ui_file \"" << ui_file << "\"\n"; + } case RC_AUTOREGIONDELETE: - os << "# Set to false to inhibit automatic replacement of\n" - << "# the current selection.\n" - << "\\auto_region_delete " << tostr(auto_region_delete) - << "\n"; + if (auto_region_delete != system_lyxrc.auto_region_delete) { + os << "# Set to false to inhibit automatic replacement of\n" + << "# the current selection.\n" + << "\\auto_region_delete " << tostr(auto_region_delete) + << "\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"; + } case RC_AUTOSAVE: - os << "# The time interval between auto-saves in seconds.\n" - << "\\autosave " << autosave << "\n"; + if (autosave != system_lyxrc.autosave) { + os << "# The time interval between auto-saves in seconds.\n" + << "\\autosave " << autosave << "\n"; + } case RC_EXIT_CONFIRMATION: - os << "# Ask for confirmation before exit if there are\n" - << "# unsaved changed documents.\n" - << "\\exit_confirmation " << tostr(exit_confirmation) - << "\n"; + 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"; + } + 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: - os << "# Display name of the last command executed, with a\n" - << "# list of short-cuts in the minibuffer.\n" - << "\\display_shortcuts " << tostr(display_shortcuts) - << "\n"; - case RC_VIEWDVI_COMMAND: - os << "# Program used to view dvi files.\n" - << "\\view_dvi_command \"" << view_dvi_command << "\"\n"; + 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"; + } case RC_VIEWDVI_PAPEROPTION: - os << "# Options used to specify paper size to the\n" - << "# view_dvi_command\n" - << "\\view_dvi_paper_option \"" - << view_dvi_paper_option << "\"\n"; + 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" + << "\\view_dvi_paper_option \"" + << view_dvi_paper_option << "\"\n"; + } case RC_DEFAULT_PAPERSIZE: - os << "# The default papersize to use.\n" - << "\\default_papersize \""; - switch (default_papersize) { - case BufferParams::PAPER_USLETTER: - os << "usletter"; break; - case BufferParams::PAPER_LEGALPAPER: - os << "legal"; break; - case BufferParams::PAPER_EXECUTIVEPAPER: - os << "executive"; break; - case BufferParams::PAPER_A3PAPER: - os << "a3"; break; - case BufferParams::PAPER_A4PAPER: - os << "a4"; break; - case BufferParams::PAPER_A5PAPER: - os << "a5"; break; - case BufferParams::PAPER_B5PAPER: - os << "b5"; break; - case BufferParams::PAPER_DEFAULT: break; - } - os << "\"\n"; - case RC_VIEWPDF_COMMAND: - os << "# Command used to view PDF files.\n" - << "\\view_pdf_command \"" << view_pdf_command << "\"\n"; - case RC_VIEWPS_COMMAND: - os << "# Command used to view PostScript files.\n" - << "\\view_ps_command \"" << view_ps_command << "\"\n"; - case RC_VIEWPSPIC_COMMAND: - os << "# Command used to view full screen included PS\n" - << "# pictures.\n" - << "\\view_pspic_command \"" << view_pspic_command - << "\"\n"; + if (default_papersize != system_lyxrc.default_papersize) { + os << "# The default papersize to use.\n" + << "\\default_papersize \""; + switch (default_papersize) { + case BufferParams::PAPER_USLETTER: + os << "usletter"; break; + case BufferParams::PAPER_LEGALPAPER: + os << "legal"; break; + case BufferParams::PAPER_EXECUTIVEPAPER: + os << "executive"; break; + case BufferParams::PAPER_A3PAPER: + os << "a3"; break; + case BufferParams::PAPER_A4PAPER: + os << "a4"; break; + case BufferParams::PAPER_A5PAPER: + os << "a5"; break; + case BufferParams::PAPER_B5PAPER: + os << "b5"; break; + case BufferParams::PAPER_DEFAULT: break; + } + os << "\"\n"; + } case RC_PS_COMMAND: - os << "# Program used for interpreting postscript.\n" - << "\\ps_command \"" << ps_command << "\"\n"; + if (ps_command != system_lyxrc.ps_command) { + os << "# Program used for interpreting postscript.\n" + << "\\ps_command \"" << ps_command << "\"\n"; + } case RC_CHKTEX_COMMAND: - os << "\\chktex_command \"" << chktex_command << "\"\n"; - case RC_HTML_COMMAND: - os << "\\html_command \"" << html_command << "\"\n"; + if (chktex_command != system_lyxrc.chktex_command) { + os << "\\chktex_command \"" << chktex_command << "\"\n"; + } case RC_KBMAP: - os << "\\kbmap " << tostr(use_kbmap) << "\n"; + if (use_kbmap != system_lyxrc.use_kbmap) { + os << "\\kbmap " << tostr(use_kbmap) << "\n"; + } case RC_KBMAP_PRIMARY: - os << "\\kbmap_primary \"" << primary_kbmap << "\"\n"; + if (primary_kbmap != system_lyxrc.primary_kbmap) { + os << "\\kbmap_primary \"" << primary_kbmap << "\"\n"; + } case RC_KBMAP_SECONDARY: - os << "\\kbmap_secondary \"" << secondary_kbmap << "\"\n"; + if (secondary_kbmap != system_lyxrc.secondary_kbmap) { + os << "\\kbmap_secondary \"" << secondary_kbmap + << "\"\n"; + } case RC_SERVERPIPE: - os << "\\serverpipe \"" << lyxpipes << "\"\n"; - case RC_RELYX_COMMAND: - os << "\\relyx_command \"" << relyx_command << "\"\n"; + if (lyxpipes != system_lyxrc.lyxpipes) { + os << "\\serverpipe \"" << lyxpipes << "\"\n"; + } case RC_DATE_INSERT_FORMAT: - os << "\\date_insert_format \"" << date_insert_format - << "\"\n"; + if (date_insert_format != system_lyxrc.date_insert_format) { + 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"; - + + 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: - os << "\\screen_dpi " << dpi << "\n"; + if (dpi != system_lyxrc.dpi) { + os << "\\screen_dpi " << dpi << "\n"; + } case RC_SCREEN_ZOOM: - os << "\\screen_zoom " << zoom << "\n"; + if (zoom != system_lyxrc.zoom) { + os << "\\screen_zoom " << zoom << "\n"; + } case RC_WHEEL_JUMP: - os << "\\wheel_jump " << wheel_jump << "\n"; + if (wheel_jump != system_lyxrc.wheel_jump) { + os << "\\wheel_jump " << wheel_jump << "\n"; + } case RC_CURSOR_FOLLOWS_SCROLLBAR: - os << "\\cursor_follows_scrollbar " - << tostr(cursor_follows_scrollbar) << "\n"; + if (cursor_follows_scrollbar + != system_lyxrc.cursor_follows_scrollbar) { + os << "\\cursor_follows_scrollbar " + << 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"; + } case RC_SCREEN_FONT_ROMAN: - os << "\\screen_font_roman \"" << roman_font_name << "\"\n"; + if (roman_font_name != system_lyxrc.roman_font_name) { + os << "\\screen_font_roman \"" << roman_font_name + << "\"\n"; + } case RC_SCREEN_FONT_SANS: - os << "\\screen_font_sans \"" << sans_font_name << "\"\n"; + if (sans_font_name != system_lyxrc.sans_font_name) { + os << "\\screen_font_sans \"" << sans_font_name + << "\"\n"; + } case RC_SCREEN_FONT_TYPEWRITER: - os << "\\screen_font_typewriter \"" - << typewriter_font_name << "\"\n"; + if (typewriter_font_name != system_lyxrc.typewriter_font_name) { + os << "\\screen_font_typewriter \"" + << typewriter_font_name << "\"\n"; + } case RC_SCREEN_FONT_SCALABLE: - os << "\\screen_font_scalable " << tostr(use_scalable_fonts) - << "\n"; + if (use_scalable_fonts != system_lyxrc.use_scalable_fonts) { + os << "\\screen_font_scalable " + << tostr(use_scalable_fonts) + << "\n"; + } case RC_SCREEN_FONT_ENCODING: - os << "\\screen_font_encoding \"" << font_norm << "\"\n"; - case RC_SCREEN_FONT_POPUP: - os << "\\screen_font_popup \"" << popup_font_name << "\"\n"; - case RC_SCREEN_FONT_MENU: - os << "\\screen_font_menu \"" << menu_font_name << "\"\n"; + if (font_norm != system_lyxrc.font_norm) { + os << "\\screen_font_encoding \"" << font_norm + << "\"\n"; + } case RC_SCREEN_FONT_SIZES: - 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) - + if (font_sizes[LyXFont::SIZE_TINY] + != system_lyxrc.font_sizes[LyXFont::SIZE_TINY] || + font_sizes[LyXFont::SIZE_SCRIPT] + != system_lyxrc.font_sizes[LyXFont::SIZE_SCRIPT] || + font_sizes[LyXFont::SIZE_FOOTNOTE] + != system_lyxrc.font_sizes[LyXFont::SIZE_FOOTNOTE] || + font_sizes[LyXFont::SIZE_SMALL] + != system_lyxrc.font_sizes[LyXFont::SIZE_SMALL] || + font_sizes[LyXFont::SIZE_NORMAL] + != system_lyxrc.font_sizes[LyXFont::SIZE_NORMAL] || + font_sizes[LyXFont::SIZE_LARGE] + != system_lyxrc.font_sizes[LyXFont::SIZE_LARGE] || + font_sizes[LyXFont::SIZE_LARGER] + != system_lyxrc.font_sizes[LyXFont::SIZE_LARGER] || + font_sizes[LyXFont::SIZE_LARGEST] + != system_lyxrc.font_sizes[LyXFont::SIZE_LARGEST] || + font_sizes[LyXFont::SIZE_HUGE] + != system_lyxrc.font_sizes[LyXFont::SIZE_HUGE] || + font_sizes[LyXFont::SIZE_HUGER] + != system_lyxrc.font_sizes[LyXFont::SIZE_HUGER]) { + 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"; + } + + 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(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" << "#\n\n"; - + case RC_PRINTER: - os << "\\printer \"" << printer << "\"\n"; + if (printer != system_lyxrc.printer) { + os << "\\printer \"" << printer << "\"\n"; + } case RC_PRINT_ADAPTOUTPUT: - os << "\\print_adapt_output " << tostr(print_adapt_output) - << "\n"; + if (print_adapt_output != system_lyxrc.print_adapt_output) { + os << "\\print_adapt_output " + << tostr(print_adapt_output) + << "\n"; + } case RC_PRINT_COMMAND: - os << "\\print_command \"" << print_command << "\"\n"; + if (print_command != system_lyxrc.print_command) { + os << "\\print_command \"" << print_command << "\"\n"; + } case RC_PRINTEXSTRAOPTIONS: - os << "\\print_extra_options \"" << print_extra_options - << "\"\n"; + if (print_extra_options != system_lyxrc.print_extra_options) { + os << "\\print_extra_options \"" << print_extra_options + << "\"\n"; + } case RC_PRINTSPOOL_COMMAND: - os << "\\print_spool_command \"" << print_spool_command - << "\"\n"; + if (print_spool_command != system_lyxrc.print_spool_command) { + os << "\\print_spool_command \"" << print_spool_command + << "\"\n"; + } case RC_PRINTSPOOL_PRINTERPREFIX: - os << "\\print_spool_printerprefix \"" - << print_spool_printerprefix << "\"\n"; + if (print_spool_printerprefix + != system_lyxrc.print_spool_printerprefix) { + os << "\\print_spool_printerprefix \"" + << print_spool_printerprefix << "\"\n"; + } case RC_PRINTEVENPAGEFLAG: - os << "\\print_evenpage_flag \"" << print_evenpage_flag - << "\"\n"; + if (print_evenpage_flag != system_lyxrc.print_evenpage_flag) { + os << "\\print_evenpage_flag \"" << print_evenpage_flag + << "\"\n"; + } case RC_PRINTODDPAGEFLAG: - os << "\\print_oddpage_flag \"" << print_oddpage_flag - << "\"\n"; + if (print_oddpage_flag != system_lyxrc.print_oddpage_flag) { + os << "\\print_oddpage_flag \"" << print_oddpage_flag + << "\"\n"; + } case RC_PRINTREVERSEFLAG: - os << "\\print_reverse_flag \"" << print_reverse_flag - << "\"\n"; + if (print_reverse_flag != system_lyxrc.print_reverse_flag) { + os << "\\print_reverse_flag \"" << print_reverse_flag + << "\"\n"; + } case RC_PRINTLANDSCAPEFLAG: - os << "\\print_landscape_flag \"" << print_landscape_flag - << "\"\n"; + if (print_landscape_flag != system_lyxrc.print_landscape_flag) { + os << "\\print_landscape_flag \"" << print_landscape_flag + << "\"\n"; + } case RC_PRINTPAGERANGEFLAG: - os << "\\print_pagerange_flag \"" << print_pagerange_flag - << "\"\n"; + if (print_pagerange_flag != system_lyxrc.print_pagerange_flag) { + os << "\\print_pagerange_flag \"" << print_pagerange_flag + << "\"\n"; + } case RC_PRINTCOPIESFLAG: - os << "\\print_copies_flag \"" << print_copies_flag << "\"\n"; + if (print_copies_flag != system_lyxrc.print_copies_flag) { + os << "\\print_copies_flag \"" << print_copies_flag + << "\"\n"; + } case RC_PRINTCOLLCOPIESFLAG: - os << "\\print_collcopies_flag \"" << print_collcopies_flag - << "\"\n"; + if (print_collcopies_flag + != system_lyxrc.print_collcopies_flag) { + os << "\\print_collcopies_flag \"" + << print_collcopies_flag + << "\"\n"; + } case RC_PRINTPAPERFLAG: - os << "\\print_paper_flag \"" << print_paper_flag << "\"\n"; + if (print_paper_flag != system_lyxrc.print_paper_flag) { + os << "\\print_paper_flag \"" << print_paper_flag + << "\"\n"; + } case RC_PRINTPAPERDIMENSIONFLAG: - os << "\\print_paper_dimension_flag \"" - << print_paper_dimension_flag << "\"\n"; + if (print_paper_dimension_flag + != system_lyxrc.print_paper_dimension_flag) { + os << "\\print_paper_dimension_flag \"" + << print_paper_dimension_flag << "\"\n"; + } case RC_PRINTTOPRINTER: - os << "\\print_to_printer \"" << print_to_printer << "\"\n"; + if (print_to_printer != system_lyxrc.print_to_printer) { + os << "\\print_to_printer \"" << print_to_printer + << "\"\n"; + } case RC_PRINTTOFILE: - os << "\\print_to_file \"" << print_to_file << "\"\n"; + if (print_to_file != system_lyxrc.print_to_file) { + os << "\\print_to_file \"" << print_to_file << "\"\n"; + } case RC_PRINTFILEEXTENSION: - os << "\\print_file_extension \"" << print_file_extension - << "\"\n"; + if (print_file_extension != system_lyxrc.print_file_extension) { + os << "\\print_file_extension \"" + << print_file_extension + << "\"\n"; + } os << "\n#\n" << "# EXPORT SECTION ####################################\n" << "#\n\n"; - + case RC_CUSTOM_EXPORT_COMMAND: - os << "\\custom_export_command \"" << custom_export_command - << "\"\n"; + if (custom_export_command + != system_lyxrc.custom_export_command) { + os << "\\custom_export_command \"" + << custom_export_command + << "\"\n"; + } case RC_CUSTOM_EXPORT_FORMAT: - os << "\\custom_export_format \"" << custom_export_format - << "\"\n"; - - os << "\n#\n" - << "# TEX SECTION #######################################\n" - << "#\n\n"; - - case RC_LATEX_COMMAND: - os << "\\latex_command \"" << latex_command << "\"\n"; - case RC_PDFLATEX_COMMAND: - os << "\\pdflatex_command \"" << pdflatex_command << "\"\n"; - case RC_PDF_MODE: - os << "\\pdf_mode " << tostr(pdf_mode) << "\n"; - case RC_FONT_ENCODING: - os << "\\font_encoding \"" << fontenc << "\"\n"; - - os << "\n#\n" - << "# LINUXDOC SECTION ##################################\n" - << "#\n\n"; + if (custom_export_format + != system_lyxrc.custom_export_format) { + os << "\\custom_export_format \"" << custom_export_format + << "\"\n"; + } - case RC_LINUXDOC_TO_LATEX_COMMAND: - os << "\\linuxdoc_to_latex_command \"" << linuxdoc_to_latex_command - << "\"\n"; - case RC_LINUXDOC_TO_HTML_COMMAND: - os << "\\linuxdoc_to_html_command \"" << linuxdoc_to_html_command - << "\"\n"; - case RC_LINUXDOC_TO_LYX_COMMAND: - os << "\\linuxdoc_to_lyx_command \"" << linuxdoc_to_lyx_command - << "\"\n"; - os << "\n#\n" - << "# DOCBOOK SECTION ###################################\n" + << "# TEX SECTION #######################################\n" << "#\n\n"; - case RC_DOCBOOK_TO_DVI_COMMAND: - os << "\\docbook_to_dvi_command \"" << docbook_to_dvi_command - << "\"\n"; - case RC_DOCBOOK_TO_HTML_COMMAND: - os << "\\docbook_to_html_command \"" << docbook_to_html_command - << "\"\n"; - case RC_DOCBOOK_TO_PDF_COMMAND: - os << "\\docbook_to_pdf_command \"" << docbook_to_pdf_command - << "\"\n"; + case RC_FONT_ENCODING: + if (fontenc != system_lyxrc.fontenc) { + os << "\\font_encoding \"" << fontenc << "\"\n"; + } os << "\n#\n" - << "# FILE SECTION ######################################\n" + << "# FILE SECTION ######################################\n" << "#\n\n"; case RC_DOCUMENTPATH: - os << "\\document_path \"" << document_path << "\"\n"; + if (document_path != system_lyxrc.document_path) { + os << "\\document_path \"" << document_path << "\"\n"; + } case RC_LASTFILES: - os << "\\lastfiles \"" << lastfiles << "\"\n"; + if (lastfiles != system_lyxrc.lastfiles) { + os << "\\lastfiles \"" << lastfiles << "\"\n"; + } case RC_NUMLASTFILES: - os << "\\num_lastfiles " << num_lastfiles << "\n"; + if (num_lastfiles != system_lyxrc.num_lastfiles) { + os << "\\num_lastfiles " << num_lastfiles << "\n"; + } case RC_CHECKLASTFILES: - os << "\\check_lastfiles " << tostr(check_lastfiles) << "\n"; + if (check_lastfiles != system_lyxrc.check_lastfiles) { + os << "\\check_lastfiles " << tostr(check_lastfiles) + << "\n"; + } case RC_TEMPLATEPATH: - os << "\\template_path \"" << template_path << "\"\n"; + if (template_path != system_lyxrc.template_path) { + os << "\\template_path \"" << template_path << "\"\n"; + } case RC_TEMPDIRPATH: - os << "\\tempdir_path \"" << tempdir_path << "\"\n"; + if (tempdir_path != system_lyxrc.tempdir_path) { + os << "\\tempdir_path \"" << tempdir_path << "\"\n"; + } case RC_USETEMPDIR: - os << "\\use_tempdir " << tostr(use_tempdir) << "\n"; + if (use_tempdir != system_lyxrc.use_tempdir) { + os << "\\use_tempdir " << tostr(use_tempdir) << "\n"; + } case RC_ASCII_LINELEN: - os << "\\ascii_linelen " << ascii_linelen << "\n"; + if (ascii_linelen != system_lyxrc.ascii_linelen) { + os << "\\ascii_linelen " << ascii_linelen << "\n"; + } case RC_MAKE_BACKUP: - os << "\\make_backup " << tostr(make_backup) << "\n"; + if (make_backup != system_lyxrc.make_backup) { + os << "\\make_backup " << tostr(make_backup) << "\n"; + } case RC_BACKUPDIR_PATH: - os << "\\backupdir_path \"" << backupdir_path << "\"\n"; - - os << "\n#\n" - << "# FAX SECTION #######################################\n" - << "#\n\n"; - - case RC_FAX_COMMAND: - os << "\\fax_command \"" << fax_command << "\"\n"; - case RC_PHONEBOOK: - os << "\\phone_book \"" << phone_book << "\"\n"; - case RC_FAXPROGRAM: - os << "\\fax_program \"" << fax_program << "\"\n"; + if (backupdir_path != system_lyxrc.backupdir_path) { + os << "\\backupdir_path \"" << backupdir_path << "\"\n"; + } os << "\n#\n" - << "# ASCII EXPORT SECTION ##############################\n" + << "# ASCII EXPORT SECTION ##############################\n" << "#\n\n"; case RC_ASCIIROFF_COMMAND: - os << "\\ascii_roff_command \"" << ascii_roff_command - << "\"\n"; + if (ascii_roff_command != system_lyxrc.ascii_roff_command) { + os << "\\ascii_roff_command \"" << ascii_roff_command + << "\"\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 " << tostr(use_pspell) << "\n"; + } +#endif case RC_SPELL_COMMAND: - os << "\\spell_command \"" << isp_command << "\"\n"; + if (isp_command != system_lyxrc.isp_command) { + os << "\\spell_command \"" << isp_command << "\"\n"; + } case RC_ACCEPT_COMPOUND: - os << "\\accept_compound " << tostr(isp_accept_compound) - << "\n"; + if (isp_accept_compound != system_lyxrc.isp_accept_compound) { + os << "\\accept_compound " << tostr(isp_accept_compound) + << "\n"; + } case RC_USE_ALT_LANG: - os << "\\use_alt_language " << tostr(isp_use_alt_lang) << "\n"; + if (isp_use_alt_lang != system_lyxrc.isp_use_alt_lang) { + os << "\\use_alt_language " << tostr(isp_use_alt_lang) + << "\n"; + } case RC_ALT_LANG: - os << "\\alternate_language \"" << isp_alt_lang << "\"\n"; + if (isp_alt_lang != system_lyxrc.isp_alt_lang) { + os << "\\alternate_language \"" << isp_alt_lang + << "\"\n"; + } case RC_USE_ESC_CHARS: - os << "\\use_escape_chars " << tostr(isp_use_esc_chars) - << "\n"; + if (isp_use_esc_chars != system_lyxrc.isp_use_esc_chars) { + os << "\\use_escape_chars " << tostr(isp_use_esc_chars) + << "\n"; + } case RC_ESC_CHARS: - os << "\\escape_chars \"" << isp_esc_chars << "\"\n"; + if (isp_esc_chars != system_lyxrc.isp_esc_chars) { + os << "\\escape_chars \"" << isp_esc_chars << "\"\n"; + } case RC_USE_PERS_DICT: - os << "\\use_personal_dictionary " << tostr(isp_use_pers_dict) - << "\n"; + if (isp_use_pers_dict != system_lyxrc.isp_use_pers_dict) { + os << "\\use_personal_dictionary " + << tostr(isp_use_pers_dict) + << "\n"; + } case RC_PERS_DICT: - os << "\\personal_dictionary \"" << isp_pers_dict << "\"\n"; + if (isp_pers_dict != system_lyxrc.isp_pers_dict) { + os << "\\personal_dictionary \"" << isp_pers_dict + << "\"\n"; + } case RC_USE_INP_ENC: - os << "\\use_input_encoding " << tostr(isp_use_input_encoding) - << "\n"; + if (isp_use_input_encoding + != system_lyxrc.isp_use_input_encoding) { + os << "\\use_input_encoding " + << tostr(isp_use_input_encoding) + << "\n"; + } os << "\n#\n" - << "# LANGUAGE SUPPORT SECTION ##########################\n" + << "# LANGUAGE SUPPORT SECTION ##########################\n" << "#\n\n"; case RC_RTL_SUPPORT: - os << "\\rtl " << tostr(rtl_support) << "\n"; + if (rtl_support != system_lyxrc.rtl_support) { + os << "\\rtl " << tostr(rtl_support) << "\n"; + } case RC_LANGUAGE_PACKAGE: - os << "\\language_package \"" << language_package << "\"\n"; + if (language_package != system_lyxrc.language_package) { + 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: - os << "\\language_command_begin \"" << language_command_begin - << "\"\n"; + if (language_command_begin + != system_lyxrc.language_command_begin) { + os << "\\language_command_begin \"" + << language_command_begin + << "\"\n"; + } case RC_LANGUAGE_COMMAND_END: - os << "\\language_command_end \"" << language_command_end - << "\"\n"; + if (language_command_end + != system_lyxrc.language_command_end) { + 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: - os << "\\language_auto_begin " - << tostr(language_auto_begin) << "\n"; + if (language_auto_begin != system_lyxrc.language_auto_begin) { + os << "\\language_auto_begin " + << tostr(language_auto_begin) << "\n"; + } case RC_LANGUAGE_AUTO_END: - os << "\\language_auto_end " - << tostr(language_auto_end) << "\n"; + if (language_auto_end != system_lyxrc.language_auto_end) { + os << "\\language_auto_end " + << tostr(language_auto_end) << "\n"; + } case RC_MARK_FOREIGN_LANGUAGE: - os << "\\mark_foreign_language " << - tostr(mark_foreign_language) << "\n"; + if (mark_foreign_language + != system_lyxrc.mark_foreign_language) { + os << "\\mark_foreign_language " << + tostr(mark_foreign_language) << "\n"; + } os << "\n#\n" << "# 2nd MISC SUPPORT SECTION ##########################\n" << "#\n\n"; - case RC_PDF_TO_PS_COMMAND: - os << "\\pdf_to_ps_command \"" << pdf_to_ps_command << "\"\n"; - case RC_DVI_TO_PS_COMMAND: - os << "\\dvi_to_ps_command \"" << dvi_to_ps_command << "\"\n"; - case RC_LITERATE_COMMAND: - os << "\\literate_command \"" << literate_command << "\"\n"; - case RC_LITERATE_EXTENSION: - os << "\\literate_extension \"" << literate_extension - << "\"\n"; - case RC_LITERATE_ERROR_FILTER: - os << "\\literate_error_filter \"" << literate_error_filter - << "\"\n"; - case RC_BUILD_COMMAND: - os << "\\build_command \"" << build_command << "\"\n"; - case RC_BUILD_ERROR_FILTER: - os << "\\build_error_filter \"" << build_error_filter - << "\"\n"; case RC_OVERRIDE_X_DEADKEYS: - os << "\\override_x_deadkeys " - << tostr(override_x_deadkeys) << "\n"; - case RC_SCREEN_FONT_ENCODING_MENU: - os << "\\screen_font_encoding_menu \"" << font_norm_menu - << "\"\n"; + if (override_x_deadkeys != system_lyxrc.override_x_deadkeys) { + os << "\\override_x_deadkeys " + << tostr(override_x_deadkeys) << "\n"; + } case RC_AUTO_NUMBER: - os << "\\auto_number " << tostr(auto_number) << "\n"; - case RC_USE_GUI: - os << "\\use_gui " << tostr(use_gui) << "\n"; + if (auto_number != system_lyxrc.auto_number) { + os << "\\auto_number " << tostr(auto_number) << "\n"; + } case RC_NEW_ASK_FILENAME: - os << "\\new_ask_filename " << tostr(new_ask_filename) << "\n"; + if (new_ask_filename != system_lyxrc.new_ask_filename) { + os << "\\new_ask_filename " << tostr(new_ask_filename) + << "\n"; + } + case RC_DEFAULT_LANGUAGE: + if (default_language != system_lyxrc.default_language) { + os << "\\default_language " << default_language << "\n"; + } + + os << "\n#\n" + << "# FORMATS SECTION ##########################\n" + << "#\n\n"; + + case RC_FORMAT: + // Look for deleted formats + for (Formats::const_iterator cit = formats.begin(); + cit != formats.end(); ++cit) { + Format const * format = + system_formats.getFormat(cit->name()); + if (!format || + format->extension() != cit->extension() || + format->prettyname() != cit->prettyname() || + format->shortcut() != cit->shortcut()) + os << "\\format \"" << cit->name() << "\" \"" + << cit->extension() << "\" \"" + << cit->prettyname() << "\" \"" + << cit->shortcut() << "\"\n"; + } + + // New/modifed formats + for (Formats::const_iterator cit = system_formats.begin(); + cit != system_formats.end(); ++cit) + 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()); + if ((!format || format->viewer() != cit->viewer()) && + (format || !cit->viewer().empty())) + os << "\\viewer \"" << cit->name() << "\" \"" + << cit->viewer() << "\"\n"; + } + + os << "\n#\n" + << "# CONVERTERS SECTION ##########################\n" + << "#\n\n"; + + case RC_CONVERTER: + // Look for new converters + for (Converters::const_iterator cit = converters.begin(); + cit != converters.end(); ++cit) { + Converter const * converter = + system_converters.getConverter(cit->from, + cit->to); + if (!converter || + converter->command != cit->command || + converter->flags != cit->flags) + os << "\\converter \"" << cit->from << "\" \"" + << cit->to << "\" \"" + << cit->command << "\" \"" + << cit->flags << "\"\n"; + } + + // New/modifed converters + for (Converters::const_iterator cit = system_converters.begin(); + cit != system_converters.end(); ++cit) + if (!converters.getConverter(cit->from, cit->to)) + os << "\\converter \"" << cit->from + << "\" \"" << cit->to << "\" \"\" \"\"\n"; } os.flush(); } @@ -1578,14 +1651,370 @@ void LyXRC::set_font_norm_type() { if (font_norm == "iso10646-1") 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") + 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 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."); + break; + + case RC_PRINTER: + str = N_("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\"."); + 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_("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."); + break; + + case RC_PRINT_ADAPTOUTPUT: + str = N_("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."); + break; + + case RC_PRINTFILEEXTENSION: + str = N_("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."); + 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."); + 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."); + 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."); + 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; + + case RC_SCREEN_FONT_SIZES: + str = N_("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."); + break; + + case RC_POPUP_BOLD_FONT: + str = N_("The bold font in the dialogs."); + break; + + case RC_POPUP_NORMAL_FONT: + str = N_("The normal font in the dialogs."); + break; + + case RC_SCREEN_FONT_ENCODING: + str = N_("The encoding for the screen fonts."); + break; + + case RC_POPUP_FONT_ENCODING: + str = N_("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."); + break; + + case RC_DOCUMENTPATH: + str = N_("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. 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."); + break; + + case RC_USETEMPDIR: + str = N_("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."); + break; + + case RC_AUTOREGIONDELETE: + str = N_("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."); + 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."); + 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."); + 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."); + 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."); + 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."); + break; + + case RC_ASCII_LINELEN: + str = N_("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."); + break; + + case RC_CHECKLASTFILES: + str = N_("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\")"); + break; + + case RC_DEFAULT_PAPERSIZE: + str = N_("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?"); + break; + + case RC_SPELL_COMMAND: + str = N_("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."); + 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."); + break; + + case RC_USE_PERS_DICT: + case RC_PERS_DICT: + str = N_("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."); + break; + + case RC_SCREEN_FONT_SCALABLE: + str = N_("Allow bitmap fonts to be resized. If you are using a bitmap font, selecting this option may make some fonts look blocky in LyX. Deselecting this option makes LyX use the nearest bitmap font size available, instead of scaling."); + break; + + case RC_CHKTEX_COMMAND: + str = N_("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."); + 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.)"); + 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."); + break; + + case RC_MAKE_BACKUP: + str = N_("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."); + break; + + case RC_RTL_SUPPORT: + str = N_("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."); + 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_("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."); + 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."); + break; + + 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_("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)."); + 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."); + break; + + case RC_LABEL_INIT_LENGTH: + str = N_("Maximum number of words in the initialization string for a new label"); + break; + + default: + break; + } + + return str; +} + // The global instance LyXRC lyxrc; // The global copy of the system lyxrc entries (everything except preferences) -//LyXRC system_lyxrc; +LyXRC system_lyxrc;