X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=4570bfba8f511ab85c6e4ac5f501e9d105ff67ce;hb=969ab85d985485f503790cb13f98a582d4e1cdb5;hp=03cacfeae15360603a571211de5ff5e90bbedec3;hpb=b084ac0a4af4270558fb8c09add0ffeb3c2f601d;p=lyx.git

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 03cacfeae1..4570bfba8f 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -27,6 +27,7 @@
 #include "bufferlist.h"
 #include "bufferparams.h"
 #include "BufferView.h"
+#include "bufferview_funcs.h"
 #include "cursor.h"
 #include "CutAndPaste.h"
 #include "debug.h"
@@ -113,6 +114,7 @@ using support::bformat;
 using support::changeExtension;
 using support::contains;
 using support::FileFilterList;
+using support::FileName;
 using support::fileSearch;
 using support::ForkedcallsController;
 using support::i18nLibFileSearch;
@@ -240,6 +242,42 @@ void LyXFunc::handleKeyFunc(kb_action action)
 }
 
 
+void LyXFunc::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
+{
+	BOOST_ASSERT(lyx_view_);
+	if (!LyX::ref().session().bookmarks().isValid(idx))
+		return;
+	BookmarksSection::Bookmark const & bm = LyX::ref().session().bookmarks().bookmark(idx);
+	BOOST_ASSERT(!bm.filename.empty());
+	string const file = bm.filename.absFilename();
+	// if the file is not opened, open it.
+	if (!theBufferList().exists(file)) {
+		if (openFile)
+			dispatch(FuncRequest(LFUN_FILE_OPEN, file));
+		else
+			return;
+	}
+	// open may fail, so we need to test it again
+	if (theBufferList().exists(file)) {
+		// if the current buffer is not that one, switch to it.
+		if (lyx_view_->buffer()->fileName() != file) {
+			if (switchToBuffer)
+				dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
+			else
+				return;
+		}
+		// moveToPosition use par_id, and par_pit and return new par_id.
+		pit_type new_pit;
+		int new_id;
+		boost::tie(new_pit, new_id) = view()->moveToPosition(bm.par_pit, bm.par_id, bm.par_pos);
+		// if par_id or pit has been changed, reset par_pit and par_id
+		// see http://bugzilla.lyx.org/show_bug.cgi?id=3092
+		if (bm.par_pit != new_pit || bm.par_id != new_id)
+			const_cast<BookmarksSection::Bookmark &>(bm).setPos(new_pit, new_id);
+	} 
+}
+
+
 void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
 {
 	lyxerr[Debug::KEY] << "KeySym is " << keysym->getSymbolName() << endl;
@@ -258,7 +296,9 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
 
 	//Encoding const * encoding = view()->cursor().getEncoding();
 	//encoded_last_key = keysym->getISOEncoded(encoding ? encoding->name() : "");
-	size_t encoded_last_key = keysym->getUCSEncoded();
+	// FIXME: encoded_last_key shadows the member variable of the same
+	// name. Is that intended?
+	char_type encoded_last_key = keysym->getUCSEncoded();
 
 	// Do a one-deep top-level lookup for
 	// cancel and meta-fake keys. RVDK_PATCH_5
@@ -292,7 +332,7 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
 		lyxerr << BOOST_CURRENT_FUNCTION
 		       << " Key [action="
 		       << func.action << "]["
-		       << keyseq->print() << ']'
+		       << to_utf8(keyseq->print(false)) << ']'
 		       << endl;
 	}
 
@@ -301,7 +341,7 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
 	// num_bytes == 0? (Lgb)
 
 	if (keyseq->length() > 1) {
-		lyx_view_->message(from_utf8(keyseq->print()));
+		lyx_view_->message(keyseq->print(true));
 	}
 
 
@@ -348,20 +388,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	//lyxerr << "LyXFunc::getStatus: cmd: " << cmd << endl;
 	FuncStatus flag;
 
-	if (cmd.action == LFUN_LYX_QUIT) {
-		flag.message(from_utf8(N_("Exiting")));
-		flag.enabled(true);
-		return flag;
-	}  else if (cmd.action == LFUN_BOOKMARK_GOTO) {
-		// bookmarks can be valid even if there is no opened buffer
-		flag.enabled(LyX::ref().session().bookmarks().isValid(convert<unsigned int>(to_utf8(cmd.argument()))));
-		return flag;
-	} else if (cmd.action == LFUN_BOOKMARK_CLEAR) {
-		flag.enabled(LyX::ref().session().bookmarks().size() > 0);
-		return flag;
-	}
-
-
 	LCursor & cur = view()->cursor();
 
 	/* In LyX/Mac, when a dialog is open, the menus of the
@@ -372,11 +398,9 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	   Note that this code is not perfect, as bug 1941 attests:
 	   http://bugzilla.lyx.org/show_bug.cgi?id=1941#c4
 	*/
-	Buffer * buf;
-	if (cmd.origin == FuncRequest::UI && !lyx_view_->hasFocus())
+	Buffer * buf = lyx_view_? lyx_view_->buffer() : 0;
+	if (lyx_view_ && cmd.origin == FuncRequest::MENU && !lyx_view_->hasFocus())
 		buf = 0;
-	else
-		buf = lyx_view_->buffer();
 
 	if (cmd.action == LFUN_NOACTION) {
 		flag.message(from_utf8(N_("Nothing to do")));
@@ -512,9 +536,10 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 		if (inset) {
 			FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
 			FuncStatus fs;
-			bool const success = inset->getStatus(cur, fr, fs);
-			// Every inset is supposed to handle this
-			BOOST_ASSERT(success);
+			if (!inset->getStatus(cur, fr, fs)) {
+				// Every inset is supposed to handle this
+				BOOST_ASSERT(false);
+			}
 			flag |= fs;
 		} else {
 			FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
@@ -538,7 +563,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 		else if (name == "character" || name == "mathpanel")
 			enable = cur.inset().lyxCode() != InsetBase::ERT_CODE;
 		else if (name == "latexlog")
-			enable = isFileReadable(buf->getLogName().second);
+			enable = isFileReadable(FileName(buf->getLogName().second));
 #if !defined (USE_ASPELL) && !defined (USE_ISPELL) && !defined (USE_PSPELL)
 		else if (name == "spellchecker")
 			enable = false;
@@ -552,6 +577,11 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 
 	case LFUN_DIALOG_SHOW_NEW_INSET:
 		enable = cur.inset().lyxCode() != InsetBase::ERT_CODE;
+		if (cur.inset().lyxCode() == InsetBase::CAPTION_CODE) {
+			FuncStatus flag;
+			if (cur.inset().getStatus(cur, cmd, flag))
+				return flag;
+		}
 		break;
 
 	case LFUN_DIALOG_UPDATE: {
@@ -573,6 +603,16 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 		break;
 	}
 
+	case LFUN_BOOKMARK_GOTO: {
+		const unsigned int num = convert<unsigned int>(to_utf8(cmd.argument()));
+		enable = LyX::ref().session().bookmarks().isValid(num);
+		break;
+	}
+
+	case LFUN_BOOKMARK_CLEAR:
+		enable = LyX::ref().session().bookmarks().size() > 0;
+		break;
+
 	case LFUN_TOOLBAR_TOGGLE_STATE: {
 		ToolbarBackend::Flags flags = lyx_view_->getToolbarState(to_utf8(cmd.argument()));
 		if (!(flags & ToolbarBackend::AUTO))
@@ -642,6 +682,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	case LFUN_BUFFER_PREVIOUS:
 	case LFUN_WINDOW_NEW:
 	case LFUN_WINDOW_CLOSE:
+	case LFUN_LYX_QUIT:
 		// these are handled in our dispatch()
 		break;
 
@@ -767,12 +808,12 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 		case LFUN_WORD_FIND_FORWARD:
 		case LFUN_WORD_FIND_BACKWARD: {
 			BOOST_ASSERT(lyx_view_ && lyx_view_->view());
-			static string last_search;
-			string searched_string;
+			static docstring last_search;
+			docstring searched_string;
 
-			if (!argument.empty()) {
-				last_search = argument;
-				searched_string = argument;
+			if (!cmd.argument().empty()) {
+				last_search = cmd.argument();
+				searched_string = cmd.argument();
 			} else {
 				searched_string = last_search;
 			}
@@ -781,7 +822,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 				break;
 
 			bool const fw = action == LFUN_WORD_FIND_FORWARD;
-			string const data =
+			docstring const data =
 				find2string(searched_string, true, false, fw);
 			find(view(), FuncRequest(LFUN_WORD_FIND, data));
 			break;
@@ -789,7 +830,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
 		case LFUN_COMMAND_PREFIX:
 			BOOST_ASSERT(lyx_view_);
-			lyx_view_->message(from_utf8(keyseq->printOptions()));
+			lyx_view_->message(keyseq->printOptions(true));
 			break;
 
 		case LFUN_COMMAND_EXECUTE:
@@ -810,7 +851,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
 		case LFUN_META_PREFIX:
 			meta_fake_bit = key_modifier::alt;
-			setMessage(from_utf8(keyseq->print()));
+			setMessage(keyseq->print(true));
 			break;
 
 		case LFUN_BUFFER_TOGGLE_READ_ONLY:
@@ -844,8 +885,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 				lyx_view_->message(str);
 				menuWrite(lyx_view_->buffer());
 				lyx_view_->message(str + _(" done."));
-			} else
-				writeAs(lyx_view_->buffer());
+			} else {
+ 				writeAs(lyx_view_->buffer());
+			}
 			updateFlags = Update::None;
 			break;
 
@@ -864,7 +906,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 				text, 0, 1, _("&Revert"), _("&Cancel"));
 
 			if (ret == 0)
-				view()->reload();
+				reloadBuffer();
 			break;
 		}
 
@@ -922,7 +964,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 							   format->extension());
 				filename = addName(buffer->temppath(), filename);
 
-				if (!buffer->writeFile(filename))
+				if (!buffer->writeFile(FileName(filename)))
 					break;
 
 			} else {
@@ -1018,9 +1060,20 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
 			} else {
 				// case 1: print to a file
+				FileName const filename(makeAbsPath(target_name, path));
+				if (fs::exists(filename.toFilesystemEncoding())) {
+					docstring text = bformat(
+						_("The file %1$s already exists.\n\n"
+						  "Do you want to over-write that file?"),
+						makeDisplayPath(filename.absFilename()));
+					if (Alert::prompt(_("Over-write file?"),
+					    text, 0, 1, _("&Over-write"), _("&Cancel")) != 0) {
+						showPrintError(buffer->fileName());
+						break;
+					}
+				}
 				command += lyxrc.print_to_file
-					+ quoteName(makeAbsPath(target_name,
-								path))
+					+ quoteName(filename.toFilesystemEncoding())
 					+ ' '
 					+ quoteName(dviname);
 				res = one.startscript(Systemcall::DontWait,
@@ -1037,22 +1090,11 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			break;
 
 		case LFUN_LYX_QUIT:
-			if (argument != "force") {
-				if (!theApp->gui().closeAll())
-					break;
-				lyx_view_ = 0;
-			}
-
-			// FIXME: this code needs to be transfered somewhere else
-			// as lyx_view_ will most certainly be null and a same buffer
-			// might be visible in more than one LyXView.
-			if (lyx_view_ && lyx_view_->view()->buffer()) {
-				// save cursor Position for opened files to .lyx/session
-				LyX::ref().session().lastFilePos().save(lyx_view_->buffer()->fileName(),
-					boost::tie(view()->cursor().pit(), view()->cursor().pos()) );
-			}
-
-			LyX::ref().quit();
+			// quitting is triggered by the gui code
+			// (leaving the event loop).
+			lyx_view_->message(from_utf8(N_("Exiting.")));
+			if (theBufferList().quitWriteAll())
+				theApp()->gui().closeAllViews();
 			break;
 
 		case LFUN_TOC_VIEW: {
@@ -1079,14 +1121,14 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 				setErrorMessage(_("Missing argument"));
 				break;
 			}
-			string const fname = i18nLibFileSearch("doc", arg, "lyx");
+			FileName const fname = i18nLibFileSearch("doc", arg, "lyx");
 			if (fname.empty()) {
 				lyxerr << "LyX: unable to find documentation file `"
 							 << arg << "'. Bad installation?" << endl;
 				break;
 			}
 			lyx_view_->message(bformat(_("Opening help file %1$s..."),
-				makeDisplayPath(fname)));
+				makeDisplayPath(fname.absFilename())));
 			lyx_view_->loadLyXFile(fname, false);
 			break;
 		}
@@ -1098,8 +1140,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 				break;
 			if (!lyx_view_->buffer()->lyxvc().inUse()) {
 				lyx_view_->buffer()->lyxvc().registrer();
-				view()->reload();
+				reloadBuffer();
 			}
