UserGuide.lyx: adopt Martins Changes in r21531 to the doc style and the other maintai...

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

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 466dd642d0232e6d815a5418fde5306e5660401e..c14f7ea8e96e4e9235245dd48a169c99e790a21b 100644 (file)
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -140,7 +140,9 @@ Menuset
        End
 
        Menu "edit_textstyles"
+               Item "Dissolve CharStyle" "inset-dissolve charstyle"
                CharStyles
+               Elements
                Separator
                Item "Customized...|C" "dialog-show character"
                Separator
@@ -184,6 +186,7 @@ Menuset
                Item "Toggle Numbering|N" "math-number"
                Item "Toggle Numbering of Line|u" "math-nonumber"
                Submenu "Change Limits Type|L" "edit_math_limits"
+               Submenu "Macro Definition" "edit_math_macro_definition"
                Separator
                Submenu "Change Formula Type|F" "edit_math_mutate"
                Separator
@@ -204,6 +207,20 @@ Menuset
                Item "Delete Line to Right" "tabular-feature delete-vline-right"
        End
 
+       Menu "edit_math_macro_definition"
+               Item "Append Parameter" "math-macro-add-param"
+               Item "Remove Last Parameter" "math-macro-remove-param"
+                Separator
+               Item "Make First Non-Optional into Optional Parameter" "math-macro-make-optional"
+               Item "Make Last Optional into Non-Optional Parameter" "math-macro-make-nonoptional"
+                Item "Insert Optional Parameter" "math-macro-add-optional-param"
+                Item "Remove Optional Parameter" "math-macro-remove-optional-param"
+               Separator
+               Item "Append Parameter Eating From The Right" "math-macro-append-greedy-param"
+                Item "Append Optional Parameter Eating From The Right" "math-macro-add-greedy-optional-param"
+               Item "Remove Last Parameter Spitting Out To The Right" "math-macro-remove-greedy-param"
+       End
+
        Menu "edit_math_limits"
                 Item "Default|t"  "math-limits empty"
                 Item "Display|D"  "math-limits limits"
@@ -265,6 +282,9 @@ Menuset
                Item "Open All Insets|O" "all-insets-toggle open"
                Item "Close All Insets|C" "all-insets-toggle close"
                Separator
+               Item "Unfold Math Macro" "math-macro-unfold"
+               Item "Fold Math Macro" "math-macro-fold"
+               Separator
                Item "View Source|S" "dialog-toggle view-source"
                Submenu "Update|U" "view_update"
                ViewFormats
@@ -297,7 +317,7 @@ Menuset
                Submenu "Branch|B" "insert_branches"
                Submenu "Custom insets" "insert_custom"
                Submenu "File|e" "insert_file"
-               Item "Box" "box-insert Frameless"
+               Item "Box[[Menu]]" "box-insert Frameless"
                Separator
                Item "Citation...|C" "dialog-show-new-inset citation"
                Item "Cross-Reference...|R" "dialog-show-new-inset ref"
@@ -308,7 +328,7 @@ Menuset
                Separator
                Item "Table...|T" "tabular-insert"
                Item "Graphics...|G" "dialog-show-new-inset graphics"
-               Item "URL...|U" "url-insert"
+               Item "Hyperlink|k" "href-insert"
                Item "Footnote|F" "footnote-insert"
                Item "Marginal Note|M" "marginalnote-insert"
                Item "Short Title|S" "optional-insert"
@@ -366,6 +386,7 @@ Menuset
                Separator
                Item "Delimiters|r" "dialog-show mathdelimiter"
                Item "Matrix|x" "dialog-show mathmatrix"
+               Item "Macro|o" "math-macro newmacroname newcommand"
                Separator
                Item "Toggle Math Panels" "toolbar-toggle math_panels"
        End
@@ -373,7 +394,8 @@ Menuset
        Menu "insert_float"
                FloatInsert
 # This has got to be better than "Wrap", anyway
-               Item "Text Wrap Float|W" "wrap-insert figure"
+               Item "Figure Wrap Float|F" "wrap-insert figure"
+               Item "Table Wrap Float|T" "wrap-insert table"
        End
 
        Menu "insert_toc"
@@ -420,6 +442,7 @@ Menuset
                Item "Outline|O" "dialog-toggle toc"
                Item "Start Appendix Here|A" "appendix"
                Separator
+               Item "Save in Bundled Format|F" "buffer-toggle-embedding"
                Item "Compressed|m" "buffer-toggle-compression"
                Item "Settings...|S" "dialog-show document"
        End
@@ -486,6 +509,7 @@ Menuset
                Item "Extended Features|E" "help-open Extended"
                Item "Embedded Objects|m" "help-open EmbeddedObjects" 
                Item "Customization|C" "help-open Customization"
+               Item "Shortcuts|S" "help-open Shortcuts"
                Item "FAQ|F" "help-open FAQ"
                Item "Table of Contents|a" "help-open TOC"
                Item "LaTeX Configuration|L" "help-open LaTeXConfig"