iucr.layout: use Item_Environment for a style as proposed by Jürgen

[lyx.git] / lib / ui / stdcontext.inc

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index c97e098381a71e0423205e7acae91f79389f1a21..630892ce6bd18850f09468f66f384410766e3b3a 100644 (file)
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -19,7 +19,7 @@
 #   (except when the preposition is part of a verb phrase, such as "Check In")
 # (http://library.gnome.org/devel/hig-book/stable/design-text-labels.html.en)
 
-Format 1
+Format 2
 
 Menuset
 
@@ -56,7 +56,7 @@ Menuset
                OptItem "Number Whole Formula|N" "math-number-toggle"
                OptItem "Number This Line|u" "math-number-line-toggle"
                OptItem "Equation Label|L" "label-insert"
-               OptItem "Copy as Reference|R" "copy-label-as-reference"
+               OptItem "Copy as Reference|R" "label-copy-as-reference"
                Separator
                Item "Split Cell|C" "cell-split"
                Separator
@@ -105,7 +105,7 @@ Menuset
                Item "Next Cross-Reference|N" "reference-next"
                Item "Go Back|G" "bookmark-goto 0"
                Separator
-               Item "Copy as Reference|C" "copy-label-as-reference"
+               Item "Copy as Reference|C" "label-copy-as-reference"
                Separator
                Item "Settings...|S" "inset-settings"
        End
@@ -162,6 +162,7 @@ Menuset
                SwitchArguments
        End
 
+
 #
 # InsetBox context menu
 #
@@ -177,6 +178,15 @@ Menuset
                Item "Double Frame|u" "inset-modify changetype Doublebox"
        End
 
+
+#
+# InsetCaption context menu
+#
+       Menu "context-caption"
+               SwitchCaptions
+       End
+
+
 #
 # InsetNote context menu
 #
@@ -221,7 +231,7 @@ Menuset
                Item "Horizontal Fill (Right Arrow)|g" "inset-modify space \rightarrowfill{}"
                Item "Horizontal Fill (Up Brace)|p" "inset-modify space \upbracefill{}"
                Item "Horizontal Fill (Down Brace)|B" "inset-modify space \downbracefill{}"
-               Item "Custom Length|C" "command-sequence inset-modify space \hspace{} \length 1in; inset-settings"
+               Item "Custom Length|C" "command-sequence inset-modify space \hspace{}; inset-settings"
                Separator
                Item "Settings...|S" "inset-settings"
        End
@@ -253,7 +263,7 @@ Menuset
                Item "MedSkip|M" "inset-modify vspace medskip"
                Item "BigSkip|B" "inset-modify vspace bigskip"
                Item "VFill|F" "inset-modify vspace vfill"
-               Item "Custom|C" "command-sequence inset-modify vspace 1in; inset-settings"
+               Item "Custom|C" "command-sequence inset-modify vspace custom; inset-settings"
                Separator
                Item "Settings...|e" "inset-settings"
        End
@@ -291,6 +301,14 @@ Menuset
                Item "Justified Line Break|J" "inset-modify newline linebreak"
        End
 
+#
+# InsetNewline context menu
+#
+       Menu "context-separator"
+               Item "Plain Separator|P" "inset-modify separator plain"
+               Item "Paragraph Break|B" "inset-modify separator parbreak"
+       End
+
 #
 # Edit context menu
 #
@@ -308,11 +326,13 @@ Menuset
                Item "Move Paragraph Up|o" "paragraph-move-up"
                Item "Move Paragraph Down|v" "paragraph-move-down"
                Separator
+               EnvironmentSeparators
+               Separator
                OptItem "Promote Section|r" "outline-out"
                OptItem "Demote Section|m" "outline-in"
                OptItem "Move Section Down|D" "outline-down"
                OptItem "Move Section Up|U" "outline-up"
-               OptItem "Insert Short Title|T" "argument-insert"
+               Arguments
                OptSubmenu "Insert Regular Expression" "context-edit-regexp"
                Separator
                OptItem "Accept Change|c" "change-accept"
@@ -406,14 +426,16 @@ Menuset
                Item "Append Row|A" "inset-modify tabular append-row"
                Item "Delete Row|D" "inset-modify tabular delete-row"
                Item "Copy Row|o" "inset-modify tabular copy-row"
-               # Item "Swap Rows|S" "inset-modify tabular swap-row" # currently broken
+               Item "Move Row Up" "inset-modify tabular move-row-up"
+               Item "Move Row Down" "inset-modify tabular move-row-down"
                Separator
                Item "Append Column|p" "inset-modify tabular append-column"
                Item "Delete Column|e" "inset-modify tabular delete-column"
                Item "Copy Column|y" "inset-modify tabular copy-column"
-               # Item "Swap Columns|w" "inset-modify tabular swap-column" # currently broken
+               Item "Move Column Right|v" "inset-modify tabular move-column-right"
+               Item "Move Column Left" "inset-modify tabular move-column-left"
                Separator
-               Item "Settings...|g" "inset-settings tabular"
+               Item "Settings...|S" "inset-settings tabular"
        End
 
 #
@@ -458,7 +480,7 @@ Menuset
 #
 
        Menu "context-toc-label"
-               OptItem "Copy as Reference|C" "copy-label-as-reference"
+               OptItem "Copy as Reference|C" "label-copy-as-reference"
                OptItem "Insert Reference at Cursor Position|I" "label-insert-as-reference"
                Separator
                Item "Settings...|S" "inset-settings"