+			updateFlags = Update::Force;
 			break;
 
 		case LFUN_VC_CHECK_IN:
@@ -1109,7 +1152,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			if (lyx_view_->buffer()->lyxvc().inUse()
 					&& !lyx_view_->buffer()->isReadonly()) {
 				lyx_view_->buffer()->lyxvc().checkIn();
-				view()->reload();
+				reloadBuffer();
 			}
 			break;
 
@@ -1120,20 +1163,20 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			if (lyx_view_->buffer()->lyxvc().inUse()
 					&& lyx_view_->buffer()->isReadonly()) {
 				lyx_view_->buffer()->lyxvc().checkOut();
-				view()->reload();
+				reloadBuffer();
 			}
 			break;
 
 		case LFUN_VC_REVERT:
 			BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
 			lyx_view_->buffer()->lyxvc().revert();
-			view()->reload();
+			reloadBuffer();
 			break;
 
 		case LFUN_VC_UNDO_LAST:
 			BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
 			lyx_view_->buffer()->lyxvc().undoLast();
-			view()->reload();
+			reloadBuffer();
 			break;
 
 		// --- buffers ----------------------------------------
@@ -1182,7 +1225,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			break;
 
 		case LFUN_SERVER_NOTIFY:
-			dispatch_buffer = from_utf8(keyseq->print());
+			dispatch_buffer = keyseq->print(false);
 			theLyXServer().notifyClient(to_utf8(dispatch_buffer));
 			break;
 
@@ -1199,10 +1242,10 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			} else {
 				// Must replace extension of the file to be .lyx
 				// and get full path
-				string const s = changeExtension(file_name, ".lyx");
+				FileName const s = fileSearch(string(), changeExtension(file_name, ".lyx"), "lyx");
 				// Either change buffer or load the file
-				if (theBufferList().exists(s)) {
-					lyx_view_->setBuffer(theBufferList().getBuffer(s));
+				if (theBufferList().exists(s.absFilename())) {
+					lyx_view_->setBuffer(theBufferList().getBuffer(s.absFilename()));
 				} else {
 					lyx_view_->loadLyXFile(s);
 				}
@@ -1210,8 +1253,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
 			view()->setCursorFromRow(row);
 
-			view()->center();
-			// see BufferView::center()
+			updateFlags = Update::FitCursor;
 			break;
 		}
 
@@ -1254,12 +1296,18 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			    name == "bibtex" ||
 			    name == "index" ||
 			    name == "label" ||
+			    name == "nomenclature" ||
 			    name == "ref" ||
 			    name == "toc" ||
 			    name == "url") {
 				InsetCommandParams p(name);
 				data = InsetCommandMailer::params2string(name, p);
 			} else if (name == "include") {
+				// data is the include type: one of "include",
+				// "input", "verbatiminput" or "verbatiminput*"
+				if (data.empty())
+					// default type is requested
+					data = "include";
 				InsetCommandParams p(data);
 				data = InsetIncludeMailer::params2string(p);
 			} else if (name == "box") {
@@ -1351,15 +1399,15 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
 		case LFUN_BUFFER_CHILD_OPEN: {
 			BOOST_ASSERT(lyx_view_);
-			string const filename =
+			FileName const filename =
 				makeAbsPath(argument, lyx_view_->buffer()->filePath());
 			// FIXME Should use bformat
 			setMessage(_("Opening child document ") +
-					 makeDisplayPath(filename) + "...");
+					 makeDisplayPath(filename.absFilename()) + "...");
 			view()->saveBookmark(false);
 			string const parentfilename = lyx_view_->buffer()->fileName();
-			if (theBufferList().exists(filename))
-				lyx_view_->setBuffer(theBufferList().getBuffer(filename));
+			if (theBufferList().exists(filename.absFilename()))
+				lyx_view_->setBuffer(theBufferList().getBuffer(filename.absFilename()));
 			else
 				lyx_view_->loadLyXFile(filename);
 			// Set the parent name of the child document.
@@ -1421,8 +1469,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 		}
 
 		case LFUN_PREFERENCES_SAVE: {
-			support::Path p(package().user_support());
-			lyxrc.write("preferences", false);
+			lyxrc.write(makeAbsPath("preferences",
+			                        package().user_support()),
+			            false);
 			break;
 		}
 
@@ -1431,8 +1480,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			// handle the screen font changes.
 			lyxrc.set_font_norm_type();
 			theFontLoader().update();
-			// All visible buffers will need resize
-			view()->resize();
+			/// FIXME: only the current view will be updated. the Gui
+			/// class is able to furnish the list of views.
+			updateFlags = Update::Force;
 			break;
 
 		case LFUN_SET_COLOR: {
@@ -1457,7 +1507,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 				break;
 			}
 
-			theApp->updateColor(lcolor.getFromLyXName(lyx_name));
+			theApp()->updateColor(lcolor.getFromLyXName(lyx_name));
 
 			if (graphicsbg_changed) {
 #ifdef WITH_WARNINGS
@@ -1564,7 +1614,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 				       << endl;
 			}
 
-			if (defaults.writeFile(defaults.fileName()))
+			if (defaults.writeFile(FileName(defaults.fileName())))
 				// FIXME Should use bformat
 				setMessage(_("Document defaults saved in ")
 					   + makeDisplayPath(fname));
@@ -1660,6 +1710,12 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			}
 
 			actOnUpdatedPrefs(lyxrc_orig, lyxrc);
+
+			/// We force the redraw in any case because there might be
+			/// some screen font changes.
+			/// FIXME: only the current view will be updated. the Gui
+			/// class is able to furnish the list of views.
+			updateFlags = Update::Force;
 			break;
 		}
 
@@ -1669,29 +1725,20 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
 		case LFUN_WINDOW_CLOSE:
 			BOOST_ASSERT(lyx_view_);
-			BOOST_ASSERT(theApp);
+			BOOST_ASSERT(theApp());
+			// update bookmark pit of the current buffer before window close
+			for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
+				gotoBookmark(i+1, false, false);
+			// ask the user for saving changes or cancel quit
+			if (!theBufferList().quitWriteAll())
+				break;
 			lyx_view_->close();
-			// We return here because lyx_view does not exists anymore.
 			return;
 
-		case LFUN_BOOKMARK_GOTO: {
-			BOOST_ASSERT(lyx_view_);
-			unsigned int idx = convert<unsigned int>(to_utf8(cmd.argument()));
-			BookmarksSection::Bookmark const bm = LyX::ref().session().bookmarks().bookmark(idx);
-			BOOST_ASSERT(!bm.filename.empty());
-			// if the file is not opened, open it.
-			if (!theBufferList().exists(bm.filename))
-				dispatch(FuncRequest(LFUN_FILE_OPEN, bm.filename));
-			// open may fail, so we need to test it again
-			if (theBufferList().exists(bm.filename)) {
-				// if the current buffer is not that one, switch to it.
-				if (lyx_view_->buffer()->fileName() != bm.filename)
-					dispatch(FuncRequest(LFUN_BUFFER_SWITCH, bm.filename));
-				// BOOST_ASSERT(lyx_view_->buffer()->fileName() != bm.filename);
-				view()->moveToPosition(bm.par_id, bm.par_pos);
-			} 
+		case LFUN_BOOKMARK_GOTO:
+			// go to bookmark, open unopened file and switch to buffer if necessary
+			gotoBookmark(convert<unsigned int>(to_utf8(cmd.argument())), true, true);
 			break;
-		}
 
 		case LFUN_BOOKMARK_CLEAR:
 			LyX::ref().session().bookmarks().clear();
@@ -1706,31 +1753,29 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			view()->cursor().dispatch(cmd);
 			updateFlags = view()->cursor().result().update();
 			if (!view()->cursor().result().dispatched())
