X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=6f5a19e6079d85db9f7039c92a370026606ae73e;hb=94f0968e9212f24997cfee0d17c6f060210edbc6;hp=b196c1c838fb2cb2223c55eaba7cf50dfa7d460a;hpb=82eee13e42463b5724ab05eef08c3ef02c1d3d98;p=lyx.git diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index b196c1c838..6f5a19e607 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -26,6 +26,7 @@ #include "LyX.h" #include "Mover.h" #include "Session.h" +#include "SpellChecker.h" #include "version.h" #include "graphics/GraphicsTypes.h" @@ -54,7 +55,7 @@ namespace os = support::os; namespace { -static unsigned int const LYXRC_FILEFORMAT = 1; +static unsigned int const LYXRC_FILEFORMAT = 5; // vfr: add default length unit // when adding something to this array keep it sorted! LexerKeyword lyxrcTags[] = { @@ -90,7 +91,7 @@ LexerKeyword lyxrcTags[] = { { "\\def_file", LyXRC::RC_DEFFILE }, { "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_POINT }, { "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE }, - { "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE }, + { "\\default_length_unit", LyXRC::RC_DEFAULT_LENGTH_UNIT }, { "\\default_view_format", LyXRC::RC_DEFAULT_VIEW_FORMAT }, { "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN }, { "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS }, @@ -113,6 +114,7 @@ LexerKeyword lyxrcTags[] = { { "\\group_layouts", LyXRC::RC_GROUP_LAYOUTS }, { "\\gui_language", LyXRC::RC_GUI_LANGUAGE }, { "\\hunspelldir_path", LyXRC::RC_HUNSPELLDIR_PATH }, + { "\\icon_set", LyXRC::RC_ICON_SET }, { "\\index_alternatives", LyXRC::RC_INDEX_ALTERNATIVES }, { "\\index_command", LyXRC::RC_INDEX_COMMAND }, { "\\input", LyXRC::RC_INPUT }, @@ -191,6 +193,7 @@ LexerKeyword lyxrcTags[] = { { "\\template_path", LyXRC::RC_TEMPLATEPATH }, { "\\tex_allows_spaces", LyXRC::RC_TEX_ALLOWS_SPACES }, { "\\tex_expects_windows_paths", LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS }, + { "\\texinputs_prefix", LyXRC::RC_TEXINPUTS_PREFIX }, { "\\thesaurusdir_path", LyXRC::RC_THESAURUSDIRPATH }, { "\\ui_file", LyXRC::RC_UIFILE }, { "\\use_converter_cache", LyXRC::RC_USE_CONVERTER_CACHE }, @@ -222,9 +225,12 @@ LyXRC::LyXRC() void LyXRC::setDefaults() { + icon_set = string(); bind_file = "cua"; def_file = "default"; ui_file = "default"; + // The current document directory + texinputs_prefix = "."; // Get printer from the environment. If fail, use default "", // assuming that everything is set up correctly. printer = getEnv("PRINTER"); @@ -244,7 +250,6 @@ void LyXRC::setDefaults() print_paper_dimension_flag = "-T"; document_path.erase(); view_dvi_paper_option.erase(); - default_papersize = PAPER_DEFAULT; default_view_format = "pdf2"; chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"; bibtex_command = "bibtex"; @@ -361,6 +366,7 @@ void LyXRC::setDefaults() completion_inline_dots = -1; completion_inline_delay = 0.2; default_decimal_point = "."; + default_length_unit = Length::CM; cursor_width = 1; } @@ -396,11 +402,15 @@ bool LyXRC::read(FileName const & filename, bool check_format) LYXERR0 ("Unable to convert " << filename.absFileName() << " to format " << LYXRC_FILEFORMAT); return false; + } else { + // Keep this in the else branch, such that lexrc2 goes out + // of scope and releases the lock on tempfile before we + // attempt to remove it. This matters on Windows. + Lexer lexrc2(lyxrcTags); + lexrc2.setFile(tempfile); + LYXERR(Debug::LYXRC, "Reading '" << tempfile << "'..."); + retval = read(lexrc2, check_format); } - Lexer lexrc2(lyxrcTags); - lexrc2.setFile(tempfile); - LYXERR(Debug::LYXRC, "Reading '" << tempfile << "'..."); - retval = read(lexrc2, check_format); tempfile.removeFile(); return retval == ReadOK; } @@ -497,6 +507,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) lexrc >> tex_allows_spaces; break; + case RC_TEXINPUTS_PREFIX: + lexrc >> texinputs_prefix; + break; + case RC_KBMAP: lexrc >> use_kbmap; break; @@ -532,7 +546,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_FORCE_PAINT_SINGLE_CHAR: lexrc >> force_paint_single_char; break; - + case RC_PRINTER: lexrc >> printer; break; @@ -611,28 +625,6 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) lexrc >> print_paper_flag; break; - case RC_DEFAULT_PAPERSIZE: - if (lexrc.next()) { - string const size = ascii_lowercase(lexrc.getString()); - if (size == "usletter") - default_papersize = PAPER_USLETTER; - else if (size == "legal") - default_papersize = PAPER_USLEGAL; - else if (size == "executive") - default_papersize = PAPER_USEXECUTIVE; - else if (size == "a3") - default_papersize = PAPER_A3; - else if (size == "a4") - default_papersize = PAPER_A4; - else if (size == "a5") - default_papersize = PAPER_A5; - else if (size == "b5") - default_papersize = PAPER_B5; - else if (size == "default") - default_papersize = PAPER_DEFAULT; - } - break; - case RC_VIEWDVI_PAPEROPTION: if (lexrc.next()) view_dvi_paper_option = lexrc.getString(); @@ -829,6 +821,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) lexrc >> check_lastfiles; break; + case RC_ICON_SET: + lexrc >> icon_set; + break; + case RC_SCREEN_FONT_ROMAN: if (lexrc.next()) { roman_font_name = lexrc.getString(); @@ -985,6 +981,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_DEFAULT_DECIMAL_POINT: lexrc >> default_decimal_point; break; + case RC_DEFAULT_LENGTH_UNIT: + if (lexrc.next()) + default_length_unit = (Length::UNIT) lexrc.getInteger(); + break; case RC_DATE_INSERT_FORMAT: lexrc >> date_insert_format; break; @@ -1074,8 +1074,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) break; } case RC_FILEFORMAT: { - string format, extension, prettyname, shortcut; - lexrc >> format >> extension >> prettyname >> shortcut; + string format, extensions, prettyname, shortcut; + lexrc >> format >> extensions >> prettyname >> shortcut; string viewer, editor; if (lexrc.next(true)) viewer = lexrc.getString(); @@ -1104,6 +1104,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) flgs |= Format::document; else if (flag == "vector") flgs |= Format::vector; + else if (flag == "zipped=native") + flgs |= Format::zipped_native; else if (flag == "menu=export") flgs |= Format::export_menu; else @@ -1117,7 +1119,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) else formats.erase(format); } else { - formats.add(format, extension, prettyname, + formats.add(format, extensions, prettyname, shortcut, viewer, editor, flgs); } break; @@ -1133,7 +1135,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) } case RC_EDITOR_ALTERNATIVES: { string format, command; - lexrc >> format >> command; + if (lexrc.next()) + format = lexrc.getString(); + if (lexrc.eatLine()) + command = lexrc.getString(); editor_alternatives[format].insert(command); break; } @@ -1141,7 +1146,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_DEFAULT_VIEW_FORMAT: lexrc >> default_view_format; break; - + case RC_DEFAULT_LANGUAGE: lexrc >> default_language; break; @@ -1232,11 +1237,11 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) run_mode = single_instance ? USE_REMOTE : NEW_INSTANCE; break; case RC_FORWARD_SEARCH_DVI: - if (lexrc.next(true)) + if (lexrc.next(true)) forward_search_dvi = lexrc.getString(); break; case RC_FORWARD_SEARCH_PDF: - if (lexrc.next(true)) + if (lexrc.next(true)) forward_search_pdf = lexrc.getString(); break; case RC_EXPORT_OVERWRITE: @@ -1329,7 +1334,7 @@ namespace { // Escape \ and " so that LyXLex can read the string later string escapeCommand(string const & str) { - return subst(subst(str , "\\", "\\\\"), + return subst(subst(str , "\\", "\\\\"), "\"", "\\\""); } @@ -1339,7 +1344,7 @@ namespace { void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) const { LyXRCTags tag = RC_LAST; - + if (!name.empty()) { for (int i = 0; i != lyxrcCount; ++i) if ("\\" + name == lyxrcTags[i].tag) @@ -1470,58 +1475,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c } if (tag != RC_LAST) break; - case RC_DEFAULT_PAPERSIZE: - if (ignore_system_lyxrc || - default_papersize != system_lyxrc.default_papersize) { - os << "# The default papersize to use.\n" - << "\\default_papersize \""; - switch (default_papersize) { - case PAPER_DEFAULT: - os << "default"; break; - case PAPER_USLETTER: - os << "usletter"; break; - case PAPER_USLEGAL: - os << "legal"; break; - case PAPER_USEXECUTIVE: - os << "executive"; break; - case PAPER_A3: - os << "a3"; break; - case PAPER_A4: - os << "a4"; break; - case PAPER_A5: - os << "a5"; break; - case PAPER_B5: - os << "b5"; break; - case PAPER_CUSTOM: - case PAPER_A0: - case PAPER_A1: - case PAPER_A2: - case PAPER_A6: - case PAPER_B0: - case PAPER_B1: - case PAPER_B2: - case PAPER_B3: - case PAPER_B4: - case PAPER_B6: - case PAPER_C0: - case PAPER_C1: - case PAPER_C2: - case PAPER_C3: - case PAPER_C4: - case PAPER_C5: - case PAPER_C6: - case PAPER_JISB0: - case PAPER_JISB1: - case PAPER_JISB2: - case PAPER_JISB3: - case PAPER_JISB4: - case PAPER_JISB5: - case PAPER_JISB6: break; - } - os << "\"\n"; - } - if (tag != RC_LAST) - break; case RC_CHKTEX_COMMAND: if (ignore_system_lyxrc || chktex_command != system_lyxrc.chktex_command) { @@ -1596,8 +1549,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; case RC_TEX_EXPECTS_WINDOWS_PATHS: - if (ignore_system_lyxrc || - windows_style_tex_paths != system_lyxrc.windows_style_tex_paths) { + // Don't write this setting to the preferences file, + // but allow temporary changes (bug 7557). + if (ignore_system_lyxrc) { os << "\\tex_expects_windows_paths " << convert(windows_style_tex_paths) << '\n'; } @@ -1729,6 +1683,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c << "# SCREEN & FONTS SECTION ############################\n" << "#\n\n"; + case RC_ICON_SET: + if (ignore_system_lyxrc || + icon_set != system_lyxrc.icon_set) { + os << "\\icon_set \"" << icon_set + << "\"\n"; + } + if (tag != RC_LAST) + break; + case RC_SCREEN_DPI: if (ignore_system_lyxrc || dpi != system_lyxrc.dpi) { @@ -2195,6 +2158,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c << "# TEX SECTION #######################################\n" << "#\n\n"; + case RC_TEXINPUTS_PREFIX: + if (ignore_system_lyxrc || + texinputs_prefix != system_lyxrc.texinputs_prefix) { + os << "\\texinputs_prefix \"" << texinputs_prefix << "\"\n"; + } + if (tag != RC_LAST) + break; + case RC_FONT_ENCODING: if (ignore_system_lyxrc || fontenc != system_lyxrc.fontenc) { @@ -2483,6 +2454,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; + case RC_DEFAULT_LENGTH_UNIT: + if (ignore_system_lyxrc || + default_length_unit != system_lyxrc.default_length_unit) { + os << "\\default_length_unit " << int(default_length_unit) << '\n'; + } + if (tag != RC_LAST) + break; + case RC_SPELLCHECKER: if (ignore_system_lyxrc || spellchecker != system_lyxrc.spellchecker) { @@ -2546,7 +2525,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c language_package_selection != system_lyxrc.language_package_selection) { os << "\\language_package_selection "; switch (language_package_selection) { - case LP_AUTO: + case LP_AUTO: os << "0\n"; break; case LP_BABEL: @@ -2696,15 +2675,16 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c Format const * format = system_formats.getFormat(cit->name()); if (!format || - format->extension() != cit->extension() || + format->extensions() != cit->extensions() || format->prettyname() != cit->prettyname() || format->shortcut() != cit->shortcut() || format->viewer() != cit->viewer() || format->editor() != cit->editor() || format->documentFormat() != cit->documentFormat() || - format->vectorFormat() != cit->vectorFormat()) { + format->vectorFormat() != cit->vectorFormat() || + format->inExportMenu() != cit->inExportMenu()) { os << "\\format \"" << cit->name() << "\" \"" - << cit->extension() << "\" \"" + << cit->extensions() << "\" \"" << cit->prettyname() << "\" \"" << cit->shortcut() << "\" \"" << escapeCommand(cit->viewer()) << "\" \"" @@ -2714,6 +2694,11 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c flags.push_back("document"); if (cit->vectorFormat()) flags.push_back("vector"); + if (cit->zippedNative()) + flags.push_back("zipped=native"); + if (cit->inExportMenu()) + flags.push_back("menu=export"); + os << getStringFromVector(flags); os << "\"\n"; } @@ -2730,19 +2715,19 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c case RC_VIEWER_ALTERNATIVES: { Alternatives::const_iterator it = viewer_alternatives.begin(); Alternatives::const_iterator const en = viewer_alternatives.end(); - Alternatives::const_iterator const sysend = + Alternatives::const_iterator const sysend = system_lyxrc.viewer_alternatives.end(); for (; it != en; ++it) { string const & fmt = it->first; CommandSet const & cmd = it->second; CommandSet::const_iterator sit = cmd.begin(); CommandSet::const_iterator const sen = cmd.end(); - Alternatives::const_iterator const sysfmt = ignore_system_lyxrc ? + Alternatives::const_iterator const sysfmt = ignore_system_lyxrc ? system_lyxrc.viewer_alternatives.begin() : // we won't use it in this case system_lyxrc.viewer_alternatives.find(fmt); for (; sit != sen; ++sit) { string const & cmd = *sit; - if (ignore_system_lyxrc + if (ignore_system_lyxrc || sysfmt == sysend // format not found || sysfmt->second.count(cmd) == 0 // this command not found ) @@ -2755,19 +2740,19 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c case RC_EDITOR_ALTERNATIVES: { Alternatives::const_iterator it = editor_alternatives.begin(); Alternatives::const_iterator const en = editor_alternatives.end(); - Alternatives::const_iterator const sysend = + Alternatives::const_iterator const sysend = system_lyxrc.editor_alternatives.end(); for (; it != en; ++it) { string const & fmt = it->first; CommandSet const & cmd = it->second; CommandSet::const_iterator sit = cmd.begin(); CommandSet::const_iterator const sen = cmd.end(); - Alternatives::const_iterator const sysfmt = ignore_system_lyxrc ? + Alternatives::const_iterator const sysfmt = ignore_system_lyxrc ? system_lyxrc.editor_alternatives.begin() : // we won't use it in this case system_lyxrc.editor_alternatives.find(fmt); for (; sit != sen; ++sit) { string const & cmd = *sit; - if (ignore_system_lyxrc + if (ignore_system_lyxrc || sysfmt == sysend // format not found || sysfmt->second.count(cmd) == 0 // this command not found ) @@ -2817,7 +2802,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c << "\" \"" << cit->to << "\" \"\" \"\"\n"; if (tag != RC_LAST) break; - + case RC_COPIER: if (tag == RC_LAST) os << "\n#\n" @@ -2863,7 +2848,10 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) // if we forget an element. LyXRC::LyXRCTags tag = LyXRC::RC_LAST; switch (tag) { + case LyXRC::RC_LAST: case LyXRC::RC_ACCEPT_COMPOUND: + if (lyxrc_orig.spellchecker_accept_compound != lyxrc_new.spellchecker_accept_compound) + if (theSpellChecker()) theSpellChecker()->advanceChangeNumber(); case LyXRC::RC_ALT_LANG: case LyXRC::RC_PLAINTEXT_LINELEN: case LyXRC::RC_AUTOCORRECTION_MATH: @@ -2896,7 +2884,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_DATE_INSERT_FORMAT: case LyXRC::RC_DEFAULT_LANGUAGE: case LyXRC::RC_GUI_LANGUAGE: - case LyXRC::RC_DEFAULT_PAPERSIZE: case LyXRC::RC_DEFAULT_VIEW_FORMAT: case LyXRC::RC_DEFFILE: case LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN: @@ -2915,6 +2902,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_FILEFORMAT: case LyXRC::RC_GROUP_LAYOUTS: case LyXRC::RC_HUNSPELLDIR_PATH: + case LyXRC::RC_ICON_SET: case LyXRC::RC_INDEX_ALTERNATIVES: case LyXRC::RC_INDEX_COMMAND: case LyXRC::RC_JBIBTEX_COMMAND: @@ -2943,7 +2931,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_PARAGRAPH_MARKERS: case LyXRC::RC_PATH_PREFIX: if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) { - prependEnvPath("PATH", lyxrc.path_prefix); + prependEnvPath("PATH", lyxrc_new.path_prefix); } case LyXRC::RC_PREVIEW: case LyXRC::RC_PREVIEW_HASHED_LABELS: @@ -2984,6 +2972,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_SHOW_BANNER: case LyXRC::RC_OPEN_BUFFERS_IN_TABS: case LyXRC::RC_SPELLCHECKER: + if (lyxrc_orig.spellchecker != lyxrc_new.spellchecker) + setSpellChecker(); case LyXRC::RC_SPELLCHECK_CONTINUOUSLY: case LyXRC::RC_SPELLCHECK_NOTES: case LyXRC::RC_SPLITINDEX_COMMAND: @@ -2994,6 +2984,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) if (lyxrc_orig.windows_style_tex_paths != lyxrc_new.windows_style_tex_paths) { os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths); } + case LyXRC::RC_TEXINPUTS_PREFIX: case LyXRC::RC_THESAURUSDIRPATH: case LyXRC::RC_UIFILE: case LyXRC::RC_USER_EMAIL: @@ -3019,9 +3010,9 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_FORWARD_SEARCH_PDF: case LyXRC::RC_EXPORT_OVERWRITE: case LyXRC::RC_DEFAULT_DECIMAL_POINT: + case LyXRC::RC_DEFAULT_LENGTH_UNIT: case LyXRC::RC_SCROLL_WHEEL_ZOOM: case LyXRC::RC_CURSOR_WIDTH: - case LyXRC::RC_LAST: break; } } @@ -3131,10 +3122,6 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("New documents will be assigned this language."); break; - case RC_DEFAULT_PAPERSIZE: - str = _("Specify the default paper size."); - break; - case RC_DIALOGS_ICONIFY_WITH_MAIN: str = _("Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)"); break; @@ -3287,7 +3274,7 @@ string const LyXRC::getDescription(LyXRCTags tag) case RC_PATH_PREFIX: str = _("Specify those directories which should be " - "prepended to the PATH environment variable. " + "prepended to the PATH environment variable.\n" "Use the OS native format."); break; @@ -3444,6 +3431,13 @@ string const LyXRC::getDescription(LyXRCTags tag) case RC_TEX_EXPECTS_WINDOWS_PATHS: break; + case RC_TEXINPUTS_PREFIX: + str = _("Specify those directories which should be " + "prepended to the TEXINPUTS environment variable.\n" + "A '.' represents the current document directory. " + "Use the OS native format."); + break; + case RC_UIFILE: str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories."); break;