commit 8ad7b0caead9f58b5ab40626af144adb3d059f01
Author: Juergen Spitzmueller <[email protected]>
Date: Mon Jan 1 12:31:31 2018 +0100
Add ignoresep option to layout lfun
This does not force the cursor in a separator paragraph to endpos.
This is needed for environment-split.
---
src/LyXAction.cpp | 5 +++--
src/Text3.cpp | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 9526028..e0d4e47 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -3049,10 +3049,11 @@ void LyXAction::init()
* \var lyx::FuncCode lyx::LFUN_PARAGRAPH_BREAK
* \li Action: Breaks the current paragraph at the current location.
* \li Notion: Removes the selection.
- * \li Syntax: paragraph-break [<LAYOUT>]
+ * \li Syntax: paragraph-break [<LAYOUT>] [ignoresep]
* \li Params: <LAYOUT>: "inverse" - decreases depth by one (or change layout
to default layout) when the cursor is at the end of
- the line.
+ the line.\n
+ ignoresep: Do not account for paragraph separators while
breaking.
* \endvar
*/
{ LFUN_PARAGRAPH_BREAK, "paragraph-break", Noop, Edit },
diff --git a/src/Text3.cpp b/src/Text3.cpp
index 999b960..af24400 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1129,9 +1129,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
Font const f(inherit_font, cur.current_font.language());
pars_[cur.pit() - 1].resetFonts(f);
} else {
- if (par.isEnvSeparator(cur.pos()))
+ if (par.isEnvSeparator(cur.pos()) && cmd.getArg(1) !=
"ignoresep")
cur.posForward();
- breakParagraph(cur, cmd.argument() == "inverse");
+ breakParagraph(cur, cmd.getArg(0) == "inverse");
}
cur.resetAnchor();
// If we have a list and autoinsert item insets,