-				if (view()->dispatch(cmd)) 
-					updateFlags = Update::Force | Update::FitCursor;
+				updateFlags = view()->dispatch(cmd);
 			break;
 		}
 		}
 
 		if (lyx_view_ && view()->buffer()) {
-			// Redraw screen unless explicitly told otherwise.
-			// This also initializes the position cache for all insets
-			// in (at least partially) visible top-level paragraphs.
-			bool needSecondUpdate = false;
-			if (updateFlags != Update::None)
-				view()->update(updateFlags);
-			else
-				needSecondUpdate = view()->fitCursor();
-
-			if (needSecondUpdate || updateFlags != Update::None) {
+			// BufferView::update() updates the ViewMetricsInfo and
+			// also initializes the position cache for all insets in
+			// (at least partially) visible top-level paragraphs.
+			// We will redraw the screen only if needed.
+			if (view()->update(updateFlags)) {
+				// Buffer::changed() signals that a repaint is needed.
+				// The frontend (WorkArea) knows which area to repaint
+				// thanks to the ViewMetricsInfo updated above.
 				view()->buffer()->changed();
 			}
+
 			lyx_view_->updateStatusBar();
 
 			// if we executed a mutating lfun, mark the buffer as dirty
 			if (flag.enabled()
-			    && !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)
-			    && !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly))
+			    && !lyxaction.funcHasFlag(action, LyXAction::NoBuffer)
+			    && !lyxaction.funcHasFlag(action, LyXAction::ReadOnly))
 				view()->buffer()->markDirty();
 
 			if (view()->cursor().inTexted()) {
@@ -1738,26 +1783,18 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			}
 		}
 	}
-	if (!quitting)
-		// FIXME UNICODE: _() does not support anything but ascii.
-		// Do we need a to_ascii() method?
+	if (!quitting) {
+		lyx_view_->updateMenubar();
+		lyx_view_->updateToolbars();
 		sendDispatchMessage(getMessage(), cmd);
+	}
 }
 
 
 void LyXFunc::sendDispatchMessage(docstring const & msg, FuncRequest const & cmd)
 {
-	/* When an action did not originate from the UI/kbd, it makes
-	 * sense to avoid updating the GUI. It turns out that this
-	 * fixes bug 1941, for reasons that are described here:
-	 * http://bugzilla.lyx.org/show_bug.cgi?id=1941#c4
-	 */
-	if (cmd.origin != FuncRequest::INTERNAL) {
-		lyx_view_->updateMenubar();
-		lyx_view_->updateToolbars();
-	}
-
-	const bool verbose = (cmd.origin == FuncRequest::UI
+	const bool verbose = (cmd.origin == FuncRequest::MENU
+			      || cmd.origin == FuncRequest::TOOLBAR
 			      || cmd.origin == FuncRequest::COMMANDBUFFER);
 
 	if (cmd.action == LFUN_SELF_INSERT || !verbose) {
@@ -1771,27 +1808,27 @@ void LyXFunc::sendDispatchMessage(docstring const & msg, FuncRequest const & cmd
 	if (!dispatch_msg.empty())
 		dispatch_msg += ' ';
 
-	string comname = lyxaction.getActionName(cmd.action);
+	docstring comname = from_utf8(lyxaction.getActionName(cmd.action));
 
 	bool argsadded = false;
 
 	if (!cmd.argument().empty()) {
 		if (cmd.action != LFUN_UNKNOWN_ACTION) {
-			comname += ' ' + to_utf8(cmd.argument());
+			comname += ' ' + cmd.argument();
 			argsadded = true;
 		}
 	}
 
-	string const shortcuts = theTopLevelKeymap().printbindings(cmd);
+	docstring const shortcuts = theTopLevelKeymap().printbindings(cmd);
 
 	if (!shortcuts.empty())
 		comname += ": " + shortcuts;
 	else if (!argsadded && !cmd.argument().empty())
-		comname += ' ' + to_utf8(cmd.argument());
+		comname += ' ' + cmd.argument();
 
 	if (!comname.empty()) {
 		comname = rtrim(comname);
-		dispatch_msg += from_utf8('(' + rtrim(comname) + ')');
+		dispatch_msg += '(' + rtrim(comname) + ')';
 	}
 
 	lyxerr[Debug::ACTION] << "verbose dispatch msg "
@@ -1803,13 +1840,14 @@ void LyXFunc::sendDispatchMessage(docstring const & msg, FuncRequest const & cmd
 
 void LyXFunc::menuNew(string const & name, bool fromTemplate)
 {
+	// FIXME: initpath is not used. What to do?
 	string initpath = lyxrc.document_path;
 	string filename(name);
 
 	if (view()->buffer()) {
 		string const trypath = lyx_view_->buffer()->filePath();
 		// If directory is writeable, use this as default.
-		if (isDirWriteable(trypath))
+		if (isDirWriteable(FileName(trypath)))
 			initpath = trypath;
 	}
 
@@ -1818,7 +1856,8 @@ void LyXFunc::menuNew(string const & name, bool fromTemplate)
 	if (filename.empty()) {
 		filename = addName(lyxrc.document_path,
 			    "newfile" + convert<string>(++newfile_number) + ".lyx");
-		while (theBufferList().exists(filename) || fs::is_readable(filename)) {
+		while (theBufferList().exists(filename) ||
+		       fs::is_readable(FileName(filename).toFilesystemEncoding())) {
 			++newfile_number;
 			filename = addName(lyxrc.document_path,
 					   "newfile" +	convert<string>(newfile_number) +
@@ -1859,7 +1898,7 @@ void LyXFunc::open(string const & fname)
 	if (view()->buffer()) {
 		string const trypath = lyx_view_->buffer()->filePath();
 		// If directory is writeable, use this as default.
-		if (isDirWriteable(trypath))
+		if (isDirWriteable(FileName(trypath)))
 			initpath = trypath;
 	}
 
@@ -1891,15 +1930,12 @@ void LyXFunc::open(string const & fname)
 
 	// get absolute path of file and add ".lyx" to the filename if
 	// necessary
-	string const fullpath = fileSearch(string(), filename, "lyx");
-	if (!fullpath.empty()) {
-		filename = fullpath;
-	}
-
-	docstring const disp_fn = makeDisplayPath(filename);
+	FileName const fullname = fileSearch(string(), filename, "lyx");
+	if (!fullname.empty())
+		filename = fullname.absFilename();
 
 	// if the file doesn't exist, let the user create one
-	if (!fs::exists(filename)) {
+	if (!fs::exists(fullname.toFilesystemEncoding())) {
 		// the user specifically chose this name. Believe him.
 		Buffer * const b = newFile(filename, string(), true);
 		if (b)
@@ -1907,10 +1943,11 @@ void LyXFunc::open(string const & fname)
 		return;
 	}
 
+	docstring const disp_fn = makeDisplayPath(filename);
 	lyx_view_->message(bformat(_("Opening document %1$s..."), disp_fn));
 
 	docstring str2;
-	if (lyx_view_->loadLyXFile(filename)) {
+	if (lyx_view_->loadLyXFile(fullname)) {
 		str2 = bformat(_("Document %1$s opened."), disp_fn);
 	} else {
 		str2 = bformat(_("Could not open document %1$s"), disp_fn);
@@ -1934,7 +1971,7 @@ void LyXFunc::doImport(string const & argument)
 		if (view()->buffer()) {
 			string const trypath = lyx_view_->buffer()->filePath();
 			// If directory is writeable, use this as default.
-			if (isDirWriteable(trypath))
+			if (isDirWriteable(FileName(trypath)))
 				initpath = trypath;
 		}
 
@@ -1972,13 +2009,13 @@ void LyXFunc::doImport(string const & argument)
 		return;
 
 	// get absolute path of file
-	filename = makeAbsPath(filename);
+	FileName const fullname(makeAbsPath(filename));
 
-	string const lyxfile = changeExtension(filename, ".lyx");
+	FileName const lyxfile(changeExtension(fullname.absFilename(), ".lyx"));
 
 	// Check if the document already is open
-	if (use_gui && theBufferList().exists(lyxfile)) {
-		if (!theBufferList().close(theBufferList().getBuffer(lyxfile), true)) {
+	if (use_gui && theBufferList().exists(lyxfile.absFilename())) {
+		if (!theBufferList().close(theBufferList().getBuffer(lyxfile.absFilename()), true)) {
 			lyx_view_->message(_("Canceled."));
 			return;
 		}
@@ -1986,8 +2023,8 @@ void LyXFunc::doImport(string const & argument)
 
 	// if the file exists already, and we didn't do
 	// -i lyx thefile.lyx, warn
-	if (fs::exists(lyxfile) && filename != lyxfile) {
-		docstring const file = makeDisplayPath(lyxfile, 30);
+	if (fs::exists(lyxfile.toFilesystemEncoding()) && fullname != lyxfile) {
+		docstring const file = makeDisplayPath(lyxfile.absFilename(), 30);
 
 		docstring text = bformat(_("The document %1$s already exists.\n\n"
 						     "Do you want to over-write that document?"), file);
@@ -2001,7 +2038,7 @@ void LyXFunc::doImport(string const & argument)
 	}
 
 	ErrorList errorList;
-	Importer::Import(lyx_view_, filename, format, errorList);
+	Importer::Import(lyx_view_, fullname, format, errorList);
 	// FIXME (Abdel 12/08/06): Is there a need to display the error list here?
 }
 
@@ -2009,8 +2046,11 @@ void LyXFunc::doImport(string const & argument)
 void LyXFunc::closeBuffer()
 {
 	// save current cursor position
-	LyX::ref().session().lastFilePos().save(lyx_view_->buffer()->fileName(),
+	LyX::ref().session().lastFilePos().save(FileName(lyx_view_->buffer()->fileName()),
 		boost::tie(view()->cursor().pit(), view()->cursor().pos()) );
+	// goto bookmark to update bookmark pit.
+	for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
+		gotoBookmark(i+1, false, false);
 	if (theBufferList().close(lyx_view_->buffer(), true) && !quitting) {
 		if (theBufferList().empty()) {
 			// need this otherwise SEGV may occur while
@@ -2024,6 +2064,13 @@ void LyXFunc::closeBuffer()
 }
 
 
+void LyXFunc::reloadBuffer()
+{
+	FileName filename(lyx_view_->buffer()->fileName());
+	closeBuffer();
+	lyx_view_->loadLyXFile(filename);
+}
+
 // Each "lyx_view_" should have it's own message method. lyxview and
 // the minibuffer would use the minibuffer, but lyxserver would
 // send an ERROR signal to its client.  Alejandro 970603
@@ -2043,19 +2090,19 @@ void LyXFunc::setMessage(docstring const & m) const
 }
 
 
-string const LyXFunc::viewStatusMessage()
+docstring const LyXFunc::viewStatusMessage()
 {
 	// When meta-fake key is pressed, show the key sequence so far + "M-".
 	if (wasMetaKey())
-		return keyseq->print() + "M-";
+		return keyseq->print(true) + "M-";
 
 	// Else, when a non-complete key sequence is pressed,
 	// show the available options.
 	if (keyseq->length() > 0 && !keyseq->deleted())
-		return keyseq->printOptions();
+		return keyseq->printOptions(true);
 
 	if (!view()->buffer())
-		return to_utf8(_("Welcome to LyX!"));
+		return _("Welcome to LyX!");
 
 	return view()->cursor().currentState();
 }
@@ -2087,8 +2134,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	switch (tag) {
 	case LyXRC::RC_ACCEPT_COMPOUND:
 	case LyXRC::RC_ALT_LANG:
-	case LyXRC::RC_ASCIIROFF_COMMAND:
-	case LyXRC::RC_ASCII_LINELEN:
+	case LyXRC::RC_PLAINTEXT_ROFF_COMMAND:
+	case LyXRC::RC_PLAINTEXT_LINELEN:
 	case LyXRC::RC_AUTOREGIONDELETE:
 	case LyXRC::RC_AUTORESET_OPTIONS:
 	case LyXRC::RC_AUTOSAVE:
@@ -2101,6 +2148,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_LOADSESSION:
 	case LyXRC::RC_CHKTEX_COMMAND:
 	case LyXRC::RC_CONVERTER:
+	case LyXRC::RC_CONVERTER_CACHE_MAXAGE:
 	case LyXRC::RC_COPIER:
 	case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR:
 	case LyXRC::RC_CUSTOM_EXPORT_COMMAND:
@@ -2112,10 +2160,10 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_DISPLAY_GRAPHICS:
 	case LyXRC::RC_DOCUMENTPATH:
 		if (lyxrc_orig.document_path != lyxrc_new.document_path) {
-			if (fs::exists(lyxrc_new.document_path) &&
-			    fs::is_directory(lyxrc_new.document_path)) {
+			string const encoded = FileName(
+				lyxrc_new.document_path).toFilesystemEncoding();
+			if (fs::exists(encoded) && fs::is_directory(encoded))
 				support::package().document_dir() = lyxrc.document_path;
-			}
 		}
 	case LyXRC::RC_ESC_CHARS:
 	case LyXRC::RC_FONT_ENCODING:
@@ -2197,6 +2245,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_USER_NAME:
 	case LyXRC::RC_USETEMPDIR:
 	case LyXRC::RC_USE_ALT_LANG:
+	case LyXRC::RC_USE_CONVERTER_CACHE:
 	case LyXRC::RC_USE_ESC_CHARS:
 	case LyXRC::RC_USE_INP_ENC:
 	case LyXRC::RC_USE_PERS_DICT: