anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow for auto-inserting multiple arguments

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-06-02 09:26:32 +02:00
parent 532765c03a
commit 378c7e8edb
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Text3.cpp
View File

@ -1595,11 +1595,20 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
} }
DocumentClass const & tclass = bv->buffer().params().documentClass(); DocumentClass const & tclass = bv->buffer().params().documentClass();
bool inautoarg = false;
for (auto const & la_pair : tclass[layout].args()) { for (auto const & la_pair : tclass[layout].args()) {
Layout::latexarg const & arg = la_pair.second; Layout::latexarg const & arg = la_pair.second;
if (arg.autoinsert) { if (arg.autoinsert) {
// If we had already inserted an arg automatically,
// leave this now in order to insert the next one.
if (inautoarg) {
cur.leaveInset(cur.inset());
cur.posForward();
inautoarg = false;
}
FuncRequest const cmd2(LFUN_ARGUMENT_INSERT, la_pair.first); FuncRequest const cmd2(LFUN_ARGUMENT_INSERT, la_pair.first);
lyx::dispatch(cmd2); lyx::dispatch(cmd2);
inautoarg = true;
} }
} }
@ -2063,7 +2072,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
bool const sel = cur.selection(); bool const sel = cur.selection();
doInsertInset(cur, this, cmd, true, true); doInsertInset(cur, this, cmd, true, true);
// Insert auto-insert arguments // Insert auto-insert arguments
bool autoargs = false; bool autoargs, inautoarg = false;
Layout::LaTeXArgMap args = cur.inset().getLayout().args(); Layout::LaTeXArgMap args = cur.inset().getLayout().args();
Layout::LaTeXArgMap::const_iterator lait = args.begin(); Layout::LaTeXArgMap::const_iterator lait = args.begin();
Layout::LaTeXArgMap::const_iterator const laend = args.end(); Layout::LaTeXArgMap::const_iterator const laend = args.end();
@ -2072,9 +2081,17 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
if (arg.autoinsert) { if (arg.autoinsert) {
// The cursor might have been invalidated by the replaceSelection. // The cursor might have been invalidated by the replaceSelection.
cur.buffer()->changed(true); cur.buffer()->changed(true);
// If we had already inserted an arg automatically,
// leave this now in order to insert the next one.
if (inautoarg) {
cur.leaveInset(cur.inset());
cur.posForward();
inautoarg = false;
}
FuncRequest cmd2(LFUN_ARGUMENT_INSERT, (*lait).first); FuncRequest cmd2(LFUN_ARGUMENT_INSERT, (*lait).first);
lyx::dispatch(cmd2); lyx::dispatch(cmd2);
autoargs = true; autoargs = true;
inautoarg = true;
} }
} }
if (!autoargs) { if (!autoargs) {