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

LFUN_ENVIRONMENT_SPLIT: simplification

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-12-24 11:22:23 +01:00
parent a0cb4eafe3
commit 7c9254b723
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Text3.cpp
View File

@ -1391,21 +1391,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_ENVIRONMENT_SPLIT: {
Paragraph const & para = cur.paragraph();
docstring const layout = para.layout().name();
if (cur.pos() > 0) {
FuncRequest cmd(LFUN_PARAGRAPH_BREAK);
lyx::dispatch(cmd);
}
if (cur.pos() > 0)
lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK));
bool const morecont = cur.lastpos() > cur.pos();
FuncRequest cmd2(LFUN_LAYOUT, "Separator");
lyx::dispatch(cmd2);
FuncRequest cmd3(LFUN_PARAGRAPH_BREAK, "inverse");
lyx::dispatch(cmd3);
if (morecont) {
FuncRequest cmd4(LFUN_DOWN);
lyx::dispatch(cmd4);
}
FuncRequest cmd5(LFUN_LAYOUT, layout);
lyx::dispatch(cmd5);
lyx::dispatch(FuncRequest(LFUN_LAYOUT, "Separator"));
lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK, "inverse"));
if (morecont)
lyx::dispatch(FuncRequest(LFUN_DOWN));
lyx::dispatch(FuncRequest(LFUN_LAYOUT, layout));
break;
}
@ -2887,12 +2880,12 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
break;
case LFUN_ENVIRONMENT_SPLIT: {
if (!cur.buffer()->params().documentClass().hasLayout(from_ascii("Separator"))
|| !cur.paragraph().layout().isEnvironment()) {
enable = false;
if (cur.paragraph().layout().isEnvironment()
&& cur.buffer()->params().documentClass().hasLayout(from_ascii("Separator"))) {
enable = true;
break;
}
enable = true;
enable = false;
break;
}