Compare commits

..

No commits in common. "70ab623c6ebf4ce54b6f1272747449ddd20952d1" and "6c20e5db7db662239e8c2bd47fe28d18b27bd729" have entirely different histories.

2 changed files with 25 additions and 11 deletions

View File

@ -25,11 +25,6 @@ and generates a PHP web page.
Invocation:
postats.py lyx_version po_files > "pathToWebPages"/i18n.inc
or simply
make i18n.inc
to create stats only for allowed langauages in LINGUAS file
(typically good for stable branch stats).
"""
from __future__ import print_function

View File

@ -1450,6 +1450,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
&& lyxaction.funcHasFlag(cmd.action(), LyXAction::NoInternal))
return;
// We'll set this back to false if need be.
bool dispatched = true;
buffer_.undo().beginUndoGroup();
FuncCode const act = cmd.action();
@ -1636,7 +1638,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
InsetMathRef * minset =
getInsetByCode<InsetMathRef>(cur, MATH_REF_CODE);
if (minset)
lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO, minset->getTarget()));
lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO,
minset->getTarget()));
}
break;
}
@ -1895,8 +1898,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
FindAndReplaceOptions opt;
istringstream iss(to_utf8(cmd.argument()));
iss >> opt;
if (findAdv(this, opt))
if (findAdv(this, opt)) {
dr.screenUpdate(Update::Force | Update::FitCursor);
cur.dispatched();
dispatched = true;
} else {
cur.undispatched();
dispatched = false;
}
break;
}
@ -2190,8 +2199,10 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
how = SCROLL_TOGGLE;
else if (where == "visible")
how = SCROLL_VISIBLE;
else
else {
dispatched = false;
break;
}
showCursor(how);
break;
}
@ -2201,8 +2212,10 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
scroll_step = d->scrollbarParameters_.single_step;
else if (scroll_type == "page")
scroll_step = d->scrollbarParameters_.page_step;
else
else {
dispatched = false;
break;
}
string const scroll_quantity = cmd.getArg(1);
@ -2212,8 +2225,10 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
scroll(scroll_step);
else if (isStrInt(scroll_quantity))
scroll(scroll_step * convert<int>(scroll_quantity));
else
else {
dispatched = false;
break;
}
dr.screenUpdate(Update::ForceDraw);
dr.forceBufferUpdate();
@ -2463,13 +2478,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
if (!opt1.empty())
LYXERR0("Discarding optional argument to citation-insert.");
}
dispatched = true;
break;
}
InsetCommandParams icp(CITE_CODE);
icp["key"] = from_utf8(arg);
if (!opt1.empty())
icp["before"] = from_utf8(opt1);
icp["literal"] =
icp["literal"] =
from_ascii(InsetCitation::last_literal ? "true" : "false");
string icstr = InsetCommand::params2string(icp);
FuncRequest fr(LFUN_INSET_INSERT, icstr);
@ -2555,6 +2571,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
if (cur.inTexted() && cur.selection()
&& cur.selectionBegin().idx() != cur.selectionEnd().idx()) {
buffer_.dispatch(cmd, dr);
dispatched = dr.dispatched();
break;
}
cap::copySelection(cur);
@ -2564,10 +2581,12 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
default:
// OK, so try the Buffer itself...
buffer_.dispatch(cmd, dr);
dispatched = dr.dispatched();
break;
}
buffer_.undo().endUndoGroup();
dr.dispatched(dispatched);
// NOTE: The code below is copied from Cursor::dispatch. If you
// need to modify this, please update the other one too.