X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=5e1efcf4105aec295e50ae5d05f958445670af61;hb=f110ef2f41d0aca14acd4a5f1aec6011f770c3c6;hp=ffe1aff2d9401dc7db2a1be0735f1d4e03288bea;hpb=a55ef8346a9b80131a7cfa008bc8b9eb075c0523;p=lyx.git diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index ffe1aff2d9..5e1efcf410 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -40,6 +40,7 @@ #include "support/lstrings.h" #include "support/os.h" #include "support/Package.h" +#include "support/TempFile.h" #include "support/userinfo.h" #include @@ -55,7 +56,9 @@ namespace os = support::os; namespace { -static unsigned int const LYXRC_FILEFORMAT = 2; +// The format should also be updated in configure.py, and conversion code +// should be added to prefs2prefs_prefs.py. +static unsigned int const LYXRC_FILEFORMAT = 17; // lasgouttes: remove \\rtl // when adding something to this array keep it sorted! LexerKeyword lyxrcTags[] = { @@ -73,11 +76,13 @@ LexerKeyword lyxrcTags[] = { { "\\bind_file", LyXRC::RC_BINDFILE }, { "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES }, { "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND }, + { "\\close_buffer_with_last_view", LyXRC::RC_CLOSE_BUFFER_WITH_LAST_VIEW }, { "\\completion_cursor_text", LyXRC::RC_COMPLETION_CURSOR_TEXT }, { "\\completion_inline_delay", LyXRC::RC_COMPLETION_INLINE_DELAY }, { "\\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,8 +95,8 @@ LexerKeyword lyxrcTags[] = { { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT }, { "\\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_otf_view_format", LyXRC::RC_DEFAULT_OTF_VIEW_FORMAT }, { "\\default_view_format", LyXRC::RC_DEFAULT_VIEW_FORMAT }, { "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN }, { "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS }, @@ -101,13 +106,13 @@ LexerKeyword lyxrcTags[] = { { "\\example_path", LyXRC::RC_EXAMPLEPATH }, { "\\export_overwrite", LyXRC::RC_EXPORT_OVERWRITE }, { "\\font_encoding", LyXRC::RC_FONT_ENCODING }, - { "\\force_paint_single_char", LyXRC::RC_FORCE_PAINT_SINGLE_CHAR }, { "\\format", LyXRC::RC_FILEFORMAT }, { "\\forward_search_dvi", LyXRC::RC_FORWARD_SEARCH_DVI }, { "\\forward_search_pdf", LyXRC::RC_FORWARD_SEARCH_PDF }, { "\\fullscreen_limit", LyXRC::RC_FULL_SCREEN_LIMIT }, { "\\fullscreen_menubar", LyXRC::RC_FULL_SCREEN_MENUBAR }, { "\\fullscreen_scrollbar", LyXRC::RC_FULL_SCREEN_SCROLLBAR }, + { "\\fullscreen_statusbar", LyXRC::RC_FULL_SCREEN_STATUSBAR }, { "\\fullscreen_tabbar", LyXRC::RC_FULL_SCREEN_TABBAR }, { "\\fullscreen_toolbars", LyXRC::RC_FULL_SCREEN_TOOLBARS }, { "\\fullscreen_width", LyXRC::RC_FULL_SCREEN_WIDTH }, @@ -133,7 +138,7 @@ LexerKeyword lyxrcTags[] = { { "\\language_package_selection", LyXRC::RC_LANGUAGE_PACKAGE_SELECTION }, { "\\load_session", LyXRC::RC_LOADSESSION }, { "\\mac_dontswap_ctrl_meta", LyXRC::RC_MAC_DONTSWAP_CTRL_META }, - { "\\mac_like_word_movement", LyXRC::RC_MAC_LIKE_WORD_MOVEMENT }, + { "\\mac_like_cursor_movement", LyXRC::RC_MAC_LIKE_CURSOR_MOVEMENT }, { "\\macro_edit_style", LyXRC::RC_MACRO_EDIT_STYLE }, { "\\make_backup", LyXRC::RC_MAKE_BACKUP }, { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE }, @@ -165,7 +170,6 @@ LexerKeyword lyxrcTags[] = { { "\\print_to_file", LyXRC::RC_PRINTTOFILE }, { "\\print_to_printer", LyXRC::RC_PRINTTOPRINTER }, { "\\printer", LyXRC::RC_PRINTER }, - { "\\rtl", LyXRC::RC_RTL_SUPPORT }, { "\\save_compressed", LyXRC::RC_SAVE_COMPRESSED }, { "\\screen_dpi", LyXRC::RC_SCREEN_DPI }, { "\\screen_font_roman", LyXRC::RC_SCREEN_FONT_ROMAN }, @@ -199,8 +203,10 @@ 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_system_theme_icons", LyXRC::RC_USE_SYSTEM_THEME_ICONS }, { "\\use_tooltip", LyXRC::RC_USE_TOOLTIP }, { "\\user_email", LyXRC::RC_USER_EMAIL }, { "\\user_name", LyXRC::RC_USER_NAME }, @@ -226,6 +232,7 @@ LyXRC::LyXRC() void LyXRC::setDefaults() { icon_set = string(); + use_system_theme_icons = false; bind_file = "cua"; def_file = "default"; ui_file = "default"; @@ -250,8 +257,8 @@ void LyXRC::setDefaults() print_paper_dimension_flag = "-T"; document_path.erase(); view_dvi_paper_option.erase(); - default_papersize = PAPER_DEFAULT; default_view_format = "pdf2"; + default_otf_view_format = "pdf4"; chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"; bibtex_command = "bibtex"; fontenc = "default"; @@ -302,9 +309,9 @@ void LyXRC::setDefaults() #endif spellchecker_accept_compound = false; spellcheck_continuously = false; + completion_minlength = 6; spellcheck_notes = true; use_kbmap = false; - rtl_support = true; visual_cursor = false; auto_number = true; mark_foreign_language = true; @@ -317,7 +324,6 @@ void LyXRC::setDefaults() language_command_local = "\\foreignlanguage{$$lang}{"; sort_layouts = false; group_layouts = true; - default_language = "english"; gui_language = "auto"; show_banner = true; windows_style_tex_paths = false; @@ -328,7 +334,7 @@ void LyXRC::setDefaults() scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL; paragraph_markers = false; mac_dontswap_ctrl_meta = false; - mac_like_word_movement = false; + mac_like_cursor_movement = false; macro_edit_style = MACRO_EDIT_INLINE_BOX; dialogs_iconify_with_main = false; preview = PREVIEW_OFF; @@ -338,6 +344,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()); @@ -367,7 +374,9 @@ void LyXRC::setDefaults() completion_inline_dots = -1; completion_inline_delay = 0.2; default_decimal_point = "."; + default_length_unit = Length::CM; cursor_width = 1; + close_buffer_with_last_view = "yes"; } @@ -396,18 +405,22 @@ bool LyXRC::read(FileName const & filename, bool check_format) return retval == ReadOK; LYXERR(Debug::FILES, "Converting LyXRC file to " << LYXRC_FILEFORMAT); - FileName const tempfile = FileName::tempName("convert_lyxrc"); + TempFile tmp("convert_lyxrc"); + FileName const tempfile = tmp.name(); bool const success = prefs2prefs(filename, tempfile, false); if (!success) { 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; } @@ -431,9 +444,6 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) if (!lexrc.isOK()) return ReadError; - // default for current rowpainter capabilities - force_paint_single_char = true; - // format prior to 2.0 and introduction of format tag unsigned int format = 0; @@ -539,10 +549,6 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) lexrc >> fontenc; break; - case RC_FORCE_PAINT_SINGLE_CHAR: - lexrc >> force_paint_single_char; - break; - case RC_PRINTER: lexrc >> printer; break; @@ -621,28 +627,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(); @@ -831,6 +815,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; @@ -843,6 +831,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) lexrc >> icon_set; break; + case RC_USE_SYSTEM_THEME_ICONS: + lexrc >> use_system_theme_icons; + break; + case RC_SCREEN_FONT_ROMAN: if (lexrc.next()) { roman_font_name = lexrc.getString(); @@ -935,8 +927,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) lexrc >> mac_dontswap_ctrl_meta; break; - case RC_MAC_LIKE_WORD_MOVEMENT: - lexrc >> mac_like_word_movement; + case RC_MAC_LIKE_CURSOR_MOVEMENT: + lexrc >> mac_like_cursor_movement; break; case RC_MACRO_EDIT_STYLE: @@ -969,6 +961,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; @@ -999,6 +994,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; @@ -1041,12 +1040,12 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_LANGUAGE_COMMAND_LOCAL: lexrc >> language_command_local; break; - case RC_RTL_SUPPORT: - lexrc >> rtl_support; - break; case RC_VISUAL_CURSOR: lexrc >> visual_cursor; break; + case RC_CLOSE_BUFFER_WITH_LAST_VIEW: + lexrc >> close_buffer_with_last_view; + break; case RC_AUTO_NUMBER: lexrc >> auto_number; break; @@ -1088,28 +1087,29 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) break; } case RC_FILEFORMAT: { + bool ok = true; string format, extensions, prettyname, shortcut; - lexrc >> 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; @@ -1118,6 +1118,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 @@ -1125,42 +1127,40 @@ 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, extensions, prettyname, - shortcut, viewer, editor, flgs); + shortcut, viewer, editor, mime, flgs); } break; } case RC_VIEWER_ALTERNATIVES: { string format, command; - if (lexrc.next()) - format = lexrc.getString(); - if (lexrc.eatLine()) - command = lexrc.getString(); + lexrc >> format; + lexrc >> command; viewer_alternatives[format].insert(command); break; } case RC_EDITOR_ALTERNATIVES: { string format, command; - if (lexrc.next()) - format = lexrc.getString(); - if (lexrc.eatLine()) - command = lexrc.getString(); + lexrc >> format; + lexrc >> command; editor_alternatives[format].insert(command); break; } - case RC_DEFAULT_VIEW_FORMAT: - lexrc >> default_view_format; + case RC_DEFAULT_OTF_VIEW_FORMAT: + lexrc >> default_otf_view_format; break; - case RC_DEFAULT_LANGUAGE: - lexrc >> default_language; + case RC_DEFAULT_VIEW_FORMAT: + lexrc >> default_view_format; break; case RC_GUI_LANGUAGE: @@ -1228,6 +1228,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_FULL_SCREEN_SCROLLBAR: lexrc >> full_screen_scrollbar; break; + case RC_FULL_SCREEN_STATUSBAR: + lexrc >> full_screen_statusbar; + break; case RC_FULL_SCREEN_TABBAR: lexrc >> full_screen_tabbar; break; @@ -1487,58 +1490,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) { @@ -1756,6 +1707,16 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; + case RC_USE_SYSTEM_THEME_ICONS: + if (ignore_system_lyxrc || + use_system_theme_icons != system_lyxrc.use_system_theme_icons) { + os << "\\use_system_theme_icons " + << convert(use_system_theme_icons) + << "\n"; + } + if (tag != RC_LAST) + break; + case RC_SCREEN_DPI: if (ignore_system_lyxrc || dpi != system_lyxrc.dpi) { @@ -1823,12 +1784,12 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c } if (tag != RC_LAST) break; - case RC_MAC_LIKE_WORD_MOVEMENT: + case RC_MAC_LIKE_CURSOR_MOVEMENT: if (ignore_system_lyxrc || - mac_like_word_movement - != system_lyxrc.mac_like_word_movement) { - os << "\\mac_like_word_movement " - << convert(mac_like_word_movement) << '\n'; + mac_like_cursor_movement + != system_lyxrc.mac_like_cursor_movement) { + os << "\\mac_like_cursor_movement " + << convert(mac_like_cursor_movement) << '\n'; } if (tag != RC_LAST) break; @@ -1978,6 +1939,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c } if (tag != RC_LAST) break; + case RC_FULL_SCREEN_STATUSBAR: + if (ignore_system_lyxrc || + full_screen_statusbar != system_lyxrc.full_screen_statusbar) { + os << "\\fullscreen_statusbar " + << convert(full_screen_statusbar) + << '\n'; + } + if (tag != RC_LAST) + break; case RC_FULL_SCREEN_TABBAR: if (ignore_system_lyxrc || full_screen_tabbar != system_lyxrc.full_screen_tabbar) { @@ -2238,14 +2208,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; - case RC_FORCE_PAINT_SINGLE_CHAR: - if (ignore_system_lyxrc || - force_paint_single_char != system_lyxrc.force_paint_single_char) { - os << "\\force_paint_single_char \"" << force_paint_single_char << "\"\n"; - } - if (tag != RC_LAST) - break; - os << "\n#\n" << "# FILE SECTION ######################################\n" << "#\n\n"; @@ -2360,7 +2322,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'; @@ -2503,6 +2474,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" @@ -2518,6 +2498,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) { @@ -2544,17 +2532,18 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; - case RC_RTL_SUPPORT: + case RC_VISUAL_CURSOR: if (ignore_system_lyxrc || - rtl_support != system_lyxrc.rtl_support) { - os << "\\rtl " << convert(rtl_support) << '\n'; + visual_cursor != system_lyxrc.visual_cursor) { + os << "\\visual_cursor " << convert(visual_cursor) << '\n'; } if (tag != RC_LAST) break; - case RC_VISUAL_CURSOR: + case RC_CLOSE_BUFFER_WITH_LAST_VIEW: if (ignore_system_lyxrc || - visual_cursor != system_lyxrc.visual_cursor) { - os << "\\visual_cursor " << convert(visual_cursor) << '\n'; + close_buffer_with_last_view != system_lyxrc.close_buffer_with_last_view) { + os << "# When closing last view, buffer closes (yes), hides (no), or ask the user (ask)\n"; + os << "\\close_buffer_with_last_view " << close_buffer_with_last_view << '\n'; } if (tag != RC_LAST) break; @@ -2663,13 +2652,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c } if (tag != RC_LAST) break; - case RC_DEFAULT_LANGUAGE: - if (ignore_system_lyxrc || - default_language != system_lyxrc.default_language) { - os << "\\default_language " << default_language << '\n'; - } - if (tag != RC_LAST) - break; case RC_GUI_LANGUAGE: if (ignore_system_lyxrc || gui_language != system_lyxrc.gui_language) { @@ -2738,7 +2720,8 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c 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->extensions() << "\" \"" << cit->prettyname() << "\" \"" @@ -2750,11 +2733,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"; } } @@ -2763,7 +2748,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: { @@ -2785,7 +2770,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c || sysfmt == sysend // format not found || sysfmt->second.count(cmd) == 0 // this command not found ) - os << "\\viewer_alternatives " << fmt << " " << cmd << "\n"; + os << "\\viewer_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n"; } } if (tag != RC_LAST) @@ -2810,12 +2795,20 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c || sysfmt == sysend // format not found || sysfmt->second.count(cmd) == 0 // this command not found ) - os << "\\editor_alternatives " << fmt << " " << cmd << "\n"; + os << "\\editor_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n"; } } if (tag != RC_LAST) break; } + case RC_DEFAULT_OTF_VIEW_FORMAT: + if ((ignore_system_lyxrc || + default_otf_view_format != system_lyxrc.default_otf_view_format) + && !default_otf_view_format.empty()) { + os << "\\default_otf_view_format " << default_otf_view_format << '\n'; + } + if (tag != RC_LAST) + break; case RC_DEFAULT_VIEW_FORMAT: if (ignore_system_lyxrc || default_view_format != system_lyxrc.default_view_format) { @@ -2927,6 +2920,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: @@ -2936,9 +2930,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR: case LyXRC::RC_SCROLL_BELOW_DOCUMENT: 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_OTF_VIEW_FORMAT: case LyXRC::RC_DEFAULT_VIEW_FORMAT: case LyXRC::RC_DEFFILE: case LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN: @@ -2953,7 +2946,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_ESC_CHARS: case LyXRC::RC_EXAMPLEPATH: case LyXRC::RC_FONT_ENCODING: - case LyXRC::RC_FORCE_PAINT_SINGLE_CHAR: case LyXRC::RC_FILEFORMAT: case LyXRC::RC_GROUP_LAYOUTS: case LyXRC::RC_HUNSPELLDIR_PATH: @@ -2977,7 +2969,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_LANGUAGE_PACKAGE_SELECTION: case LyXRC::RC_LYXRCFORMAT: case LyXRC::RC_MAC_DONTSWAP_CTRL_META: - case LyXRC::RC_MAC_LIKE_WORD_MOVEMENT: + case LyXRC::RC_MAC_LIKE_CURSOR_MOVEMENT: case LyXRC::RC_MACRO_EDIT_STYLE: case LyXRC::RC_MAKE_BACKUP: case LyXRC::RC_MARK_FOREIGN_LANGUAGE: @@ -2987,6 +2979,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_PATH_PREFIX: if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) { prependEnvPath("PATH", lyxrc_new.path_prefix); + // Resets python path + support::os::python(true); } case LyXRC::RC_PREVIEW: case LyXRC::RC_PREVIEW_HASHED_LABELS: @@ -3009,7 +3003,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_PRINTTOPRINTER: case LyXRC::RC_PRINT_ADAPTOUTPUT: case LyXRC::RC_PRINT_COMMAND: - case LyXRC::RC_RTL_SUPPORT: case LyXRC::RC_SAVE_COMPRESSED: case LyXRC::RC_SCREEN_DPI: case LyXRC::RC_SCREEN_FONT_ROMAN: @@ -3048,6 +3041,8 @@ 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_USE_SYSTEM_THEME_ICONS: case LyXRC::RC_VIEWDVI_PAPEROPTION: case LyXRC::RC_SINGLE_CLOSE_TAB_BUTTON: case LyXRC::RC_SINGLE_INSTANCE: @@ -3055,16 +3050,19 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_FULL_SCREEN_LIMIT: case LyXRC::RC_FULL_SCREEN_SCROLLBAR: case LyXRC::RC_FULL_SCREEN_MENUBAR: + case LyXRC::RC_FULL_SCREEN_STATUSBAR: case LyXRC::RC_FULL_SCREEN_TABBAR: case LyXRC::RC_FULL_SCREEN_TOOLBARS: case LyXRC::RC_FULL_SCREEN_WIDTH: case LyXRC::RC_VISUAL_CURSOR: + case LyXRC::RC_CLOSE_BUFFER_WITH_LAST_VIEW: case LyXRC::RC_VIEWER: case LyXRC::RC_VIEWER_ALTERNATIVES: case LyXRC::RC_FORWARD_SEARCH_DVI: 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: break; @@ -3151,8 +3149,8 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("Make Apple key act as Meta and Control key as Ctrl."); break; - case RC_MAC_LIKE_WORD_MOVEMENT: - str = _("Use the Mac OS X conventions for the word-level cursor movement"); + case RC_MAC_LIKE_CURSOR_MOVEMENT: + str = _("Use the Mac OS X conventions for cursor movement"); break; case RC_SHOW_MACRO_LABEL: @@ -3168,16 +3166,12 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("Command definition file. Can either specify an absolute path, or LyX will look in its global and local commands/ directories."); break; - case RC_DEFAULT_VIEW_FORMAT: - str = _("The default format used with LFUN_BUFFER_[VIEW|UPDATE]."); - break; - - case RC_DEFAULT_LANGUAGE: - str = _("New documents will be assigned this language."); + case RC_DEFAULT_OTF_VIEW_FORMAT: + str = _("The default format used with LFUN_BUFFER_[VIEW|UPDATE] with non-TeX fonts."); break; - case RC_DEFAULT_PAPERSIZE: - str = _("Specify the default paper size."); + case RC_DEFAULT_VIEW_FORMAT: + str = _("The default format used with LFUN_BUFFER_[VIEW|UPDATE]."); break; case RC_DIALOGS_ICONIFY_WITH_MAIN: @@ -3204,10 +3198,6 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages."); break; - case RC_FORCE_PAINT_SINGLE_CHAR: - str = _("Disable any kerning and ligatures for text drawing on screen."); - break; - case RC_FILEFORMAT: break; @@ -3420,14 +3410,14 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("Your favorite print program, e.g. \"dvips\", \"dvilj4\"."); break; - case RC_RTL_SUPPORT: - str = _("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)."); - break; - case RC_VISUAL_CURSOR: str = _("Select to have visual bidi cursor movement, unselect for logical movement."); break; + case RC_CLOSE_BUFFER_WITH_LAST_VIEW: + str = _("Specify whether, closing the last view of an open document, LyX should close the document (yes), hide it (no), or ask the user (ask)."); + break; + case RC_SCREEN_DPI: str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here."); break;