Move environment-split from Edit to Insert, as requested.

This commit is contained in:
Juergen Spitzmueller 2017-12-30 17:54:09 +01:00
parent 612536305b
commit c8abe0cf7b
4 changed files with 132 additions and 15 deletions

View File

@ -140,11 +140,12 @@ enumitem
\papercolumns 1
\papersides 2
\paperpagestyle default
\tracking_changes false
\tracking_changes true
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict true
\author -712698321 "Jürgen Spitzmüller"
\end_header
\begin_body
@ -10526,21 +10527,48 @@ enumeration
\begin_layout Standard
To split an existing list into two lists, set the cursor at the end of a
list item and use the menu
\change_deleted -712698321 1514652028
\family sans
Edit\SpecialChar menuseparator
Edit
\change_inserted -712698321 1514652029
Insert
\change_unchanged
\SpecialChar menuseparator
\change_deleted -712698321 1514652035
Start New Environment
\change_inserted -712698321 1514652814
Separated <Name> Above
\family default
or
\family sans
Insert\SpecialChar menuseparator
Separated <Name> Below
\change_unchanged
\family default
.
This inserts a plain separator (red line in \SpecialChar LyX
) and behind it the new list.
The menu
) and
\change_inserted -712698321 1514652169
before or
\change_unchanged
behind it the new list.
\change_deleted -712698321 1514652256
The menu
\family sans
Edit\SpecialChar menuseparator
Start New Parent Environment
\family default
only appears if the item is nested.
It does not only separate the list but also creates a new one outside the
nesting.
nesting
\change_inserted -712698321 1514652300
Inside nested environments, it is also possible to split the outer environment
\change_unchanged
.
\end_layout
\begin_layout Standard
@ -37961,11 +37989,15 @@ reference "subsec:Numbering-depth"
\begin_layout Subsection
\change_deleted -712698321 1514652312
\family sans
Start New Environment/Start New Parent Environment
\end_layout
\begin_layout Standard
\change_deleted -712698321 1514652312
These menus are only visible if it is possible to have two consecutive environme
nts of the same type.
See section
@ -37980,6 +38012,8 @@ reference "subsec:Separate-Nestings"
\end_inset
for an explanation.
\change_unchanged
\end_layout
\begin_layout Section
@ -39525,6 +39559,37 @@ reference "sec:Marginal-Notes"
\end_inset
.
\change_inserted -712698321 1514652349
\end_layout
\begin_layout Subsection
\change_inserted -712698321 1514652384
\family sans
Separate <Name> Environment (Above/Below)
\end_layout
\begin_layout Standard
\change_inserted -712698321 1514652391
These menu items are only visible if it is possible to have two consecutive
environments of the same type.
See section
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:Separate-Nestings"
\end_inset
for an explanation.
\change_unchanged
\end_layout
\begin_layout Subsection

View File

@ -72,11 +72,12 @@
\papercolumns 1
\papersides 1
\paperpagestyle default
\tracking_changes false
\tracking_changes true
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict false
\author -712698321 "Jürgen Spitzmüller"
\end_header
\begin_body
@ -896,6 +897,11 @@ arg "depth-increment"
\end_inset
)
\change_inserted -712698321 1514652486
.
This is done automatically if you insert new frame paragraphs.
\change_unchanged
\end_layout
\begin_layout Itemize
@ -976,8 +982,20 @@ There is a simple and much more convenient way to start a new frame: Issue
status collapsed
\begin_layout Plain Layout
Edit\SpecialChar menuseparator
\change_deleted -712698321 1514652514
Edit
\change_inserted -712698321 1514652516
Insert
\change_unchanged
\SpecialChar menuseparator
\change_deleted -712698321 1514652520
Start New Environment
\change_inserted -712698321 1514652821
Separated Frame Below
\change_unchanged
\end_layout
\end_inset
@ -988,7 +1006,11 @@ type "shortcut"
arg "environment-split"
\end_inset
) if you are in a non-nested
\change_deleted -712698321 1514652564
)
\change_unchanged
if you are in a non-nested
\begin_inset Flex Structure
status collapsed
@ -999,6 +1021,8 @@ Frame
\end_inset
paragraph, or
\change_deleted -712698321 1514652572
\begin_inset Flex Alert
status collapsed
@ -1010,12 +1034,38 @@ Start New Parent Environment
\end_inset
(
\change_unchanged
\begin_inset Info
type "shortcut"
arg "environment-split outer"
\end_inset
), respectively, if you are in a nested paragraph within the frame!
\change_deleted -712698321 1514652575
)
\change_unchanged
, respectively, if you are in a nested paragraph within the frame
\change_inserted -712698321 1514652721
).
If you are in the frame heading,
\begin_inset Flex Alert
status collapsed
\begin_layout Plain Layout
\change_inserted -712698321 1514652823
Insert\SpecialChar menuseparator
Separated Frame Above
\change_unchanged
\end_layout
\end_inset
inserts a new, properly separated frame above the current one
\change_unchanged
!
\end_layout
\end_deeper

View File

@ -134,7 +134,6 @@ Menuset
# obvious what the context is for the others)
OptItem "Increase List Depth|I" "depth-increment"
OptItem "Decrease List Depth|D" "depth-decrement"
EnvironmentSeparators
OptItem "Dissolve Inset" "inset-dissolve"
OptItem "TeX Code Settings...|C" "inset-settings ert"
# 'a' shortcut to match Insert entry, shouldn't clash with Table Settings
@ -393,6 +392,7 @@ Menuset
Item "Hyperlink...|k" "href-insert"
Item "Footnote|F" "footnote-insert"
Item "Marginal Note|M" "marginalnote-insert"
EnvironmentSeparators
Arguments
Item "TeX Code" "ert-insert"
Item "Program Listing[[Menu]]" "listing-insert"

View File

@ -1881,13 +1881,13 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv)
break;
}
if (par.layout().isEnvironment()) {
docstring label = bformat(_("Prepend New Environment (%1$s)"),
docstring label = bformat(_("Separated %1$s Above"),
translateIfPossible(curlayout));
add(MenuItem(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_ENVIRONMENT_SPLIT,
from_ascii("before"))));
if (!par.layout().keepempty || pos > 0 || !text->isFirstInSequence(pit)) {
label = bformat(_("Append New Environment (%1$s)"),
label = bformat(_("Separated %1$s Below"),
translateIfPossible(curlayout));
add(MenuItem(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_ENVIRONMENT_SPLIT)));
@ -1895,15 +1895,17 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv)
}
else if (!prevlayout.empty()) {
docstring const label =
bformat(_("Append New Environment (%1$s)"),
bformat(_("Separated %1$s Below"),
translateIfPossible(prevlayout));
add(MenuItem(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_ENVIRONMENT_SPLIT,
from_ascii("previous"))));
}
if (!outerlayout.empty()) {
docstring const label =
bformat(_("Append New Parent Environment (%1$s)"),
docstring const label = (outerlayout == curlayout) ?
bformat(_("Separated Outer %1$s Below"),
translateIfPossible(outerlayout)) :
bformat(_("Separated %1$s Below"),
translateIfPossible(outerlayout));
add(MenuItem(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_ENVIRONMENT_SPLIT,