anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 22:17:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Track changes in InsetCommands

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-12-31 15:46:03 +01:00
parent 11c47ddfcf
commit 79674c7632
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/insets/InsetCommand.cpp
View File

@ -22,6 +22,7 @@
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "Lexer.h"
#include "LyX.h"
#include "MetricsInfo.h"
#include "texstream.h"
@ -186,13 +187,33 @@ void InsetCommand::validate(LaTeXFeatures & features) const
}
void InsetCommand::changeCmdName(string const & new_name)
{
string const old_name = getCmdName();
if (old_name == new_name)
return;
if (buffer().masterParams().track_changes) {
// With change tracking, we insert a new inset and
// delete the old one
InsetCommandParams p(p_.code());
p = p_;
p.setCmdName(new_name);
string const data = InsetCommand::params2string(p);
lyx::dispatch(FuncRequest(LFUN_INSET_INSERT, data));
lyx::dispatch(FuncRequest(LFUN_CHAR_DELETE_FORWARD));
} else
p_.setCmdName(new_name);
}
void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
{
switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
if (cmd.getArg(0) == "changetype") {
cur.recordUndo();
p_.setCmdName(cmd.getArg(1));
changeCmdName(cmd.getArg(1));
cur.forceBufferUpdate();
initView();
break;
@ -203,7 +224,14 @@ void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
cur.noScreenUpdate();
else {
cur.recordUndo();
setParams(p);
if (buffer().masterParams().track_changes) {
// With change tracking, we insert a new inset and
// delete the old one
string const data = InsetCommand::params2string(p);
lyx::dispatch(FuncRequest(LFUN_INSET_INSERT, data));
lyx::dispatch(FuncRequest(LFUN_CHAR_DELETE_FORWARD));
} else
setParams(p);
}
// FIXME We might also want to check here if this one is in the TOC.
// But I think most of those are labeled.

2
src/insets/InsetCommand.h
View File

@ -118,6 +118,8 @@ protected:
/// What matters here is the parameter name, not position.
/// \see InsetCommandParams::setCmdName
void setCmdName(std::string const & n) { p_.setCmdName(n); }
///
void changeCmdName(std::string const & new_name);
//@}
private: