From 647b4efb1eee97922421f60018c65829f601571e Mon Sep 17 00:00:00 2001
From: Guillaume Munch <gm@lyx.org>
Date: Wed, 27 Jan 2016 18:22:32 +0100
Subject: [PATCH] New LFUN tabular-feature: update bind and ui files

A simple run of development/tools/updatelfuns.sh
---
 lib/bind/aqua.bind      | 52 +++++++++++++-------------
 lib/bind/broadway.bind  |  2 +-
 lib/bind/cua.bind       | 10 ++---
 lib/bind/cyrkeys.bind   |  2 +-
 lib/bind/de/menus.bind  |  2 +-
 lib/bind/emacs.bind     | 10 ++---
 lib/bind/greekkeys.bind |  2 +-
 lib/bind/hollywood.bind |  2 +-
 lib/bind/latinkeys.bind |  2 +-
 lib/bind/mac.bind       | 10 ++---
 lib/bind/math.bind      | 46 +++++++++++------------
 lib/bind/menus.bind     |  2 +-
 lib/bind/sciword.bind   | 10 ++---
 lib/bind/site.bind      |  2 +-
 lib/bind/xemacs.bind    | 10 ++---
 lib/ui/default.ui       |  2 +-
 lib/ui/stdcontext.inc   | 74 ++++++++++++++++++-------------------
 lib/ui/stdmenus.inc     | 82 ++++++++++++++++++++---------------------
 lib/ui/stdtoolbars.inc  | 62 +++++++++++++++----------------
 19 files changed, 192 insertions(+), 192 deletions(-)

diff --git a/lib/bind/aqua.bind b/lib/bind/aqua.bind
index 8ce7945b0c..2d1da6ccef 100644
--- a/lib/bind/aqua.bind
+++ b/lib/bind/aqua.bind
@@ -13,7 +13,7 @@
 # ~/.lyx/bind/aqua.bind
 #
 
-Format 3
+Format 4
 
 \bind "M-~S-i c"		"citation-insert"
 \bind "M-~S-i f"		"footnote-insert"
@@ -91,28 +91,28 @@ Format 3
 \bind "M-~S-e x l"		"primary-selection-paste"
 \bind "M-~S-e x p"		"primary-selection-paste paragraph"
 
-\bind "M-~S-e t m"		"inset-modify tabular multicolumn"
-\bind "M-~S-e t t"		"inset-modify tabular toggle-line-top"
-\bind "M-~S-e t b"		"inset-modify tabular toggle-line-bottom"
-\bind "M-~S-e t l"		"inset-modify tabular toggle-line-left"
-\bind "M-~S-e t r"		"inset-modify tabular toggle-line-right"
-\bind "M-~S-e t e"		"inset-modify tabular align-left"
-\bind "M-~S-e t c"		"inset-modify tabular align-center"
-\bind "M-~S-e t i"		"inset-modify tabular align-right"
-\bind "M-~S-e t o"		"inset-modify tabular valign-top"
-\bind "M-~S-e t n"		"inset-modify tabular valign-center"
-\bind "M-~S-e t v"		"inset-modify tabular valign-bottom"
-\bind "M-~S-e t a"		"inset-modify tabular append-row"
-\bind "M-~S-e t w"		"inset-modify tabular delete-row"
-\bind "M-~S-e t u"		"inset-modify tabular append-column"
-\bind "M-~S-e t d"		"inset-modify tabular delete-column"
+\bind "M-~S-e t m"		"tabular-feature multicolumn"
+\bind "M-~S-e t t"		"tabular-feature toggle-line-top"
+\bind "M-~S-e t b"		"tabular-feature toggle-line-bottom"
+\bind "M-~S-e t l"		"tabular-feature toggle-line-left"
+\bind "M-~S-e t r"		"tabular-feature toggle-line-right"
+\bind "M-~S-e t e"		"tabular-feature align-left"
+\bind "M-~S-e t c"		"tabular-feature align-center"
+\bind "M-~S-e t i"		"tabular-feature align-right"
+\bind "M-~S-e t o"		"tabular-feature valign-top"
+\bind "M-~S-e t n"		"tabular-feature valign-center"
+\bind "M-~S-e t v"		"tabular-feature valign-bottom"
+\bind "M-~S-e t a"		"tabular-feature append-row"
+\bind "M-~S-e t w"		"tabular-feature delete-row"
+\bind "M-~S-e t u"		"tabular-feature append-column"
+\bind "M-~S-e t d"		"tabular-feature delete-column"
 
 \bind "M-~S-e m n"		"math-number-toggle"
 \bind "M-~S-e m u"		"math-number-line-toggle"
