#include "insets/InsetInclude.h"
#include "insets/InsetListings.h"
#include "insets/InsetNote.h"
+#include "insets/InsetPhantom.h"
#include "insets/InsetSpace.h"
#include "insets/InsetTabular.h"
#include "insets/InsetVSpace.h"
if (!theBufferList().exists(bm.filename))
return;
+ // bm can be changed when saving
+ BookmarksSection::Bookmark tmp = bm;
+
+ // Special case idx == 0 used for back-from-back jump navigation
+ if (idx == 0)
+ dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0"));
+
// if the current buffer is not that one, switch to it.
- if (lyx_view_->buffer()->fileName() != bm.filename) {
+ if (lyx_view_->buffer()->fileName() != tmp.filename) {
if (!switchToBuffer)
return;
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
}
+
// moveToPosition try paragraph id first and then paragraph (pit, pos).
- if (!view()->moveToPosition(bm.bottom_pit, bm.bottom_pos,
- bm.top_id, bm.top_pos))
+ if (!view()->moveToPosition(tmp.bottom_pit, tmp.bottom_pos,
+ tmp.top_id, tmp.top_pos))
+ return;
+
+ // bm changed
+ if (idx == 0)
return;
// Cursor jump succeeded!
break;
}
+ case LFUN_VC_COMMAND: {
+ if (cmd.argument().empty())
+ enable = false;
+
+ if (!buf && contains(cmd.getArg(0), 'D'))
+ enable = false;
+ break;
+ }
+
case LFUN_WORD_FIND_FORWARD:
case LFUN_WORD_FIND_BACKWARD:
case LFUN_WORD_FINDADV:
int const ret = Alert::prompt(title, text, 0, 1, _("&Save"), _("&Cancel"));
if (ret == 0)
- dispatch(FuncRequest(LFUN_BUFFER_WRITE));
+ lyx_view_->dispatch(FuncRequest(LFUN_BUFFER_WRITE));
return buf.isClean() && !buf.isUnnamed();
}
InsetCommandParams p(code);
data = InsetCommand::params2string(name, p);
break;
- }
+ }
case INCLUDE_CODE: {
// data is the include type: one of "include",
// "input", "verbatiminput" or "verbatiminput*"
InsetCommandParams p(INCLUDE_CODE, data);
data = InsetCommand::params2string("include", p);
break;
- }
+ }
case BOX_CODE: {
// \c data == "Boxed" || "Frameless" etc
InsetBoxParams p(data);
data = InsetBox::params2string(p);
break;
- }
+ }
case BRANCH_CODE: {
InsetBranchParams p;
data = InsetBranch::params2string(p);
break;
- }
+ }
case CITE_CODE: {
InsetCommandParams p(CITE_CODE);
data = InsetCommand::params2string(name, p);
break;
- }
+ }
case ERT_CODE: {
data = InsetERT::params2string(InsetCollapsable::Open);
break;
- }
+ }
case EXTERNAL_CODE: {
InsetExternalParams p;
data = InsetExternal::params2string(p, *buffer);
break;
- }
+ }
case FLOAT_CODE: {
InsetFloatParams p;
data = InsetFloat::params2string(p);
break;
- }
+ }
case LISTINGS_CODE: {
InsetListingsParams p;
data = InsetListings::params2string(p);
break;
- }
+ }
case GRAPHICS_CODE: {
InsetGraphicsParams p;
data = InsetGraphics::params2string(p, *buffer);
break;
- }
+ }
case NOTE_CODE: {
InsetNoteParams p;
data = InsetNote::params2string(p);
break;
- }
+ }
+ case PHANTOM_CODE: {
+ InsetPhantomParams p;
+ data = InsetPhantom::params2string(p);
+ break;
+ }
case SPACE_CODE: {
InsetSpaceParams p;
data = InsetSpace::params2string(p);
break;
- }
+ }
case VSPACE_CODE: {
VSpace space;
data = InsetVSpace::params2string(space);
break;
- }
+ }
case WRAP_CODE: {
InsetWrapParams p;
data = InsetWrap::params2string(p);
theSession().bookmarks().clear();
break;
+ case LFUN_VC_COMMAND: {
+ string flag = cmd.getArg(0);
+ if (buffer && contains(flag, 'R') && !ensureBufferClean(view()))
+ break;
+ docstring message;
+ if (contains(flag, 'M'))
+ if (!Alert::askForText(message, _("LyX VC: Log Message")))
+ break;
+
+ string path = cmd.getArg(1);
+ if (contains(path, "$$p") && buffer)
+ path = subst(path, "$$p", buffer->filePath());
+ LYXERR(Debug::LYXVC, "Directory: " << path);
+ FileName pp(path);
+ if (!pp.isReadableDirectory()) {
+ lyxerr << _("Directory is not accessible.") << endl;
+ break;
+ }
+ support::PathChanger p(pp);
+
+ string command = cmd.getArg(2);
+ if (command.empty())
+ break;
+ if (buffer) {
+ command = subst(command, "$$i", buffer->absFileName());
+ command = subst(command, "$$p", buffer->filePath());
+ }
+ command = subst(command, "$$m", to_utf8(message));
+ LYXERR(Debug::LYXVC, "Command: " << command);
+ Systemcall one;
+ one.startscript(Systemcall::Wait, command);
+
+ if (!buffer)
+ break;
+ if (contains(flag, 'I'))
+ buffer->markDirty();
+ if (contains(flag, 'R'))
+ reloadBuffer();
+
+ break;
+ }
+
default:
LASSERT(theApp(), /**/);
// Let the frontend dispatch its own actions.
case LyXRC::RC_ALT_LANG:
case LyXRC::RC_PLAINTEXT_LINELEN:
case LyXRC::RC_PLAINTEXT_ROFF_COMMAND:
+ case LyXRC::RC_AUTOCORRECTION_MATH:
case LyXRC::RC_AUTOREGIONDELETE:
case LyXRC::RC_AUTORESET_OPTIONS:
case LyXRC::RC_AUTOSAVE: