X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=e6244f2d2ba03189d2ea8f0b015eb1f7dbd7f3a3;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=1a94ca0d403537e5538cc722a92d550b8f6bc8cf;hpb=ad1dc2fd6bb744c2c610d93debe1352b155df305;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 1a94ca0d40..e6244f2d2b 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -18,6 +18,7 @@
 
 #include "LyXRC.h"
 
+#include "BufferList.h"
 #include "ColorSet.h"
 #include "Converter.h"
 #include "FontEnums.h"
@@ -26,6 +27,7 @@
 #include "LyX.h"
 #include "Mover.h"
 #include "Session.h"
+#include "SpellChecker.h"
 #include "version.h"
 
 #include "graphics/GraphicsTypes.h"
@@ -39,6 +41,7 @@
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
+#include "support/TempFile.h"
 #include "support/userinfo.h"
 
 #include <fstream>
@@ -54,7 +57,9 @@ namespace os = support::os;
 
 namespace {
 
-static unsigned int const LYXRC_FILEFORMAT = 1;
+// 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 = 22; // ef: pygmentize_command
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
@@ -72,11 +77,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 },
@@ -89,8 +96,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 },
@@ -100,22 +107,24 @@ 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 },
 	{ "\\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 },
+	{ "\\jbibtex_alternatives", LyXRC::RC_JBIBTEX_ALTERNATIVES },
 	{ "\\jbibtex_command", LyXRC::RC_JBIBTEX_COMMAND },
 	{ "\\jindex_command", LyXRC::RC_JINDEX_COMMAND },
 	{ "\\kbmap", LyXRC::RC_KBMAP },
@@ -131,10 +140,11 @@ 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 },
+	{ "\\mouse_middlebutton_paste", LyXRC::RC_MOUSE_MIDDLEBUTTON_PASTE },
 	{ "\\mouse_wheel_speed", LyXRC::RC_MOUSE_WHEEL_SPEED },
 	{ "\\nomencl_command", LyXRC::RC_NOMENCL_COMMAND },
 	{ "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
@@ -145,26 +155,12 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\preview", LyXRC::RC_PREVIEW },
 	{ "\\preview_hashed_labels", LyXRC::RC_PREVIEW_HASHED_LABELS },
 	{ "\\preview_scale_factor", LyXRC::RC_PREVIEW_SCALE_FACTOR },
-	{ "\\print_adapt_output", LyXRC::RC_PRINT_ADAPTOUTPUT },
-	{ "\\print_collcopies_flag", LyXRC::RC_PRINTCOLLCOPIESFLAG },
-	{ "\\print_command", LyXRC::RC_PRINT_COMMAND },
-	{ "\\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 },
-	{ "\\rtl", LyXRC::RC_RTL_SUPPORT },
+	{ "\\pygmentize_command", LyXRC::RC_PYGMENTIZE_COMMAND },
 	{ "\\save_compressed", LyXRC::RC_SAVE_COMPRESSED },
+	{ "\\save_origin", LyXRC::RC_SAVE_ORIGIN },
 	{ "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
 	{ "\\screen_font_roman", LyXRC::RC_SCREEN_FONT_ROMAN },
 	{ "\\screen_font_roman_foundry", LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY },
@@ -191,13 +187,18 @@ 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 },
+	{ "\\use_converter_needauth", LyXRC::RC_USE_CONVERTER_NEEDAUTH },
+	{ "\\use_converter_needauth_forbidden", LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN },
 	{ "\\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 },
@@ -222,38 +223,30 @@ LyXRC::LyXRC()
 
 void LyXRC::setDefaults()
 {
+	icon_set = string();
+	use_system_theme_icons = false;
 	bind_file = "cua";
 	def_file = "default";
 	ui_file = "default";
-	// Get printer from the environment. If fail, use default "",
-	// assuming that everything is set up correctly.
-	printer = getEnv("PRINTER");
-	print_adapt_output = false;
-	print_command = "dvips";
-	print_evenpage_flag = "-B";
-	print_oddpage_flag = "-A";
-	print_pagerange_flag = "-pp";
-	print_copies_flag = "-c";
-	print_collcopies_flag = "-C";
-	print_reverse_flag = "-r";
+	// The current document directory
+	texinputs_prefix = ".";
 	print_landscape_flag = "-t landscape";
-	print_to_printer = "-P";
-	print_to_file = "-o ";
-	print_file_extension = ".ps";
 	print_paper_flag = "-t";
 	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";
+	bibtex_command = "automatic";
 	fontenc = "default";
 	index_command = "makeindex -c -q";
 	nomencl_command = "makeindex -s nomencl.ist";
+	pygmentize_command = string();
 	dpi = 75;
 	// Because a screen is typically wider than a piece of paper:
 	zoom = 150;
+	currentZoom = zoom;
 	allow_geometry_session = true;
 	// Default LaTeX font size:
 	font_sizes[FONT_SIZE_TINY] = "5.0";
@@ -275,12 +268,13 @@ void LyXRC::setDefaults()
 	auto_reset_options = false;
 	plaintext_linelen = 65;
 	mouse_wheel_speed = 1.0;
-	num_lastfiles = maxlastfiles;
+	num_lastfiles = 20;
 	check_lastfiles = true;
 	use_lastfilepos = true;
 	load_session = false;
 	make_backup = true;
 	save_compressed = false;
+	save_origin = false;
 	backupdir_path.erase();
 	display_graphics = true;
 	// Spellchecker settings:
@@ -296,9 +290,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;
@@ -311,7 +305,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;
@@ -322,16 +315,19 @@ 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;
 	preview_hashed_labels  = false;
 	preview_scale_factor = 1.0;
 	use_converter_cache = true;
+	use_converter_needauth_forbidden = true;
+	use_converter_needauth = true;
 	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());
@@ -347,6 +343,7 @@ void LyXRC::setDefaults()
 	full_screen_toolbars = true;
 	full_screen_tabbar = true;
 	full_screen_menubar = true;
+	full_screen_statusbar = true;
 	full_screen_scrollbar = true;
 	full_screen_width = 700;
 
@@ -361,7 +358,10 @@ 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";
+	mouse_middlebutton_paste = true;
 }
 
 
@@ -390,18 +390,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;
 }
 
@@ -425,9 +429,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;
 
@@ -497,6 +498,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;
@@ -529,80 +534,10 @@ 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;
-
-		case RC_PRINT_COMMAND:
-			if (lexrc.next(true)) {
-				print_command = lexrc.getString();
-			}
-			break;
-
-		case RC_PRINTEVENPAGEFLAG:
-			lexrc >> print_evenpage_flag;
-			break;
-
-		case RC_PRINTODDPAGEFLAG:
-			lexrc >> print_oddpage_flag;
-			break;
-
-		case RC_PRINTPAGERANGEFLAG:
-			lexrc >> print_pagerange_flag;
-			break;
-
-		case RC_PRINTCOPIESFLAG:
-			lexrc >> print_copies_flag;
-			break;
-
-		case RC_PRINTCOLLCOPIESFLAG:
-			lexrc >> print_collcopies_flag;
-			break;
-
-		case RC_PRINTREVERSEFLAG:
-			lexrc >> print_reverse_flag;
-			break;
-
 		case RC_PRINTLANDSCAPEFLAG:
 			lexrc >> print_landscape_flag;
 			break;
 
-		case RC_PRINTTOPRINTER:
-			lexrc >> print_to_printer;
-			break;
-
-		case RC_PRINT_ADAPTOUTPUT:
-			lexrc >> print_adapt_output;
-			break;
-
-		case RC_PRINTTOFILE:
-			if (lexrc.next()) {
-				print_to_file = os::internal_path(lexrc.getString());
-			}
-			break;
-
-		case RC_PRINTFILEEXTENSION:
-			lexrc >> print_file_extension;
-			break;
-
-		case RC_PRINTEXSTRAOPTIONS:
-			lexrc >> print_extra_options;
-			break;
-
-		case RC_PRINTSPOOL_COMMAND:
-			if (lexrc.next(true)) {
-				print_spool_command = lexrc.getString();
-			}
-			break;
-
-		case RC_PRINTSPOOL_PRINTERPREFIX:
-			lexrc >> print_spool_printerprefix;
-			break;
-
 		case RC_PRINTPAPERDIMENSIONFLAG:
 			lexrc >> print_paper_dimension_flag;
 			break;
@@ -611,25 +546,9 @@ 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;
+		case RC_PYGMENTIZE_COMMAND:
+			if (lexrc.next(true)) {
+				pygmentize_command = lexrc.getString();
 			}
 			break;
 
@@ -664,6 +583,12 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			}
 			break;
 
+		case RC_JBIBTEX_ALTERNATIVES:
+			if (lexrc.next(true)) {
+				jbibtex_alternatives.insert(lexrc.getString());
+			}
+			break;
+
 		case RC_INDEX_ALTERNATIVES:
 			if (lexrc.next(true)) {
 				index_alternatives.insert(lexrc.getString());
@@ -700,6 +625,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 
 		case RC_SCREEN_ZOOM:
 			lexrc >> zoom;
+			if (zoom < 10)
+				zoom = 10;
 			break;
 
 		case RC_GEOMETRY_SESSION:
@@ -728,45 +655,33 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			break;
 
 		case RC_DOCUMENTPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				document_path = os::internal_path(lexrc.getString());
-				document_path = expandPath(document_path);
-			}
 			break;
 
 		case RC_EXAMPLEPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				example_path = os::internal_path(lexrc.getString());
-				example_path = expandPath(example_path);
-			}
 			break;
 
 		case RC_TEMPLATEPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				template_path = os::internal_path(lexrc.getString());
-				template_path = expandPath(template_path);
-			}
 			break;
 
 		case RC_TEMPDIRPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				tempdir_path = os::internal_path(lexrc.getString());
-				tempdir_path = expandPath(tempdir_path);
-			}
 			break;
 
 		case RC_THESAURUSDIRPATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				thesaurusdir_path = os::internal_path(lexrc.getString());
-				thesaurusdir_path = expandPath(thesaurusdir_path);
-			}
 			break;
 
 		case RC_HUNSPELLDIR_PATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				hunspelldir_path = os::internal_path(lexrc.getString());
-				hunspelldir_path = expandPath(hunspelldir_path);
-			}
 			break;
 
 		case RC_USELASTFILEPOS:
@@ -821,6 +736,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;
@@ -829,6 +748,14 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			lexrc >> check_lastfiles;
 			break;
 
+		case RC_ICON_SET:
+			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();
@@ -895,10 +822,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			break;
 
 		case RC_SERVERPIPE:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				lyxpipes = os::internal_path(lexrc.getString());
-				lyxpipes = expandPath(lyxpipes);
-			}
 			break;
 
 		case RC_CURSOR_FOLLOWS_SCROLLBAR:
@@ -921,8 +846,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:
@@ -955,6 +880,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;
@@ -976,15 +904,20 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		case RC_SAVE_COMPRESSED:
 			lexrc >> save_compressed;
 			break;
+		case RC_SAVE_ORIGIN:
+			lexrc >> save_origin;
+			break;
 		case RC_BACKUPDIR_PATH:
-			if (lexrc.next()) {
+			if (lexrc.next())
 				backupdir_path = os::internal_path(lexrc.getString());
-				backupdir_path = expandPath(backupdir_path);
-			}
 			break;
 		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;
@@ -1027,12 +960,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;
@@ -1070,32 +1003,34 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		case RC_VIEWER: {
 			string format, command;
 			lexrc >> format >> command;
-			formats.setViewer(format, command);
+			theFormats().setViewer(format, command);
 			break;
 		}
 		case RC_FILEFORMAT: {
-			string format, extension, prettyname, shortcut;
-			lexrc >> format >> extension >> prettyname >> shortcut;
+			bool ok = true;
+			string format, extensions, shortcut;
+			docstring prettyname;
+			if (!(lexrc >> format >> extensions))
+				ok = false;
+			if (ok && lexrc.next(true))
+				prettyname = lexrc.getDocString();
+			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;
@@ -1104,6 +1039,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
@@ -1111,40 +1048,43 @@ 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);
+					theFormats().erase(format);
 			} else {
-				formats.add(format, extension, prettyname,
-					    shortcut, viewer, editor, flgs);
+				theFormats().add(format, extensions, prettyname,
+					    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();
-			viewer_alternatives[format].insert(command);
+			if ((lexrc >> format) && lexrc.next(true)) {
+				command  = lexrc.getString();
+				viewer_alternatives[format].insert(command);
+			}
 			break;
 		}
 		case RC_EDITOR_ALTERNATIVES:  {
 			string format, command;
-			lexrc >> format >> command;
-			editor_alternatives[format].insert(command);
+			if ((lexrc >> format) && lexrc.next(true)) {
+				command  = lexrc.getString();
+				editor_alternatives[format].insert(command);
+			}
 			break;
 		}
 
+		case RC_DEFAULT_OTF_VIEW_FORMAT:
+			lexrc >> default_otf_view_format;
+			break;
+
 		case RC_DEFAULT_VIEW_FORMAT:
 			lexrc >> default_view_format;
 			break;
-			
-		case RC_DEFAULT_LANGUAGE:
-			lexrc >> default_language;
-			break;
 
 		case RC_GUI_LANGUAGE:
 			lexrc >> gui_language;
@@ -1192,6 +1132,12 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		case RC_USE_CONVERTER_CACHE:
 			lexrc >> use_converter_cache;
 			break;
+		case RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
+			lexrc >> use_converter_needauth_forbidden;
+			break;
+		case RC_USE_CONVERTER_NEEDAUTH:
+			lexrc >> use_converter_needauth;
+			break;
 		case RC_CONVERTER_CACHE_MAXAGE:
 			lexrc >> converter_cache_maxage;
 			break;
@@ -1211,6 +1157,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;
@@ -1232,11 +1181,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:
@@ -1272,6 +1221,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			}
 			break;
 
+		case RC_MOUSE_MIDDLEBUTTON_PASTE:
+			lexrc >> mouse_middlebutton_paste;
+			break;
+
 		case RC_LAST:
 			break; // this is just a dummy
 		}
@@ -1283,8 +1236,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 	}
 
 	/// Update converters data-structures
-	theConverters().update(formats);
+	theConverters().update(theFormats());
 	theConverters().buildGraph();
+	theBufferList().invalidateConverterCache();
 
 	return ReadOK;
 }
@@ -1329,7 +1283,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 +1293,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 +1424,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) {
@@ -1555,6 +1457,18 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+	case RC_JBIBTEX_ALTERNATIVES: {
+		CommandSet::const_iterator it = jbibtex_alternatives.begin();
+		CommandSet::const_iterator end = jbibtex_alternatives.end();
+		for ( ; it != end; ++it) {
+			if (ignore_system_lyxrc
+			    || !system_lyxrc.jbibtex_alternatives.count(*it))
+				os << "\\jbibtex_alternatives \""
+				   << *it << "\"\n";
+		}
+		if (tag != RC_LAST)
+			break;
+	}
 	case RC_INDEX_ALTERNATIVES: {
 		CommandSet::const_iterator it = index_alternatives.begin();
 		CommandSet::const_iterator end = index_alternatives.end();
@@ -1595,9 +1509,17 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
-	case RC_TEX_EXPECTS_WINDOWS_PATHS:
+	case RC_PYGMENTIZE_COMMAND:
 		if (ignore_system_lyxrc ||
-		    windows_style_tex_paths != system_lyxrc.windows_style_tex_paths) {
+		    pygmentize_command != system_lyxrc.pygmentize_command) {
+			os << "\\pygmentize_command \"" << escapeCommand(pygmentize_command) << "\"\n";
+		}
+		if (tag != RC_LAST)
+			break;
+	case RC_TEX_EXPECTS_WINDOWS_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<string>(windows_style_tex_paths) << '\n';
 		}
@@ -1716,6 +1638,24 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		if (tag != RC_LAST)
 			break;
 
+	case RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
+		if (ignore_system_lyxrc ||
+		    use_converter_needauth_forbidden != system_lyxrc.use_converter_needauth_forbidden) {
+			os << "\\use_converter_needauth_forbidden "
+			   << convert<string>(use_converter_needauth_forbidden) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
+
+	case RC_USE_CONVERTER_NEEDAUTH:
+		if (ignore_system_lyxrc ||
+		    use_converter_needauth != system_lyxrc.use_converter_needauth) {
+			os << "\\use_converter_needauth "
+			   << convert<string>(use_converter_needauth) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
+
 	case RC_CONVERTER_CACHE_MAXAGE:
 		if (ignore_system_lyxrc ||
 		    converter_cache_maxage != system_lyxrc.converter_cache_maxage) {
@@ -1729,6 +1669,25 @@ 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_USE_SYSTEM_THEME_ICONS:
+		if (ignore_system_lyxrc ||
+			  use_system_theme_icons != system_lyxrc.use_system_theme_icons) {
+			os << "\\use_system_theme_icons "
+				<< convert<string>(use_system_theme_icons)
+				<< "\n";
+		}
+		if (tag != RC_LAST)
+			break;
+
 	case RC_SCREEN_DPI:
 		if (ignore_system_lyxrc ||
 		    dpi != system_lyxrc.dpi) {
@@ -1796,12 +1755,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<string>(mac_like_word_movement) << '\n';
+		    mac_like_cursor_movement
+		    != system_lyxrc.mac_like_cursor_movement) {
+			os << "\\mac_like_cursor_movement "
+			   << convert<string>(mac_like_cursor_movement) << '\n';
 		}
 		if (tag != RC_LAST)
 			break;
@@ -1907,6 +1866,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		    != system_lyxrc.font_sizes[FONT_SIZE_HUGE] ||
 		    font_sizes[FONT_SIZE_HUGER]
 		    != system_lyxrc.font_sizes[FONT_SIZE_HUGER]) {
+			streamsize old_prec = os.precision();
 			os.setf(ios::fixed);
 			os.precision(2);
 			os << "\\screen_font_sizes"
@@ -1921,6 +1881,8 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 			   << ' ' << font_sizes[FONT_SIZE_HUGE]
 			   << ' ' << font_sizes[FONT_SIZE_HUGER]
 			   << '\n';
+			os.precision(old_prec);
+			os.unsetf(ios::fixed);
 		}
 		if (tag != RC_LAST)
 			break;
@@ -1951,6 +1913,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<string>(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) {
@@ -2038,82 +2009,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		if (tag != RC_LAST)
 			break;
 
-		os << "\n#\n"
-		   << "# PRINTER SECTION ###################################\n"
-		   << "#\n\n";
+	os << "\n#\n"
+		 << "# PRINTER SECTION ###################################\n"
+		 << "#\n\n";
 
-	case RC_PRINTER:
-		if (ignore_system_lyxrc ||
-		    printer != system_lyxrc.printer) {
-			os << "\\printer \"" << printer << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINT_ADAPTOUTPUT:
-		if (ignore_system_lyxrc ||
-		    print_adapt_output != system_lyxrc.print_adapt_output) {
-			os << "\\print_adapt_output "
-			   << convert<string>(print_adapt_output)
-			   << '\n';
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINT_COMMAND:
-		if (ignore_system_lyxrc ||
-		    print_command != system_lyxrc.print_command) {
-			os << "\\print_command \"" << escapeCommand(print_command) << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTEXSTRAOPTIONS:
-		if (ignore_system_lyxrc ||
-		    print_extra_options != system_lyxrc.print_extra_options) {
-			os << "\\print_extra_options \"" << print_extra_options
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTSPOOL_COMMAND:
-		if (ignore_system_lyxrc ||
-		    print_spool_command != system_lyxrc.print_spool_command) {
-			os << "\\print_spool_command \"" << escapeCommand(print_spool_command)
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTSPOOL_PRINTERPREFIX:
-		if (ignore_system_lyxrc ||
-		    print_spool_printerprefix
-		    != system_lyxrc.print_spool_printerprefix) {
-			os << "\\print_spool_printerprefix \""
-			   << print_spool_printerprefix << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTEVENPAGEFLAG:
-		if (ignore_system_lyxrc ||
-		    print_evenpage_flag != system_lyxrc.print_evenpage_flag) {
-			os << "\\print_evenpage_flag \"" << print_evenpage_flag
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTODDPAGEFLAG:
-		if (ignore_system_lyxrc ||
-		    print_oddpage_flag != system_lyxrc.print_oddpage_flag) {
-			os << "\\print_oddpage_flag \"" << print_oddpage_flag
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTREVERSEFLAG:
-		if (ignore_system_lyxrc ||
-		    print_reverse_flag != system_lyxrc.print_reverse_flag) {
-			os << "\\print_reverse_flag \"" << print_reverse_flag
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
 	case RC_PRINTLANDSCAPEFLAG:
 		if (ignore_system_lyxrc ||
 		    print_landscape_flag != system_lyxrc.print_landscape_flag) {
@@ -2122,32 +2021,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
-	case RC_PRINTPAGERANGEFLAG:
-		if (ignore_system_lyxrc ||
-		    print_pagerange_flag != system_lyxrc.print_pagerange_flag) {
-			os << "\\print_pagerange_flag \"" << print_pagerange_flag
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTCOPIESFLAG:
-		if (ignore_system_lyxrc ||
-		    print_copies_flag != system_lyxrc.print_copies_flag) {
-			os << "\\print_copies_flag \"" << print_copies_flag
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTCOLLCOPIESFLAG:
-		if (ignore_system_lyxrc ||
-		    print_collcopies_flag
-		    != system_lyxrc.print_collcopies_flag) {
-			os << "\\print_collcopies_flag \""
-			   << print_collcopies_flag
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
+
 	case RC_PRINTPAPERFLAG:
 		if (ignore_system_lyxrc ||
 		    print_paper_flag != system_lyxrc.print_paper_flag) {
@@ -2156,6 +2030,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+
 	case RC_PRINTPAPERDIMENSIONFLAG:
 		if (ignore_system_lyxrc ||
 		    print_paper_dimension_flag
@@ -2165,36 +2040,19 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
-	case RC_PRINTTOPRINTER:
-		if (ignore_system_lyxrc ||
-		    print_to_printer != system_lyxrc.print_to_printer) {
-			os << "\\print_to_printer \"" << print_to_printer
-			   << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTTOFILE:
-		if (ignore_system_lyxrc ||
-		    print_to_file != system_lyxrc.print_to_file) {
-			string const path = os::external_path(print_to_file);
-			os << "\\print_to_file \"" << path << "\"\n";
-		}
-		if (tag != RC_LAST)
-			break;
-	case RC_PRINTFILEEXTENSION:
+
+	os << "\n#\n"
+		 << "# TEX SECTION #######################################\n"
+		 << "#\n\n";
+
+	case RC_TEXINPUTS_PREFIX:
 		if (ignore_system_lyxrc ||
-		    print_file_extension != system_lyxrc.print_file_extension) {
-			os << "\\print_file_extension \""
-			   << print_file_extension
-			   << "\"\n";
+		    texinputs_prefix != system_lyxrc.texinputs_prefix) {
+			os << "\\texinputs_prefix \"" << texinputs_prefix << "\"\n";
 		}
 		if (tag != RC_LAST)
 			break;
 
-		os << "\n#\n"
-		   << "# TEX SECTION #######################################\n"
-		   << "#\n\n";
-
 	case RC_FONT_ENCODING:
 		if (ignore_system_lyxrc ||
 		    fontenc != system_lyxrc.fontenc) {
@@ -2203,14 +2061,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";
@@ -2246,6 +2096,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+	case RC_MOUSE_MIDDLEBUTTON_PASTE:
+		if (ignore_system_lyxrc ||
+		    mouse_middlebutton_paste != system_lyxrc.mouse_middlebutton_paste) {
+			os << "\\mouse_middlebutton_paste "
+			   << convert<string>(mouse_middlebutton_paste) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
 	case RC_COMPLETION_INLINE_DELAY:
 		if (ignore_system_lyxrc ||
 		    completion_inline_delay != system_lyxrc.completion_inline_delay) {
@@ -2325,7 +2183,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<string>(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';
@@ -2401,6 +2268,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+	case RC_SAVE_ORIGIN:
+		if (ignore_system_lyxrc ||
+		    save_origin != system_lyxrc.save_origin) {
+			os << "\\save_origin " << convert<string>(save_origin) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
 	case RC_BACKUPDIR_PATH:
 		if (ignore_system_lyxrc ||
 		    backupdir_path != system_lyxrc.backupdir_path) {
@@ -2468,12 +2342,19 @@ 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<string>(use_qimage)
+			   << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
 
 		os << "\n#\n"
 		   << "# LANGUAGE SUPPORT SECTION ##########################\n"
 		   << "#\n\n";
-		if (tag != RC_LAST)
-			break;
 
 	case RC_DEFAULT_DECIMAL_POINT:
 		if (ignore_system_lyxrc ||
@@ -2483,6 +2364,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) {
@@ -2509,17 +2398,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<string>(rtl_support) << '\n';
+			visual_cursor != system_lyxrc.visual_cursor) {
+			os << "\\visual_cursor " << convert<string>(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<string>(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;
@@ -2546,7 +2436,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:
@@ -2628,13 +2518,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) {
@@ -2691,21 +2574,23 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 
 	case RC_FILEFORMAT:
 		// New/modified formats
-		for (Formats::const_iterator cit = formats.begin();
-		     cit != formats.end(); ++cit) {
+		for (Formats::const_iterator cit = theFormats().begin(); 
+		     cit != theFormats().end(); ++cit) {
 			Format const * format =
-				system_formats.getFormat(cit->name());
+				theSystemFormats().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() ||
+			    format->mime() != cit->mime()) {
 				os << "\\format \"" << cit->name() << "\" \""
-				   << cit->extension() << "\" \""
-				   << cit->prettyname() << "\" \""
+				   << cit->extensions() << "\" \""
+				   << to_utf8(cit->prettyname()) << "\" \""
 				   << cit->shortcut() << "\" \""
 				   << escapeCommand(cit->viewer()) << "\" \""
 				   << escapeCommand(cit->editor()) << "\" \"";
@@ -2714,39 +2599,44 @@ 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";
 			}
 		}
 
 		// Look for deleted formats
-		for (Formats::const_iterator cit = system_formats.begin();
-		     cit != system_formats.end(); ++cit)
-			if (!formats.getFormat(cit->name()))
+		for (Formats::const_iterator cit = theSystemFormats().begin(); 
+		     cit != theSystemFormats().end(); ++cit)
+			if (!theFormats().getFormat(cit->name()))
 				os << "\\format \"" << cit->name()
-				   << "\" \"\" \"\" \"\" \"\" \"\" \"\"\n";
+				   << "\" \"\" \"\" \"\" \"\" \"\" \"\" \"\"\n";
 		if (tag != RC_LAST)
 			break;
 	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) {
+		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
 				   )
-					os << "\\viewer_alternatives " << fmt << " " << cmd << "\n";
+					os << "\\viewer_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n";
 			}
 		}
 		if (tag != RC_LAST)
@@ -2755,28 +2645,36 @@ 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
 				   )
-					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) {
@@ -2798,26 +2696,26 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		for (Converters::const_iterator cit = theConverters().begin();
 		     cit != theConverters().end(); ++cit) {
 			Converter const * converter =
-				theSystemConverters().getConverter(cit->from,
-							       cit->to);
+				theSystemConverters().getConverter(cit->from(),
+				                                   cit->to());
 			if (!converter ||
-			    converter->command != cit->command ||
-			    converter->flags != cit->flags)
-				os << "\\converter \"" << cit->from << "\" \""
-				   << cit->to << "\" \""
-				   << escapeCommand(cit->command) << "\" \""
-				   << cit->flags << "\"\n";
+			    converter->command() != cit->command() ||
+			    converter->flags() != cit->flags())
+				os << "\\converter \"" << cit->from() << "\" \""
+				   << cit->to() << "\" \""
+				   << escapeCommand(cit->command()) << "\" \""
+				   << cit->flags() << "\"\n";
 		}
 
 		// New/modifed converters
 		for (Converters::const_iterator cit = theSystemConverters().begin();
 		     cit != theSystemConverters().end(); ++cit)
-			if (!theConverters().getConverter(cit->from, cit->to))
-				os << "\\converter \"" << cit->from
-				   << "\" \"" << cit->to << "\" \"\" \"\"\n";
+			if (!theConverters().getConverter(cit->from(), cit->to()))
+				os << "\\converter \"" << cit->from()
+				   << "\" \"" << cit->to() << "\" \"\" \"\"\n";
 		if (tag != RC_LAST)
 			break;
-	
+
 	case RC_COPIER:
 		if (tag == RC_LAST)
 			os << "\n#\n"
@@ -2863,7 +2761,11 @@ 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();
+		// fall through
 	case LyXRC::RC_ALT_LANG:
 	case LyXRC::RC_PLAINTEXT_LINELEN:
 	case LyXRC::RC_AUTOCORRECTION_MATH:
@@ -2885,6 +2787,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:
@@ -2894,9 +2797,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:
@@ -2907,19 +2809,22 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 			if (path.exists() && path.isDirectory())
 				package().document_dir() = FileName(lyxrc.document_path);
 		}
+		// fall through
 	case LyXRC::RC_EDITOR_ALTERNATIVES:
 	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:
+	case LyXRC::RC_ICON_SET:
 	case LyXRC::RC_INDEX_ALTERNATIVES:
 	case LyXRC::RC_INDEX_COMMAND:
 	case LyXRC::RC_JBIBTEX_COMMAND:
+	case LyXRC::RC_JBIBTEX_ALTERNATIVES:
 	case LyXRC::RC_JINDEX_COMMAND:
 	case LyXRC::RC_NOMENCL_COMMAND:
+	case LyXRC::RC_PYGMENTIZE_COMMAND:
 	case LyXRC::RC_INPUT:
 	case LyXRC::RC_KBMAP:
 	case LyXRC::RC_KBMAP_PRIMARY:
@@ -2934,40 +2839,29 @@ 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:
 	case LyXRC::RC_MOUSE_WHEEL_SPEED:
+	case LyXRC::RC_MOUSE_MIDDLEBUTTON_PASTE:
 	case LyXRC::RC_NUMLASTFILES:
 	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);
+			// Resets python path
+			support::os::python(true);
 		}
+		// fall through
 	case LyXRC::RC_PREVIEW:
 	case LyXRC::RC_PREVIEW_HASHED_LABELS:
 	case LyXRC::RC_PREVIEW_SCALE_FACTOR:
-	case LyXRC::RC_PRINTCOLLCOPIESFLAG:
-	case LyXRC::RC_PRINTCOPIESFLAG:
-	case LyXRC::RC_PRINTER:
-	case LyXRC::RC_PRINTEVENPAGEFLAG:
-	case LyXRC::RC_PRINTEXSTRAOPTIONS:
-	case LyXRC::RC_PRINTFILEEXTENSION:
 	case LyXRC::RC_PRINTLANDSCAPEFLAG:
-	case LyXRC::RC_PRINTODDPAGEFLAG:
-	case LyXRC::RC_PRINTPAGERANGEFLAG:
 	case LyXRC::RC_PRINTPAPERDIMENSIONFLAG:
 	case LyXRC::RC_PRINTPAPERFLAG:
-	case LyXRC::RC_PRINTREVERSEFLAG:
-	case LyXRC::RC_PRINTSPOOL_COMMAND:
-	case LyXRC::RC_PRINTSPOOL_PRINTERPREFIX:
-	case LyXRC::RC_PRINTTOFILE:
-	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_SAVE_ORIGIN:
 	case LyXRC::RC_SCREEN_DPI:
 	case LyXRC::RC_SCREEN_FONT_ROMAN:
 	case LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY:
@@ -2984,6 +2878,9 @@ 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();
+		// fall through
 	case LyXRC::RC_SPELLCHECK_CONTINUOUSLY:
 	case LyXRC::RC_SPELLCHECK_NOTES:
 	case LyXRC::RC_SPLITINDEX_COMMAND:
@@ -2994,14 +2891,20 @@ 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);
 		}
+		// fall through
+	case LyXRC::RC_TEXINPUTS_PREFIX:
 	case LyXRC::RC_THESAURUSDIRPATH:
 	case LyXRC::RC_UIFILE:
 	case LyXRC::RC_USER_EMAIL:
 	case LyXRC::RC_USER_NAME:
 	case LyXRC::RC_USE_CONVERTER_CACHE:
+	case LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
+	case LyXRC::RC_USE_CONVERTER_NEEDAUTH:
 	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:
@@ -3009,19 +2912,21 @@ 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:
-	case LyXRC::RC_LAST:
 		break;
 	}
 }
@@ -3087,6 +2992,14 @@ string const LyXRC::getDescription(LyXRCTags tag)
 	case RC_CONVERTER:
 		break;
 
+	case RC_CONVERTER_NEEDAUTH_FORBIDDEN:
+		str = _("Forbid use of external converters with 'needauth' option to prevent undesired effects.");
+		break;
+
+	case RC_CONVERTER_NEEDAUTH:
+		str = _("Ask user before calling external converters with 'needauth' option to prevent undesired effects.");
+		break;
+
 	case RC_COPIER:
 		break;
 
@@ -3095,7 +3008,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		break;
 
 	case RC_CURSOR_WIDTH:
-		str = _("Configure the width of the text cursor. Automatic zoom controled cursor width used when set to 0.");
+		str = _("Configure the width of the text cursor. Automatic zoom-controlled cursor width used when set to 0.");
 		break;
 
 	case RC_SCROLL_BELOW_DOCUMENT:
@@ -3106,8 +3019,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:
@@ -3123,16 +3036,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:
@@ -3159,10 +3068,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;
 
@@ -3178,6 +3083,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		str = _("Define the options of makeindex (cf. man makeindex) to be used for nomenclatures. This might differ from the index processing options.");
 		break;
 
+	case RC_PYGMENTIZE_COMMAND:
+		str = _("The command to run the python pygments syntax highlighter.");
+		break;
+
 	case RC_INPUT:
 		break;
 
@@ -3236,8 +3145,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		break;
 
 	case RC_MOUSE_WHEEL_SPEED:
-		str = bformat(_("The scrolling speed of the mouse wheel."),
-		      maxlastfiles);
+		str = _("The scrolling speed of the mouse wheel.");
 		break;
 
 	case RC_COMPLETION_POPUP_DELAY:
@@ -3277,7 +3185,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		break;
 
 	case RC_AUTOCORRECTION_MATH:
-		str = _("Allow TeXMacs shorthand, like => converting to \Rightarrow.");
+		str = _("Allow TeXMacs shorthand, like => converting to \\Rightarrow.");
 		break;
 
 	case RC_NUMLASTFILES:
@@ -3287,7 +3195,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;
 
@@ -3303,86 +3211,26 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		str = _("Scale the preview size to suit.");
 		break;
 
-	case RC_PRINTCOLLCOPIESFLAG:
-		str = _("The option for specifying whether the copies should be collated.");
-		break;
-
-	case RC_PRINTCOPIESFLAG:
-		str = _("The option for specifying the number of copies to print.");
-		break;
-
-	case RC_PRINTER:
-		str = _("The default printer to print on. If none is specified, LyX will use the environment variable PRINTER.");
-		break;
-
-	case RC_PRINTEVENPAGEFLAG:
-		str = _("The option to print only even pages.");
-		break;
-
-	case RC_PRINTEXSTRAOPTIONS:
-		str = _("Extra options to pass to printing program after everything else, but before the filename of the DVI file to be printed.");
-		break;
-
-	case RC_PRINTFILEEXTENSION:
-		str = _("Extension of printer program output file. Usually \".ps\".");
-		break;
-
 	case RC_PRINTLANDSCAPEFLAG:
 		str = _("The option to print out in landscape.");
 		break;
 
-	case RC_PRINTODDPAGEFLAG:
-		str = _("The option to print only odd pages.");
-		break;
-
-	case RC_PRINTPAGERANGEFLAG:
-		str = _("The option for specifying a comma-separated list of pages to print.");
-		break;
-
 	case RC_PRINTPAPERDIMENSIONFLAG:
-				   str = _("Option to specify the dimensions of the print paper.");
+		str = _("Option to specify the dimensions of the print paper.");
 		break;
 
 	case RC_PRINTPAPERFLAG:
 		str = _("The option to specify paper type.");
 		break;
 
-	case RC_PRINTREVERSEFLAG:
-		str = _("The option to reverse the order of the pages printed.");
-		break;
-
-	case RC_PRINTSPOOL_COMMAND:
-		str = _("When set, this printer option automatically prints to a file and then calls a separate print spooling program on that file with the given name and arguments.");
-		break;
-
-	case RC_PRINTSPOOL_PRINTERPREFIX:
-		str = _("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_PRINTTOFILE:
-		str = _("Option to pass to the print program to print to a file.");
-		break;
-
-	case RC_PRINTTOPRINTER:
-		str = _("Option to pass to the print program to print on a specific printer.");
-		break;
-
-	case RC_PRINT_ADAPTOUTPUT:
-		str = _("Select for LyX to pass the name of the destination printer to your print command.");
-		break;
-
-	case RC_PRINT_COMMAND:
-		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;
@@ -3444,6 +3292,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;