-\bind "M-~S-e m r"		"inset-modify tabular append-row"
-\bind "M-~S-e m d"		"inset-modify tabular delete-row"
-\bind "M-~S-e m c"		"inset-modify tabular append-column"
-\bind "M-~S-e m e"		"inset-modify tabular delete-column"
+\bind "M-~S-e m r"		"tabular-feature append-row"
+\bind "M-~S-e m d"		"tabular-feature delete-row"
+\bind "M-~S-e m c"		"tabular-feature append-column"
+\bind "M-~S-e m e"		"tabular-feature delete-column"
 
 \bind "M-~S-e m l t"		"math-limits empty"
 \bind "M-~S-e m l d"		"math-limits limits"
@@ -124,12 +124,12 @@ Format 3
 \bind "M-~S-e m f a"		"math-mutate align"
 \bind "M-~S-e m f f"		"math-mutate flalign"
 
-\bind "M-~S-e m a l"		"inset-modify tabular align-left"
-\bind "M-~S-e m a c"		"inset-modify tabular align-center"
-\bind "M-~S-e m a r"		"inset-modify tabular align-right"
-\bind "M-~S-e m a t"		"inset-modify tabular valign-top"
-\bind "M-~S-e m a e"		"inset-modify tabular valign-center"
-\bind "M-~S-e m a b" 		"inset-modify tabular valign-bottom"
+\bind "M-~S-e m a l"		"tabular-feature align-left"
+\bind "M-~S-e m a c"		"tabular-feature align-center"
+\bind "M-~S-e m a r"		"tabular-feature align-right"
+\bind "M-~S-e m a t"		"tabular-feature valign-top"
+\bind "M-~S-e m a e"		"tabular-feature valign-center"
+\bind "M-~S-e m a b" 		"tabular-feature valign-bottom"
 
 \bind "M-~S-v l"		"latex-view-log"
 \bind "M-~S-v t"		"toc-view"
diff --git a/lib/bind/broadway.bind b/lib/bind/broadway.bind
index 13883240fe..2098249e16 100644
--- a/lib/bind/broadway.bind
+++ b/lib/bind/broadway.bind
@@ -10,7 +10,7 @@
 
 # Broadway Play
 
-Format 3
+Format 4
 
 \bind "M-z s"			"layout Speaker"
 \bind "M-z n"			"layout Narrative"
diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index ff92336aeb..04abe5cd12 100644
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -34,7 +34,7 @@
 
 ###
 
-Format 3
+Format 4
 
 \bind "C-n"			"buffer-new"
 \bind "C-S-N"			"buffer-new-template"
@@ -131,10 +131,10 @@ Format 3
 # Motion group
 #
 
-\bind "M-Up"			"command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up"
-\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down"
-\bind "M-Right"			"inset-modify tabular move-column-right"
-\bind "M-Left"			"inset-modify tabular move-column-left"
+\bind "M-Up"			"command-alternatives outline-up; paragraph-move-up; tabular-feature move-row-up"
+\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down"
+\bind "M-Right"			"tabular-feature move-column-right"
+\bind "M-Left"			"tabular-feature move-column-left"
 \bind "C-Right"			"word-right"
 \bind "C-Left"			"word-left"
 \bind "C-Up"			"paragraph-up"
diff --git a/lib/bind/cyrkeys.bind b/lib/bind/cyrkeys.bind
index 7ac0eaca00..b99199e51d 100644
--- a/lib/bind/cyrkeys.bind
+++ b/lib/bind/cyrkeys.bind
@@ -10,7 +10,7 @@
 
 # Cyrillic X11 key definitions
 
-Format 3
+Format 4
 
 \bind	"Cyrillic_GHE_bar"		"self-insert"
 \bind	"Cyrillic_ghe_bar"		"self-insert"
diff --git a/lib/bind/de/menus.bind b/lib/bind/de/menus.bind
index 590e85368b..bed5c5635a 100644
--- a/lib/bind/de/menus.bind
+++ b/lib/bind/de/menus.bind
@@ -38,7 +38,7 @@
 #
 # Menü Schriftgröße
 #
-Format 3
+Format 4
 
 \bind "M-s t"			"font-size tiny"
 \bind "M-s S-S"			"font-size footnotesize"
diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index 8c8421d997..6f58c9bcf9 100644
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -25,7 +25,7 @@
 #
 # Happy tuning!
 
-Format 3
+Format 4
 
 \bind "C-~S-at"			"mark-on"
 \bind "C-a"			"line-begin"
@@ -154,10 +154,10 @@ Format 3
 # Motion group
 #
 
-\bind "M-Up"			"command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up"
-\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down"
-\bind "M-Right"			"inset-modify tabular move-column-right"
-\bind "M-Left"			"inset-modify tabular move-column-left"
+\bind "M-Up"			"command-alternatives outline-up; paragraph-move-up; tabular-feature move-row-up"
+\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down"
+\bind "M-Right"			"tabular-feature move-column-right"
+\bind "M-Left"			"tabular-feature move-column-left"
 \bind "C-Right"			"word-right"
 \bind "C-Left"			"word-left"
 \bind "C-Up"			"paragraph-up"
diff --git a/lib/bind/greekkeys.bind b/lib/bind/greekkeys.bind
index eedd814249..9da54af512 100644
--- a/lib/bind/greekkeys.bind
+++ b/lib/bind/greekkeys.bind
@@ -9,7 +9,7 @@
 # Full author contact details are available in file CREDITS.
 # Greek X11 key definitions
 
-Format 3
+Format 4
 
 \bind	"Greek_ALPHAaccent"	"self-insert"
 \bind	"Greek_EPSILONaccent"	"self-insert"
diff --git a/lib/bind/hollywood.bind b/lib/bind/hollywood.bind
index d34c4bf098..e6e0e134f0 100644
--- a/lib/bind/hollywood.bind
+++ b/lib/bind/hollywood.bind
@@ -10,7 +10,7 @@
 
 # Hollywood script
 
-Format 3
+Format 4
 
 \bind "M-z s"			"layout Speaker"
 \bind "M-z n"			"layout Narrative"
diff --git a/lib/bind/latinkeys.bind b/lib/bind/latinkeys.bind
index f20e36b459..410b7058bc 100644
--- a/lib/bind/latinkeys.bind
+++ b/lib/bind/latinkeys.bind
@@ -12,7 +12,7 @@
 
 # KP_ keys. Should possibly be moved to another file
 
-Format 3
+Format 4
 
 \bind "KP_0"			"self-insert 0"
 \bind "KP_1"			"self-insert 1"
diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index 5354dd8d23..f38c8afd9c 100644
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -26,7 +26,7 @@
 
 ###
 
-Format 3
+Format 4
 
 # based on the table at http://support.apple.com/kb/HT1343
 # Note: these bindings assume the swapped Meta and Control modifiers standard of Qt
@@ -358,10 +358,10 @@ Format 3
 \bind "C-period"                     "specialchar-insert end-of-sentence"
 \bind "M-period"                     "specialchar-insert dots"
 \bind "Escape"                       "cancel"
-\bind "C-M-Up"                       "command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up"
-\bind "C-M-Down"                     "command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down"
-\bind "C-M-Right"                    "inset-modify tabular move-column-right"
-\bind "C-M-Left"                     "inset-modify tabular move-column-left"
+\bind "C-M-Up"                       "command-alternatives outline-up; paragraph-move-up; tabular-feature move-row-up"
+\bind "C-M-Down"                     "command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down"
+\bind "C-M-Right"                    "tabular-feature move-column-right"
+\bind "C-M-Left"                     "tabular-feature move-column-left"
 #\bind "F9"                          "meta-prefix"
 
 \bind "C-M-F"                        "ui-toggle fullscreen"
diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index 6d6c3907cd..783d5ca1e1 100644
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -32,7 +32,7 @@
 
 # These are defined for the math menu:
 
-Format 3
+Format 4
 
 \bind "M-m f"		"math-insert \frac"
 \bind "M-m s"		"math-insert \sqrt"
@@ -75,30 +75,30 @@ Format 3
 \bind "M-m t e"		"math-mutate eqnarray"
 \bind "M-m t m"		"math-mutate multline"
 
-\bind "M-m c i"		"inset-modify tabular append-column"
-\bind "M-m c d"		"inset-modify tabular delete-column"
-\bind "M-m c c"		"inset-modify tabular copy-column"
-\bind "M-m c s"		"inset-modify tabular swap-column"
-\bind "M-m c a"		"inset-modify tabular add-vline-left"
-\bind "M-m c e"		"inset-modify tabular delete-vline-left"
-\bind "M-m c z"		"inset-modify tabular add-vline-right"
-\bind "M-m c x"		"inset-modify tabular delete-vline-right"
+\bind "M-m c i"		"tabular-feature append-column"
+\bind "M-m c d"		"tabular-feature delete-column"
+\bind "M-m c c"		"tabular-feature copy-column"
+\bind "M-m c s"		"tabular-feature swap-column"
+\bind "M-m c a"		"tabular-feature add-vline-left"
+\bind "M-m c e"		"tabular-feature delete-vline-left"
+\bind "M-m c z"		"tabular-feature add-vline-right"
+\bind "M-m c x"		"tabular-feature delete-vline-right"
 
-\bind "M-m w i"		"inset-modify tabular append-row"
-\bind "M-m w d"		"inset-modify tabular delete-row"
-\bind "M-m w c"		"inset-modify tabular copy-row"
-\bind "M-m w s"		"inset-modify tabular swap-row"
-\bind "M-m w a"		"inset-modify tabular add-hline-above"
-\bind "M-m w e"		"inset-modify tabular delete-hline-above"
-\bind "M-m w z"		"inset-modify tabular add-hline-below"
-\bind "M-m w x"		"inset-modify tabular delete-hline-below"
+\bind "M-m w i"		"tabular-feature append-row"
+\bind "M-m w d"		"tabular-feature delete-row"
+\bind "M-m w c"		"tabular-feature copy-row"
+\bind "M-m w s"		"tabular-feature swap-row"
+\bind "M-m w a"		"tabular-feature add-hline-above"
+\bind "M-m w e"		"tabular-feature delete-hline-above"
+\bind "M-m w z"		"tabular-feature add-hline-below"
+\bind "M-m w x"		"tabular-feature delete-hline-below"
 
-\bind "M-m w t"		"inset-modify tabular valign-top"
-\bind "M-m w m"		"inset-modify tabular valign-middle"
-\bind "M-m w b"		"inset-modify tabular valign-bottom"
-\bind "M-m c l"		"inset-modify tabular align-left"
-\bind "M-m c m"		"inset-modify tabular align-center"
-\bind "M-m c r"		"inset-modify tabular align-right"
+\bind "M-m w t"		"tabular-feature valign-top"
+\bind "M-m w m"		"tabular-feature valign-middle"
+\bind "M-m w b"		"tabular-feature valign-bottom"
+\bind "M-m c l"		"tabular-feature align-left"
+\bind "M-m c m"		"tabular-feature align-center"
+\bind "M-m c r"		"tabular-feature align-right"
 
 # Decoration accents
 
diff --git a/lib/bind/menus.bind b/lib/bind/menus.bind
index 44fddb0865..4bf94e8d9f 100644
--- a/lib/bind/menus.bind
+++ b/lib/bind/menus.bind
@@ -18,7 +18,7 @@
 # Font size menu
 #
 
-Format 3
+Format 4
 
 \bind "M-s t"			"font-size tiny"
 \bind "M-s S-S"			"font-size footnotesize"
diff --git a/lib/bind/sciword.bind b/lib/bind/sciword.bind
index cf6a853082..ede33c90ee 100644
--- a/lib/bind/sciword.bind
+++ b/lib/bind/sciword.bind
@@ -13,7 +13,7 @@
 #\bind "C-b"                    "font-bold"
 
 # Copy, paste, etc.: more familiar keys
-Format 3
+Format 4
 
 \bind "C-c"	"copy"
 
@@ -232,10 +232,10 @@ Format 3
 \bind_file greekkeys.bind
 
 
-\bind "M-Up"			"command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up"
-\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down"
-\bind "M-Right"			"inset-modify tabular move-column-right"
-\bind "M-Left"			"inset-modify tabular move-column-left"
+\bind "M-Up"			"command-alternatives outline-up; paragraph-move-up; tabular-feature move-row-up"
+\bind "M-Down"			"command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down"
+\bind "M-Right"			"tabular-feature move-column-right"
+\bind "M-Left"			"tabular-feature move-column-left"
 \bind "S-KP_Right"  			"char-right-select"
 \bind "S-KP_Left"				"char-left-select"
 \bind "S-KP_Up" 				"up-select"
diff --git a/lib/bind/site.bind b/lib/bind/site.bind
index 927a2806ca..82a8de1a2d 100644
--- a/lib/bind/site.bind
+++ b/lib/bind/site.bind
@@ -20,7 +20,7 @@
 # with every new install of LyX and your changes will be lost.
 # 
 
-Format 3
+Format 4
 
 \bind "Right"      "char-right"
 \bind "Left"       "char-left"
diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind
index c8dfa98453..cb09ab8280 100644
--- a/lib/bind/xemacs.bind
+++ b/lib/bind/xemacs.bind
@@ -27,7 +27,7 @@
 #
 # Happy tuning!
 
-Format 3
+Format 4
 
 \bind "C-~S-at"			"mark-on"
 \bind "C-a"			"line-begin"
@@ -147,10 +147,10 @@ Format 3
 # Motion group
 #
 
-\bind "M-Up"                   "command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up"
-\bind "M-Down"                 "command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down"
-\bind "M-Right"                "inset-modify tabular move-column-right"
-\bind "M-Left"                 "inset-modify tabular move-column-left"
+\bind "M-Up"                   "command-alternatives outline-up; paragraph-move-up; tabular-feature move-row-up"
+\bind "M-Down"                 "command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down"
+\bind "M-Right"                "tabular-feature move-column-right"
+\bind "M-Left"                 "tabular-feature move-column-left"
 \bind "C-Right"                "word-right"
 \bind "C-Left"                 "word-left"
 \bind "C-Up"                   "paragraph-up"
diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index edc4154a97..51a7f9b90e 100644
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -14,7 +14,7 @@
 # The interface is designed (partially) following the KDE Human Interface
 # Guidelines (http://techbase.kde.org/Projects/Usability/HIG)
 
-Format 3
+Format 4
 
 Include "stdmenus.inc"
 
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 3d0f2fc4f8..cbe65a8cee 100644
--- 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 3
+Format 4
 
 Menuset
 
@@ -29,10 +29,10 @@ Menuset
 	Menu "insert_math_context"
 		Item "Array Environment|y" "math-matrix 2 2"
 		Item "Cases Environment|C" "math-insert \cases"
-		Item "Aligned Environment|l" "command-sequence math-insert \aligned; inset-modify tabular append-column"
-		Item "AlignedAt Environment|v" "command-sequence math-insert \alignedat; inset-modify tabular append-column"
+		Item "Aligned Environment|l" "command-sequence math-insert \aligned; tabular-feature append-column"
+		Item "AlignedAt Environment|v" "command-sequence math-insert \alignedat; tabular-feature append-column"
 		Item "Gathered Environment|h" "math-insert \gathered"
-		Item "Split Environment|S" "command-sequence math-insert \split; inset-modify tabular append-column"
+		Item "Split Environment|S" "command-sequence math-insert \split; tabular-feature append-column"
 		Separator
 		Item "Delimiters...|r" "dialog-show mathdelimiter"
 		Item "Matrix...|x" "dialog-show mathmatrix"
@@ -62,15 +62,15 @@ Menuset
 		Separator
 		Submenu "Insert|s" "insert_math_context"
 		Separator
-		OptItem "Add Line Above|o" "inset-modify tabular add-hline-above"
-		OptItem "Add Line Below|B" "inset-modify tabular add-hline-below"
-		OptItem "Delete Line Above|v" "inset-modify tabular delete-hline-above"
-		OptItem "Delete Line Below|w" "inset-modify tabular delete-hline-below"
+		OptItem "Add Line Above|o" "tabular-feature add-hline-above"
+		OptItem "Add Line Below|B" "tabular-feature add-hline-below"
+		OptItem "Delete Line Above|v" "tabular-feature delete-hline-above"
+		OptItem "Delete Line Below|w" "tabular-feature delete-hline-below"
 		Separator
-		OptItem "Add Line to Left" "inset-modify tabular add-vline-left"
-		OptItem "Add Line to Right" "inset-modify tabular add-vline-right"
-		OptItem "Delete Line to Left" "inset-modify tabular delete-vline-left"
-		OptItem "Delete Line to Right" "inset-modify tabular delete-vline-right"
+		OptItem "Add Line to Left" "tabular-feature add-vline-left"
+		OptItem "Add Line to Right" "tabular-feature add-vline-right"
+		OptItem "Delete Line to Left" "tabular-feature delete-vline-left"
+		OptItem "Delete Line to Right" "tabular-feature delete-vline-right"
 		Separator
 		Item "Show Math Toolbar" "toolbar-toggle math toggle"
 		Item "Show Math-Panels Toolbar" "toolbar-toggle math_panels toggle"
@@ -406,43 +406,43 @@ Menuset
 #
 
 	Menu "table-borders"
-		Item "Top|T" "inset-modify tabular toggle-line-top"
-		Item "Bottom|B" "inset-modify tabular toggle-line-bottom"
-		Item "Left|L" "inset-modify tabular toggle-line-left"
-		Item "Right|R" "inset-modify tabular toggle-line-right"
+		Item "Top|T" "tabular-feature toggle-line-top"
+		Item "Bottom|B" "tabular-feature toggle-line-bottom"
+		Item "Left|L" "tabular-feature toggle-line-left"
+		Item "Right|R" "tabular-feature toggle-line-right"
 	End
 
 	Menu "table-alignment"
-		Item "Left|f" "command-alternatives inset-modify tabular m-align-left;inset-modify tabular align-left"
-		Item "Center|C" "command-alternatives inset-modify tabular m-align-center;inset-modify tabular align-center"
-		Item "Right|h" "command-alternatives inset-modify tabular m-align-right;inset-modify tabular align-right"
-		Item "Decimal" "inset-modify tabular align-decimal"
+		Item "Left|f" "command-alternatives tabular-feature m-align-left;tabular-feature align-left"
+		Item "Center|C" "command-alternatives tabular-feature m-align-center;tabular-feature align-center"
+		Item "Right|h" "command-alternatives tabular-feature m-align-right;tabular-feature align-right"
+		Item "Decimal" "tabular-feature align-decimal"
 		Separator
-		Item "Top" "inset-modify tabular valign-top"
-		Item "Middle" "inset-modify tabular valign-middle"
-		Item "Bottom" "inset-modify tabular valign-bottom"
+		Item "Top" "tabular-feature valign-top"
+		Item "Middle" "tabular-feature valign-middle"
+		Item "Bottom" "tabular-feature valign-bottom"
 	End
 
 	Menu "table-cols-rows"
-		Item "Multicolumn|u" "inset-modify tabular multicolumn"
-		Item "Multirow|w" "inset-modify tabular multirow"
+		Item "Multicolumn|u" "tabular-feature multicolumn"
+		Item "Multirow|w" "tabular-feature multirow"
 		Separator
-		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 "Move Row Up" "inset-modify tabular move-row-up"
-		Item "Move Row Down" "inset-modify tabular move-row-down"
+		Item "Append Row|A" "tabular-feature append-row"
+		Item "Delete Row|D" "tabular-feature delete-row"
+		Item "Copy Row|o" "tabular-feature copy-row"
+		Item "Move Row Up" "tabular-feature move-row-up"
+		Item "Move Row Down" "tabular-feature 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 "Move Column Right|v" "inset-modify tabular move-column-right"
-		Item "Move Column Left" "inset-modify tabular move-column-left"
+		Item "Append Column|p" "tabular-feature append-column"
+		Item "Delete Column|e" "tabular-feature delete-column"
+		Item "Copy Column|y" "tabular-feature copy-column"
+		Item "Move Column Right|v" "tabular-feature move-column-right"
+		Item "Move Column Left" "tabular-feature move-column-left"
 	End
 
 	Menu "context-tabular"
-		Item "Multi-page Table|g" "inset-modify tabular toggle-longtabular"
-		Item "Formal Style|m" "inset-modify tabular toggle-booktabs"
+		Item "Multi-page Table|g" "tabular-feature toggle-longtabular"
+		Item "Formal Style|m" "tabular-feature toggle-booktabs"
 		Separator
 		Submenu "Borders|d" "table-borders"
 		Submenu "Alignment|i" "table-alignment"
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index df253189c1..62ed8e2776 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -21,7 +21,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 3
+Format 4
 
 Menuset
 
@@ -191,44 +191,44 @@ Menuset
 
 # not much we can do to help here
 	Menu "edit_tabular"
-		Item "Multi-page Table|g" "inset-modify tabular toggle-longtabular"
-		Item "Formal Style|F" "inset-modify tabular toggle-booktabs"
+		Item "Multi-page Table|g" "tabular-feature toggle-longtabular"
+		Item "Formal Style|F" "tabular-feature toggle-booktabs"
 		Separator
-		Item "Multicolumn|M" "inset-modify tabular multicolumn"
-		Item "Multirow|u" "inset-modify tabular multirow"
+		Item "Multicolumn|M" "tabular-feature multicolumn"
+		Item "Multirow|u" "tabular-feature multirow"
 		Separator
-		Item "Top Line|T" "inset-modify tabular toggle-line-top"
-		Item "Bottom Line|B" "inset-modify tabular toggle-line-bottom"
-		Item "Left Line|L" "inset-modify tabular toggle-line-left"
-		Item "Right Line|R" "inset-modify tabular toggle-line-right"
+		Item "Top Line|T" "tabular-feature toggle-line-top"
+		Item "Bottom Line|B" "tabular-feature toggle-line-bottom"
+		Item "Left Line|L" "tabular-feature toggle-line-left"
+		Item "Right Line|R" "tabular-feature toggle-line-right"
 		Separator
-		Item "Top|p" "inset-modify tabular tabular-valign-top"
-		Item "Middle|i" "inset-modify tabular tabular-valign-middle"
-		Item "Bottom|o" "inset-modify tabular tabular-valign-bottom"
+		Item "Top|p" "tabular-feature tabular-valign-top"
+		Item "Middle|i" "tabular-feature tabular-valign-middle"
+		Item "Bottom|o" "tabular-feature tabular-valign-bottom"
 	End
 
 	Menu "edit_tabular_features"
-		Item "Left|L" "inset-modify tabular align-left"
-		Item "Center|C" "inset-modify tabular align-center"
-		Item "Right|R" "inset-modify tabular align-right"
+		Item "Left|L" "tabular-feature align-left"
+		Item "Center|C" "tabular-feature align-center"
+		Item "Right|R" "tabular-feature align-right"
 		Separator
-		Item "Top|T" "inset-modify tabular valign-top"
-		Item "Middle|M" "inset-modify tabular valign-middle"
-		Item "Bottom|B" "inset-modify tabular valign-bottom"
+		Item "Top|T" "tabular-feature valign-top"
+		Item "Middle|M" "tabular-feature valign-middle"
+		Item "Bottom|B" "tabular-feature valign-bottom"
 		Separator
-		Item "Add 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 "Move Row Up" "inset-modify tabular move-row-up"
-		Item "Move Row Down" "inset-modify tabular move-row-down"
-		# Item "Swap Rows|S" "inset-modify tabular swap-row" # currently broken
+		Item "Add Row|A" "tabular-feature append-row"
+		Item "Delete Row|D" "tabular-feature delete-row"
+		Item "Copy Row|o" "tabular-feature copy-row"
+		Item "Move Row Up" "tabular-feature move-row-up"
+		Item "Move Row Down" "tabular-feature move-row-down"
+		# Item "Swap Rows|S" "tabular-feature swap-row" # currently broken
 		Separator
-		Item "Add Column|u" "inset-modify tabular append-column"
-		Item "Delete Column|e" "inset-modify tabular delete-column"
-		Item "Copy Column|p" "inset-modify tabular copy-column"
-		Item "Move Column Right|v" "inset-modify tabular move-column-right"
-		Item "Move Column Left" "inset-modify tabular move-column-left"
-		# Item "Swap Columns|w" "inset-modify tabular swap-column" # currently broken
+		Item "Add Column|u" "tabular-feature append-column"
+		Item "Delete Column|e" "tabular-feature delete-column"
+		Item "Copy Column|p" "tabular-feature copy-column"
+		Item "Move Column Right|v" "tabular-feature move-column-right"
+		Item "Move Column Left" "tabular-feature move-column-left"
+		# Item "Swap Columns|w" "tabular-feature swap-column" # currently broken
 	End
 
 	Menu "edit_math"
@@ -245,15 +245,15 @@ Menuset
 		Separator
 		Item "Split Cell|C" "cell-split"
 		Separator
-		Item "Add Line Above|A" "inset-modify tabular add-hline-above"
-		Item "Add Line Below|B" "inset-modify tabular add-hline-below"
-		Item "Delete Line Above|D" "inset-modify tabular delete-hline-above"
-		Item "Delete Line Below|e" "inset-modify tabular delete-hline-below"
+		Item "Add Line Above|A" "tabular-feature add-hline-above"
+		Item "Add Line Below|B" "tabular-feature add-hline-below"
+		Item "Delete Line Above|D" "tabular-feature delete-hline-above"
+		Item "Delete Line Below|e" "tabular-feature delete-hline-below"
 		Separator
-		Item "Add Line to Left" "inset-modify tabular add-vline-left"
-		Item "Add Line to Right" "inset-modify tabular add-vline-right"
-		Item "Delete Line to Left" "inset-modify tabular delete-vline-left"
-		Item "Delete Line to Right" "inset-modify tabular delete-vline-right"
+		Item "Add Line to Left" "tabular-feature add-vline-left"
+		Item "Add Line to Right" "tabular-feature add-vline-right"
+		Item "Delete Line to Left" "tabular-feature delete-vline-left"
+		Item "Delete Line to Right" "tabular-feature delete-vline-right"
 	End
 
 	Menu "edit_math_macro_definition"
@@ -449,10 +449,10 @@ Menuset
 # "math-matrix" and "math-insert" create an inline formula first if called from text mode
 		Item "Array Environment|y" "math-matrix 2 2"
 		Item "Cases Environment|C" "math-insert \cases"
-		Item "Aligned Environment|l" "command-sequence math-insert \aligned; inset-modify tabular append-column"
-		Item "AlignedAt Environment|v" "command-sequence math-insert \alignedat; inset-modify tabular append-column"
+		Item "Aligned Environment|l" "command-sequence math-insert \aligned; tabular-feature append-column"
+		Item "AlignedAt Environment|v" "command-sequence math-insert \alignedat; tabular-feature append-column"
 		Item "Gathered Environment|h" "math-insert \gathered"
-		Item "Split Environment|S" "command-sequence math-insert \split; inset-modify tabular append-column"
+		Item "Split Environment|S" "command-sequence math-insert \split; tabular-feature append-column"
 		Separator
 		Item "Delimiters...|r" "dialog-show mathdelimiter"
 		Item "Matrix...|x" "dialog-show mathmatrix"
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index e343888948..d375afad14 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -62,7 +62,7 @@
 #
 # This is the default toolbar:
 
-Format 3
+Format 4
 
 ToolbarSet
 
@@ -140,36 +140,36 @@ ToolbarSet
 	End
 
 	Toolbar "table" "Table"
