X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=a07c8e6d805cd3c6f51aefe4585897b6d69b6f7a;hb=8ea66efe16ad109a5c107716185fb82bbebca8c8;hp=983eca3af5e1f68f78fb6dea87a0a11898beb6cc;hpb=cdb1f9a000dc5b14048d4bdc18a16212b1262021;p=lyx.git diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 983eca3af5..a07c8e6d80 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 = 7; // gb: add mime types // when adding something to this array keep it sorted! LexerKeyword lyxrcTags[] = { @@ -77,6 +78,7 @@ LexerKeyword lyxrcTags[] = { { "\\completion_inline_dots", LyXRC::RC_COMPLETION_INLINE_DOTS }, { "\\completion_inline_math", LyXRC::RC_COMPLETION_INLINE_MATH }, { "\\completion_inline_text", LyXRC::RC_COMPLETION_INLINE_TEXT }, + { "\\completion_minlength", LyXRC::RC_COMPLETION_MINLENGTH }, { "\\completion_popup_after_complete", LyXRC::RC_COMPLETION_POPUP_AFTER_COMPLETE }, { "\\completion_popup_delay", LyXRC::RC_COMPLETION_POPUP_DELAY }, { "\\completion_popup_math", LyXRC::RC_COMPLETION_POPUP_MATH }, @@ -90,7 +92,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 }, @@ -198,6 +200,7 @@ LexerKeyword lyxrcTags[] = { { "\\use_converter_cache", LyXRC::RC_USE_CONVERTER_CACHE }, { "\\use_lastfilepos", LyXRC::RC_USELASTFILEPOS }, { "\\use_pixmap_cache", LyXRC::RC_USE_PIXMAP_CACHE }, + { "\\use_qimage", LyXRC::RC_USE_QIMAGE }, // compatibility with versions older than 1.4.0 only { "\\use_system_colors", LyXRC::RC_USE_SYSTEM_COLORS }, { "\\use_tooltip", LyXRC::RC_USE_TOOLTIP }, @@ -249,7 +252,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"; @@ -301,6 +303,7 @@ void LyXRC::setDefaults() #endif spellchecker_accept_compound = false; spellcheck_continuously = false; + completion_minlength = 6; spellcheck_notes = true; use_kbmap = false; rtl_support = true; @@ -337,6 +340,7 @@ void LyXRC::setDefaults() use_system_colors = false; use_tooltip = true; use_pixmap_cache = false; + use_qimage = true; converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months user_name = to_utf8(support::user_name()); user_email = to_utf8(support::user_email()); @@ -366,6 +370,7 @@ void LyXRC::setDefaults() completion_inline_dots = -1; completion_inline_delay = 0.2; default_decimal_point = "."; + default_length_unit = Length::CM; cursor_width = 1; } @@ -401,11 +406,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; } @@ -620,28 +629,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(); @@ -830,6 +817,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) lexrc >> completion_popup_after_complete; break; + case RC_COMPLETION_MINLENGTH: + lexrc >> completion_minlength; + break; + case RC_NUMLASTFILES: lexrc >> num_lastfiles; break; @@ -968,6 +959,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_USE_PIXMAP_CACHE: lexrc >> use_pixmap_cache; break; + case RC_USE_QIMAGE: + lexrc >> use_qimage; + break; case RC_SPELLCHECKER: lexrc >> spellchecker; break; @@ -998,6 +992,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; @@ -1087,28 +1085,29 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) break; } case RC_FILEFORMAT: { - string format, extension, prettyname, shortcut; - lexrc >> format >> extension >> prettyname >> shortcut; + bool ok = true; + string format, extensions, prettyname, shortcut; + if (!(lexrc >> format >> extensions)) + ok = false; + if (ok && lexrc.next(true)) + prettyname = lexrc.getString(); + else + ok = false; + if (ok) + if(!(lexrc >> shortcut)) + ok = false; string viewer, editor; - if (lexrc.next(true)) + if (ok && lexrc.next(true)) viewer = lexrc.getString(); - if (lexrc.next(true)) + else + ok = false; + if (ok && lexrc.next(true)) editor = lexrc.getString(); - string flags; - // Hack to ensure compatibility with versions older - // than 1.5.0 - int le = lexrc.lex(); - if (le != Lexer::LEX_FEOF && le != Lexer::LEX_UNDEF) { - flags = lexrc.getString(); - if (le != Lexer::LEX_DATA) { - // We have got a known token. - // Therefore this is an old style - // format definition without - // flags. - lexrc.pushToken(flags); - flags.erase(); - } - } + else + ok = false; + string flags, mime; + if (!(lexrc >> flags >> mime)) + ok = false; int flgs = Format::none; while (!flags.empty()) { string flag; @@ -1117,6 +1116,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 @@ -1124,14 +1125,16 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) << flag << "' for format `" << format << "'."); } - if (prettyname.empty()) { + if (!ok) + LYXERR0("Syntax error in format " << format); + else if (prettyname.empty()) { if (theConverters().formatIsUsed(format)) LYXERR0("Can't delete format " << format); else formats.erase(format); } else { - formats.add(format, extension, prettyname, - shortcut, viewer, editor, flgs); + formats.add(format, extensions, prettyname, + shortcut, viewer, editor, mime, flgs); } break; } @@ -1486,58 +1489,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) { @@ -1612,8 +1563,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'; } @@ -2358,7 +2310,16 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c } if (tag != RC_LAST) break; - case RC_NUMLASTFILES: + case RC_COMPLETION_MINLENGTH: + if (ignore_system_lyxrc || + completion_minlength != system_lyxrc.completion_minlength) { + os << "\\completion_minlength " << convert(completion_minlength) + << '\n'; + } + if (tag != RC_LAST) + break; + + case RC_NUMLASTFILES: if (ignore_system_lyxrc || num_lastfiles != system_lyxrc.num_lastfiles) { os << "\\num_lastfiles " << num_lastfiles << '\n'; @@ -2501,6 +2462,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c } if (tag != RC_LAST) break; + case RC_USE_QIMAGE: + if (ignore_system_lyxrc || + use_qimage != system_lyxrc.use_qimage) { + os << "\\use_qimage " + << convert(use_qimage) + << '\n'; + } + if (tag != RC_LAST) + break; os << "\n#\n" << "# LANGUAGE SUPPORT SECTION ##########################\n" @@ -2516,6 +2486,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) { @@ -2729,16 +2707,17 @@ 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->inExportMenu() != cit->inExportMenu()) { + format->inExportMenu() != cit->inExportMenu() || + format->mime() != cit->mime()) { os << "\\format \"" << cit->name() << "\" \"" - << cit->extension() << "\" \"" + << cit->extensions() << "\" \"" << cit->prettyname() << "\" \"" << cit->shortcut() << "\" \"" << escapeCommand(cit->viewer()) << "\" \"" @@ -2748,11 +2727,13 @@ 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"; + os << "\" \"" << cit->mime() << "\"\n"; } } @@ -2761,7 +2742,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c cit != system_formats.end(); ++cit) if (!formats.getFormat(cit->name())) os << "\\format \"" << cit->name() - << "\" \"\" \"\" \"\" \"\" \"\" \"\"\n"; + << "\" \"\" \"\" \"\" \"\" \"\" \"\" \"\"\n"; if (tag != RC_LAST) break; case RC_VIEWER_ALTERNATIVES: { @@ -2900,7 +2881,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: @@ -2922,6 +2906,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_COMPLETION_POPUP_DELAY: case LyXRC::RC_COMPLETION_POPUP_MATH: case LyXRC::RC_COMPLETION_POPUP_TEXT: + case LyXRC::RC_COMPLETION_MINLENGTH: case LyXRC::RC_USELASTFILEPOS: case LyXRC::RC_LOADSESSION: case LyXRC::RC_CHKTEX_COMMAND: @@ -2933,7 +2918,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: @@ -2953,9 +2937,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_GROUP_LAYOUTS: case LyXRC::RC_HUNSPELLDIR_PATH: case LyXRC::RC_ICON_SET: - if (lyxrc_orig.icon_set != lyxrc_new.icon_set) { - lyxrc.icon_set = lyxrc_new.icon_set; - } case LyXRC::RC_INDEX_ALTERNATIVES: case LyXRC::RC_INDEX_COMMAND: case LyXRC::RC_JBIBTEX_COMMAND: @@ -2984,7 +2965,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: @@ -3025,6 +3006,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: @@ -3036,9 +3019,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths); } case LyXRC::RC_TEXINPUTS_PREFIX: - if (lyxrc_orig.texinputs_prefix != lyxrc_new.texinputs_prefix) { - lyxrc.texinputs_prefix = lyxrc_new.texinputs_prefix; - } case LyXRC::RC_THESAURUSDIRPATH: case LyXRC::RC_UIFILE: case LyXRC::RC_USER_EMAIL: @@ -3047,6 +3027,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_USE_SYSTEM_COLORS: case LyXRC::RC_USE_TOOLTIP: case LyXRC::RC_USE_PIXMAP_CACHE: + case LyXRC::RC_USE_QIMAGE: case LyXRC::RC_VIEWDVI_PAPEROPTION: case LyXRC::RC_SINGLE_CLOSE_TAB_BUTTON: case LyXRC::RC_SINGLE_INSTANCE: @@ -3064,9 +3045,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; } } @@ -3176,10 +3157,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;