Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 30bc22c16d0c6ea7dc44827a59b3b8fd8740ea69..41907600103f4b9b8f2c1fbadcdb1086317d4fd9 100644 (file)
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -162,8 +162,8 @@ ToolbarSet
                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"
                Separator
-               Item "Rotate cell" "inset-modify tabular toggle-rotate-cell"
-               Item "Rotate table" "inset-modify tabular toggle-rotate-tabular"
+               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"
        End
@@ -336,6 +336,10 @@ ToolbarSet
                Item "Phantom   \\phantom" "math-insert \phantom"
                Item "Horizontal phantom        \\hphantom" "math-insert \hphantom"
                Item "Vertical phantom  \\vphantom" "math-insert \vphantom"
+               Item "Smash \\smash" "math-insert \smash"
+               Item "Left overlap \\mathllap" "math-insert \mathllap"
+               Item "Center overlap \\mathclap" "math-insert \mathclap"
+               Item "Right overlap \\mathrlap" "math-insert \mathrlap"
        End
 
        Toolbar "sqrt-square" "Roots"
@@ -353,15 +357,15 @@ ToolbarSet
        Toolbar "frac-square" "Fractions"
                Item "Standard  \\frac" "math-insert \frac"
                Item "Nice fraction (3/4)       \\nicefrac" "math-insert \nicefrac"
-               Item "Unit (km) \\unit" "math-insert \unitone"
-               Item "Unit (864 m)      \\unit" "math-insert \unittwo"
+               Item "Unit (km) \\unitone" "math-insert \unitone"
+               Item "Unit (864 m)      \\unittwo" "math-insert \unittwo"
                Item "Unit fraction (km/h)      \\unitfrac" "math-insert \unitfrac"
-               Item "Unit fraction (20 km/h)   \\unitfrac" "math-insert \unitfracthree"
+               Item "Unit fraction (20 km/h)   \\unitfracthree" "math-insert \unitfracthree"
                Item "Text fraction     \\tfrac" "math-insert \tfrac"
                Item "Display fraction  \\dfrac" "math-insert \dfrac"
                Item "Continued fraction        \\cfrac" "math-insert \cfrac"
-               Item "Continued fraction (left) \\cfrac" "math-insert \cfracleft"
-               Item "Continued fraction (right)        \\cfrac" "math-insert \cfracright"
+               Item "Continued fraction (left) \\cfracleft" "math-insert \cfracleft"
+               Item "Continued fraction (right)        \\cfracright" "math-insert \cfracright"
                Item "Binomial  \\binom" "math-insert \binom"
                Item "Text binomial     \\tbinom" "math-insert \tbinom"
                Item "Display binomial  \\dbinom" "math-insert \dbinom"
@@ -398,6 +402,7 @@ ToolbarSet
                Item "check" "math-insert \check"
                Item "widehat" "math-insert \widehat"
                Item "widetilde" "math-insert \widetilde"
+               Item "utilde" "math-insert \utilde"
                Item "vec" "math-insert \vec"
                Item "acute" "math-insert \acute"
                Item "ddot" "math-insert \ddot"
@@ -416,6 +421,10 @@ ToolbarSet
                Item "underrightarrow" "math-insert \underrightarrow"
                Item "underleftrightarrow" "math-insert \underleftrightarrow"
                Item "underset" "math-insert \underset"
+               Item "cancel" "math-insert \cancel"
+               Item "bcancel" "math-insert \bcancel"
+               Item "xcancel" "math-insert \xcancel"
+               Item "cancelto" "math-insert \cancelto"
        End
 
        Toolbar "latex_arrow" "Arrows"