-		Item "Add row" "inset-modify tabular append-row"
-		Item "Add column" "inset-modify tabular append-column"
-		Item "Delete row" "inset-modify tabular delete-row"
-		Item "Delete column" "inset-modify tabular delete-column"
-		Item "Move row up" "inset-modify tabular move-row-up"
-		Item "Move column left" "inset-modify tabular move-column-left"
-		Item "Move row down" "inset-modify tabular move-row-down"
-		Item "Move column right" "inset-modify tabular move-column-right"
+		Item "Add row" "tabular-feature append-row"
+		Item "Add column" "tabular-feature append-column"
+		Item "Delete row" "tabular-feature delete-row"
+		Item "Delete column" "tabular-feature delete-column"
+		Item "Move row up" "tabular-feature move-row-up"
+		Item "Move column left" "tabular-feature move-column-left"
+		Item "Move row down" "tabular-feature move-row-down"
+		Item "Move column right" "tabular-feature move-column-right"
 		Separator
-		Item "Set top line" "inset-modify tabular toggle-line-top"
-		Item "Set bottom line" "inset-modify tabular toggle-line-bottom"
-		Item "Set left line" "inset-modify tabular toggle-line-left"
-		Item "Set right line" "inset-modify tabular toggle-line-right"
-		Item "Set border lines" "inset-modify tabular set-border-lines"
-		Item "Set all lines" "inset-modify tabular set-all-lines"
-		Item "Unset all lines" "inset-modify tabular unset-all-lines"
+		Item "Set top line" "tabular-feature toggle-line-top"
+		Item "Set bottom line" "tabular-feature toggle-line-bottom"
+		Item "Set left line" "tabular-feature toggle-line-left"
+		Item "Set right line" "tabular-feature toggle-line-right"
+		Item "Set border lines" "tabular-feature set-border-lines"
+		Item "Set all lines" "tabular-feature set-all-lines"
+		Item "Unset all lines" "tabular-feature unset-all-lines"
 		Separator
-		Item "Align left" "command-alternatives inset-modify tabular m-align-left;inset-modify tabular align-left"
-		Item "Align center" "command-alternatives inset-modify tabular m-align-center;inset-modify tabular align-center"
-		Item "Align right" "command-alternatives inset-modify tabular m-align-right;inset-modify tabular align-right"
-		Item "Align on decimal" "inset-modify tabular align-decimal"
+		Item "Align left" "command-alternatives tabular-feature m-align-left;tabular-feature align-left"
+		Item "Align center" "command-alternatives tabular-feature m-align-center;tabular-feature align-center"
+		Item "Align right" "command-alternatives tabular-feature m-align-right;tabular-feature align-right"
+		Item "Align on decimal" "tabular-feature align-decimal"
 		Separator
-		Item "Align top" "command-alternatives inset-modify tabular m-valign-top;inset-modify tabular valign-top"
-		Item "Align middle" "command-alternatives inset-modify tabular m-valign-middle;inset-modify tabular valign-middle"
-		Item "Align bottom" "command-alternatives inset-modify tabular m-valign-bottom;inset-modify tabular valign-bottom"
+		Item "Align top" "command-alternatives tabular-feature m-valign-top;tabular-feature valign-top"
+		Item "Align middle" "command-alternatives tabular-feature m-valign-middle;tabular-feature valign-middle"
+		Item "Align bottom" "command-alternatives tabular-feature m-valign-bottom;tabular-feature valign-bottom"
 		Separator
-		Item "Rotate cell by 90 degrees or unset rotation" "inset-modify tabular toggle-rotate-cell"
-		Item "Rotate table by 90 degrees or unset rotation" "inset-modify tabular toggle-rotate-tabular"
-		Item "Set multi-column" "inset-modify tabular multicolumn"
-		Item "Set multi-row" "inset-modify tabular multirow"
+		Item "Rotate cell by 90 degrees or unset rotation" "tabular-feature toggle-rotate-cell"
+		Item "Rotate table by 90 degrees or unset rotation" "tabular-feature toggle-rotate-tabular"
+		Item "Set multi-column" "tabular-feature multicolumn"
+		Item "Set multi-row" "tabular-feature multirow"
 	End
 
 	Toolbar "math" "Math"
@@ -191,10 +191,10 @@ ToolbarSet
 		Separator
 		Item "Insert matrix" "dialog-show mathmatrix"
 		Item "Insert cases environment" "math-insert \cases"
-		Item "Add row" "inset-modify tabular append-row"
-		Item "Add column" "inset-modify tabular append-column"
-		Item "Delete row" "inset-modify tabular delete-row"
-		Item "Delete column" "inset-modify tabular delete-column"
+		Item "Add row" "tabular-feature append-row"
+		Item "Add column" "tabular-feature append-column"
+		Item "Delete row" "tabular-feature delete-row"
+		Item "Delete column" "tabular-feature delete-column"
 		Separator
 		Item "Toggle math panels" "toolbar-toggle math_panels"
 	End