]> git.lyx.org Git - lyx.git/blobdiff - lib/ui/stdmenus.inc
Fix typo.
[lyx.git] / lib / ui / stdmenus.inc
index 97ac8aa2b612a6d16fda67125d1ba91e2d1ca23a..62ed8e2776b752c31d2b7774173780def3941ecb 100644 (file)
 # Full author contact details are available in file CREDITS.
 
 # The interface is designed (partially) following the KDE Human Interface
-# Guidelines (http://usability.kde.org/hig/)
+# Guidelines (http://techbase.kde.org/Projects/Usability/HIG)
+
+# Casing Rules:
+# Capitalize all words in the element, with the following exceptions:
+# * Articles: a, an, the.
+# * Conjunctions: and, but, for, not, so, yet ...
+# * Prepositions of three or fewer letters: at, for, by, in, to ...
+#   (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 4
 
 Menuset
 
@@ -38,6 +48,7 @@ Menuset
                Submenu "Open Recent|t" "file_lastfiles"
                Separator
                Item "Close|C" "buffer-close"
+               Item "Close All" "buffer-close-all"
                Item "Save|S" "buffer-write"
                Item "Save As...|A" "buffer-write-as"
                Item "Save All|l" "buffer-write-all"
@@ -46,7 +57,6 @@ Menuset
                Separator
                Submenu "Import|I" "file_import"
                Submenu "Export|E" "file_export"
-               Item "Print...|P" "dialog-show print"
                OptItem "Fax...|F" "buffer-export fax"
                Separator
                Item "New Window|W" "window-new"
@@ -63,9 +73,14 @@ Menuset
                OptItem "Register...|R" "vc-register"
                OptItem "Check In Changes...|I" "vc-check-in"
                OptItem "Check Out for Edit|O" "vc-check-out"
-               OptItem "Revert to Last Version|L" "vc-revert"
+               OptItem "Copy|p" "vc-copy"
+               OptItem "Rename|R" "vc-rename"
+               OptItem "Update Local Directory From Repository|d" "vc-repo-update"
+               OptItem "Revert to Repository Version|v" "vc-revert"
                OptItem "Undo Last Check In|U" "vc-undo-last"
-               OptItem "Show History|H" "dialog-show vclog"
+               OptItem "Compare with Older Revision...|C" "vc-compare"
+               OptItem "Show History...|H" "dialog-show vclog"
+               OptItem "Use Locking Property|L" "vc-locking-toggle"
        End
 
        Menu "file_import"
@@ -73,8 +88,9 @@ Menuset
        End
 
        Menu "file_export"
+               Item "Export As...|s" "buffer-export-as"
                ExportFormats
-               Item "Custom...|C" "buffer-export custom"
+               Item "More Formats & Options...|r" "buffer-export custom"
        End
 
 #
@@ -91,14 +107,17 @@ Menuset
                Submenu "Paste Recent|e" "edit_pasterecent"
                Submenu "Paste Special" "edit_paste"
                Separator
+               Item "Select Whole Inset" "inset-select-all"
                Item "Select All" "command-sequence buffer-begin ; buffer-end-select"
                Separator
-               Item "Find & Replace...|F" "dialog-show findreplace"
+               Item "Find & Replace (Quick)...|F" "dialog-show findreplace"
+               Item "Find & Replace (Advanced)..." "dialog-show findreplaceadv"
                Separator
                Item "Move Paragraph Up|o" "paragraph-move-up"
                Item "Move Paragraph Down|v" "paragraph-move-down"
                Separator
                Submenu "Text Style|S" "edit_textstyles"
+               LanguageSelector
                Item "Paragraph Settings...|P" "layout-paragraph"
                Separator
 # Mathed b0rkage means these don't work properly
@@ -113,14 +132,20 @@ Menuset
 # obvious what the context is for the others)
                OptItem "Increase List Depth|I" "depth-increment"
                OptItem "Decrease List Depth|D" "depth-decrement"
-               OptItem "Dissolve Inset|l" "inset-dissolve"
+               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
                OptItem "Float Settings...|a" "inset-settings float"
                OptItem "Text Wrap Settings...|W" "inset-settings wrap"
                OptItem "Note Settings...|N" "inset-settings note"
+               OptItem "Phantom Settings...|h" "inset-settings phantom"
                OptItem "Branch Settings...|B" "inset-settings branch"
                OptItem "Box Settings...|x" "inset-settings box"
+               OptItem "Index Entry Settings...|y" "inset-settings index"
+               OptItem "Index Settings...|x" "inset-settings index_print"
+               OptItem "Info Settings...|n" "inset-settings info"
+               OptItem "Listings Settings...|g" "inset-settings listings"
 # Hey, guess what's broken ? Surprise surprise, it's tabular stuff
 # This is in the Table submenu instead for now.
 #      OptItem "Table Settings...|a" "inset-settings tabular"
@@ -128,16 +153,24 @@ Menuset
        End
 
        Menu "edit_paste"
+               OptItem "Paste from HTML|H" "paste html"
+               OptItem "Paste from LaTeX|L" "paste latex"
+               OptItem "Paste as LinkBack PDF" "paste linkback"
+               OptItem "Paste as PDF" "paste pdf"
+               OptItem "Paste as PNG" "paste png"
+               OptItem "Paste as JPEG" "paste jpeg"
+               OptItem "Paste as EMF" "paste emf"
+               Separator
                Item "Plain Text|T" "clipboard-paste"
                Item "Plain Text, Join Lines|J" "clipboard-paste paragraph"
                Separator
                Item "Selection|S" "primary-selection-paste"
                Item "Selection, Join Lines|i" "primary-selection-paste paragraph"
-               Separator
-               Item "Paste As LinkBack PDF" "paste linkback"
-               Item "Paste As PDF" "paste pdf"
-               Item "Paste As PNG" "paste png"
-               Item "Paste As JPEG" "paste jpeg"
+# clipboard-paste-simple is commented because it is irritating (bug 8749)
+# until somebody can explain why it is needed in addition to clipboard-paste
+#              Separator
+#              Item "Unformatted Text|U" "clipboard-paste-simple"
+#              Item "Unformatted, Join Lines|o" "clipboard-paste-simple paragraph"
        End
 
        Menu "edit_pasterecent"
@@ -145,7 +178,7 @@ Menuset
        End
 
        Menu "edit_textstyles"
-               Item "Dissolve CharStyle" "inset-dissolve charstyle"
+               Item "Dissolve Text Style" "inset-dissolve charstyle"
                CharStyles
                Elements
                Separator
@@ -158,13 +191,20 @@ Menuset
 
 # not much we can do to help here
        Menu "edit_tabular"
+               Item "Multi-page Table|g" "tabular-feature toggle-longtabular"
+               Item "Formal Style|F" "tabular-feature toggle-booktabs"
+               Separator
                Item "Multicolumn|M" "tabular-feature multicolumn"
+               Item "Multirow|u" "tabular-feature multirow"
                Separator
                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" "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"
@@ -179,23 +219,27 @@ Menuset
                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" "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"
-               Item "Number whole Formula|N" "math-number-toggle"
-               Item "Number this Line|u" "math-number-line-toggle"
+               Item "Number Whole Formula|N" "math-number-toggle"
+               Item "Number This Line|u" "math-number-line-toggle"
                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
-               Submenu "Text Style|T" "edit_math_textstyles"
+               Submenu "Text Style|T" "edit_math_fontstyles"
                Separator
                Submenu "Use Computer Algebra System|S" "edit_math_extern"
                Separator
@@ -213,17 +257,17 @@ Menuset
        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"
+               Item "Append Argument" "math-macro-add-param"
+               Item "Remove Last Argument" "math-macro-remove-param"
+               Separator
+               Item "Transform First Non-Optional to Optional Argument" "math-macro-make-optional"
+               Item "Transform Last Optional to Non-Optional Argument" "math-macro-make-nonoptional"
+               Item "Insert Optional Argument" "math-macro-add-optional-param"
+               Item "Remove Optional Argument" "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"
+               Item "Append Argument Eating From the Right" "math-macro-append-greedy-param"
+               Item "Append Optional Argument Eating From the Right" "math-macro-add-greedy-optional-param"
+               Item "Remove Last Argument Spitting Out to the Right" "math-macro-remove-greedy-param"
        End
 
        Menu "edit_math_limits"
@@ -232,29 +276,30 @@ Menuset
                 Item "Inline|I"  "math-limits nolimits"
        End
 
-       Menu "edit_math_textstyles"
-               Item "Math Normal Font|N" "math-insert \mathnormal"
+       Menu "edit_math_fontstyles"
+               Item "Math Normal Font|N" "math-font-style mathnormal"
                Separator
-               Item "Math Calligraphic Family|C" "math-insert \mathcal"
-               Item "Math Fraktur Family|F" "math-insert \mathfrak"
-               Item "Math Roman Family|R" "math-insert \mathrm"
-               Item "Math Sans Serif Family|S" "math-insert \mathsf"
+               Item "Math Calligraphic Family|C" "math-font-style mathcal"
+               Item "Math Formal Script Family|o" "math-font-style mathscr"
+               Item "Math Fraktur Family|F" "math-font-style mathfrak"
+               Item "Math Roman Family|R" "math-font-style mathrm"
+               Item "Math Sans Serif Family|S" "math-font-style mathsf"
                Separator
-               Item "Math Bold Series|B" "math-insert \mathbf"
+               Item "Math Bold Series|B" "math-font-style mathbf"
                Separator
-               Item "Text Normal Font|T" "math-insert \textnormal"
+               Item "Text Normal Font|T" "math-font-style textnormal"
                Separator
-               Item "Text Roman Family" "math-insert \textrm"
-               Item "Text Sans Serif Family" "math-insert \textsf"
-               Item "Text Typewriter Family" "math-insert \texttt"
+               Item "Text Roman Family" "math-font-style textrm"
+               Item "Text Sans Serif Family" "math-font-style textsf"
+               Item "Text Typewriter Family" "math-font-style texttt"
                Separator
-               Item "Text Bold Series" "math-insert \textbf"
-               Item "Text Medium Series" "math-insert \textmd"
+               Item "Text Bold Series" "math-font-style textbf"
+               Item "Text Medium Series" "math-font-style textmd"
                Separator
-               Item "Text Italic Shape" "math-insert \textit"
-               Item "Text Small Caps Shape" "math-insert \textsc"
-               Item "Text Slanted Shape" "math-insert \textsl"
-               Item "Text Upright Shape" "math-insert \textup"
+               Item "Text Italic Shape" "math-font-style textit"
+               Item "Text Small Caps Shape" "math-font-style textsc"
+               Item "Text Slanted Shape" "math-font-style textsl"
+               Item "Text Upright Shape" "math-font-style textup"
        End
 
        Menu "edit_math_extern"
@@ -262,10 +307,10 @@ Menuset
                Item "Maxima|M" "math-extern maxima"
                Item "Mathematica|a" "math-extern mathematica"
                Separator
-               Item "Maple, simplify|s" "math-extern maple simplify"
-               Item "Maple, factor|f" "math-extern maple factor"
-               Item "Maple, evalm|e" "math-extern maple evalm"
-               Item "Maple, evalf|v" "math-extern maple evalf"
+               Item "Maple, Simplify|S" "math-extern maple simplify"
+               Item "Maple, Factor|F" "math-extern maple factor"
+               Item "Maple, Evalm|E" "math-extern maple evalm"
+               Item "Maple, Evalf|v" "math-extern maple evalf"
        End
 
        Menu "edit_math_mutate"
@@ -284,27 +329,23 @@ Menuset
 #
 
        Menu "view"
-               Item "Open All Insets|O" "all-insets-toggle open"
-               Item "Close All Insets|C" "all-insets-toggle close"
+               Item "Open All Insets|O" "inset-forall * inset-toggle open"
+               Item "Close All Insets|C" "inset-forall * inset-toggle close"
                Separator
-               Item "Unfold Math Macro" "math-macro-unfold"
-               Item "Fold Math Macro" "math-macro-fold"
+               Item "Unfold Math Macro|n" "math-macro-unfold"
+               Item "Fold Math Macro|d" "math-macro-fold"
                Separator
-               Item "View Source|S" "dialog-toggle view-source"
-               Submenu "Update|U" "view_update"
-               ViewFormats
+               Item "Outline Pane|u" "dialog-toggle toc"
+               Item "Source Pane|S" "dialog-toggle view-source"
+               Item "Messages Pane|g" "dialog-toggle progress"
+               Submenu "Toolbars|b" "toolbars"
                Separator
-               Item "Split View Horizontally|i" "split-view horizontal"
-               Item "Split View Vertically|V" "split-view vertical"
-               Item "Close Tab Group|G" "close-tab-group"
+               Item "Split View Into Left and Right Half|i" "view-split horizontal"
+               Item "Split View Into Upper and Lower Half|e" "view-split vertical"
+               OptItem "Close Current View|w" "tab-group-close"
                Item "Fullscreen|l" "ui-toggle fullscreen"
-               Submenu "Toolbars|b" "toolbars"
                Separator
-           Documents
-       End
-
-       Menu "view_update"
-               UpdateFormats
+               Documents
        End
 
        Menu "toolbars"
@@ -324,27 +365,29 @@ Menuset
                Submenu "Float|a" "insert_float"
                Submenu "Note|N" "insert_note"
                Submenu "Branch|B" "insert_branches"
-               Submenu "Custom insets" "insert_custom"
+               Submenu "Custom Insets" "insert_custom"
                Submenu "File|e" "insert_file"
-               Item "Box[[Menu]]" "box-insert Frameless"
+               Submenu "Box[[Menu]]|x" "insert_box"
+               OptSubmenu "Insert Regular Expression" "context-edit-regexp"
                Separator
                Item "Citation...|C" "dialog-show-new-inset citation"
                Item "Cross-Reference...|R" "dialog-show-new-inset ref"
                Item "Label...|L" "label-insert"
-               Item "Caption" "caption-insert"
-               Item "Index Entry|d" "index-insert"
+               Captions
+               Indices
                Item "Nomenclature Entry...|y" "nomencl-insert"
                Separator
                Item "Table...|T" "tabular-insert"
                Item "Graphics...|G" "dialog-show-new-inset graphics"
-               Item "URL" "flex-insert URL"
-               Item "Hyperlink|k" "href-insert"
+               Item "URL|U" "flex-insert URL"
+               Item "Hyperlink...|k" "href-insert"
                Item "Footnote|F" "footnote-insert"
                Item "Marginal Note|M" "marginalnote-insert"
-               Item "Short Title|S" "optional-insert"
-               Item "TeX Code|X" "ert-insert"
+               Arguments
+               Item "TeX Code" "ert-insert"
                Item "Program Listing[[Menu]]" "listing-insert"
                Item "Date" "date-insert"
+               Item "Preview|w" "preview-insert"
        End
 
        Menu "insert_special"
@@ -355,36 +398,47 @@ Menuset
                Item "Single Quote|S" "quote-insert single"
                Item "Protected Hyphen|y" "specialchar-insert nobreakdash"
                Item "Breakable Slash|a" "specialchar-insert slash"
+               Item "Visible Space|V" "space-insert visible"
                Item "Menu Separator|M" "specialchar-insert menu-separator"
-               Item "Phonetic Symbols|P" "command-sequence math-mode on; math-insert \text\textipa ; char-forward ;"
+               Item "Phonetic Symbols|P" "ipa-insert"
+               Submenu "Logos|L" "insert_logos"
+       End
+
+       Menu "insert_logos"
+               Item "LyX Logo|L" "specialchar-insert lyx"
+               Item "TeX Logo|T" "specialchar-insert tex"
+               Item "LaTeX Logo|a" "specialchar-insert latex"
+               Item "LaTeX2e Logo|e" "specialchar-insert latex2e"
        End
 
        Menu "insert_formatting"
-               Item "Superscript|S" "command-sequence math-mode on; math-superscript; math-insert \text;"
-               Item "Subscript|u" "command-sequence math-mode on; math-subscript; math-insert \text;"
+               Item "Superscript|S" "script-insert superscript"
+               Item "Subscript|u" "script-insert subscript"
                Separator
                Item "Protected Space|P" "space-insert protected"
-               Item "Inter-word Space|w" "space-insert normal"
+               Item "Interword Space|w" "space-insert normal"
                Item "Thin Space|T" "space-insert thin"
-               Item "Horizontal Space...|o" "dialog-show-new-inset space"
-               Item "Horizontal Line|L" "line-insert"
+               Item "Horizontal Space...|o" "command-alternatives dialog-show-new-inset space;dialog-show-new-inset mathspace"
+               Item "Horizontal Line...|L" "dialog-show-new-inset line"
                Item "Vertical Space...|V" "dialog-show-new-inset vspace"
+               Submenu "Phantom|m" "insert_phantom"
                Separator
                Item "Hyphenation Point|H" "specialchar-insert hyphenation"
                Item "Ligature Break|k" "specialchar-insert ligature-break"
-               Item "New Line|e" "new-line"
-               Item "Line Break|B" "line-break"
+               Item "Ragged Line Break|R" "newline-insert newline"
+               Item "Justified Line Break|J" "newline-insert linebreak"
                Separator
-               Item "New Page|N" "newpage-insert"
-               Item "Page Break|a" "pagebreak-insert"
-               Item "Clear Page|C" "clearpage-insert"
-               Item "Clear Double Page|D" "cleardoublepage-insert"
+               Item "New Page|N" "newpage-insert newpage"
+               Item "Page Break|a" "newpage-insert pagebreak"
+               Item "Clear Page|C" "newpage-insert clearpage"
+               Item "Clear Double Page|D" "newpage-insert cleardoublepage"
        End
 
        Menu "insert_math"
+# Always use "math-mode on" instead of "math-display" etc. because this disables the commands in math mode
                Item "Inline Formula|I" "math-mode on"
-               Item "Display Formula|D" "math-display"
-               Item "Numbered Formula|N" "command-sequence math-display; math-number;"
+               Item "Display Formula|D" "command-sequence math-mode on; math-mutate equation"
+               Item "Numbered Formula|N" "command-sequence math-mode on; math-mutate equation; math-number-toggle;"
                Item "Eqnarray Environment|E" "command-sequence math-mode on; math-mutate eqnarray;"
                Item "AMS align Environment|a" "command-sequence math-mode on; math-mutate align;"
                Item "AMS alignat Environment|t" "command-sequence math-mode on; math-mutate alignat;"
@@ -392,18 +446,17 @@ Menuset
                Item "AMS gather Environment|g" "command-sequence math-mode on; math-mutate gather;"
                Item "AMS multline Environment|m" "command-sequence math-mode on; math-mutate multline;"
                Separator
+# "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" "command-sequence math-mode on; math-insert \cases"
-               Item "Aligned Environment|l" "command-sequence math-mode on; math-insert \aligned; tabular-feature append-column"
-               Item "AlignedAt Environment|v" "command-sequence math-mode on; math-insert \alignedat; tabular-feature append-column"
-               Item "Gathered Environment|h" "command-sequence math-mode on; math-insert \gathered"
-               Item "Split Environment|S" "command-sequence math-mode on; math-insert \split; tabular-feature append-column"
-               Separator
-               Item "Delimiters|r" "dialog-show mathdelimiter"
-               Item "Matrix|x" "dialog-show mathmatrix"
+               Item "Cases Environment|C" "math-insert \cases"
+               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; tabular-feature append-column"
+               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
 
        Menu "insert_float"
@@ -414,9 +467,10 @@ Menuset
        End
 
        Menu "insert_toc"
-               Item "Table of Contents|C" "toc-insert"
+               Item "Table of Contents|C" "inset-insert toc"
                FloatListInsert
-               Item "Index List|I" "index-print"
+               IndicesLists
+               Item "List of Listings|L" "inset-insert toc CommandInset toc LatexCommand lstlistoflistings \end_inset"
                Item "Nomenclature|N" "nomencl-print"
                Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex"
        End
@@ -430,6 +484,16 @@ Menuset
                Item "Child Document...|d" "dialog-show-new-inset include"
        End
 
+       Menu "insert_box"
+               Item "Frameless|l" "box-insert Frameless"
+               Item "Simple Frame|F" "box-insert Boxed"
+               Item "Oval, Thin|a" "box-insert ovalbox"
+               Item "Oval, Thick|v" "box-insert Ovalbox"
+               Item "Drop Shadow|w" "box-insert Shadowbox"
+               Item "Shaded Background|B" "box-insert Shaded"
+               Item "Double Frame|u" "box-insert Doublebox"
+       End
+
        Menu "insert_note"
                Item "LyX Note|N" "note-insert Note"
                Item "Comment|C" "note-insert Comment"
@@ -438,6 +502,14 @@ Menuset
 
        Menu "insert_branches"
                Branches
+               Separator
+               Item "Insert New Branch...|I" "branch-add-insert"
+       End
+
+       Menu "insert_phantom"
+               Item "Phantom|P" "phantom-insert Phantom"
+               Item "Horizontal Phantom|H" "phantom-insert HPhantom"
+               Item "Vertical Phantom|V" "phantom-insert VPhantom"
        End
 
        Menu "insert_custom"
@@ -452,11 +524,15 @@ Menuset
                Submenu "Change Tracking|C" "document_change"
                OptItem "Build Program|B" "build-program"
                Item "LaTeX Log|L" "dialog-show latexlog"
-               Item "Outline|O" "dialog-toggle toc"
-               Item "Start Appendix Here|A" "appendix"
+               Item "Start Appendix Here|x" "appendix"
                Separator
-               Item "Save in Bundled Format|F" "buffer-toggle-embedding"
-               Item "Compressed|m" "buffer-toggle-compression"
+               ViewFormats
+               UpdateFormats
+               OptItem "View Master Document|M" "master-buffer-view"
+               OptItem "Update Master Document|a" "master-buffer-update"
+               Separator
+               Item "Compressed|o" "buffer-toggle-compression"
+               Item "Disable Editing|E" "buffer-toggle-read-only"
                Item "Settings...|S" "dialog-show document"
        End
 
@@ -478,7 +554,8 @@ Menuset
                Item "Next Note|N" "note-next"
                Item "Next Change|C" "change-next"
                Item "Next Cross-Reference|R" "reference-next"
-               Item "Go to Label|L" "label-goto"
+               OptItem "Go to Label|L" "label-goto"
+               Item "Forward Search|F" "forward-search"
                Separator
                Toc
        End
@@ -491,6 +568,7 @@ Menuset
                Item "Save Bookmark 5" "bookmark-save 5"
                Item "Clear Bookmarks|C" "bookmark-clear"
                Separator
+               Item "Navigate Back|B" "bookmark-goto 0"
                Bookmarks
        End
 
@@ -504,6 +582,7 @@ Menuset
                Item "Statistics...|a" "statistics"
                OptItem "Check TeX|h" "buffer-chktex"
                Item "TeX Information|I" "dialog-show texinfo"
+               Item "Compare...|C" "dialog-show compare"
                Separator
 # A LOT of applications have Tools->Prefs. Remember this
 # should be rarely used - Edit menu is not a good place to
@@ -519,198 +598,35 @@ Menuset
                Item "Introduction|I" "help-open Intro"
                Item "Tutorial|T" "help-open Tutorial"
                Item "User's Guide|U" "help-open UserGuide"
-               Item "Extended Features|E" "help-open Extended"
-               Item "Embedded Objects|m" "help-open EmbeddedObjects"
-               Item "Math|h" "help-open Math"
+               Item "Additional Features|F" "help-open Additional"
+               Item "Embedded Objects|O" "help-open EmbeddedObjects"
+               Item "Math|M" "help-open Math"
                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 "LyX Functions|y" "help-open LFUNs"
                Item "LaTeX Configuration|L" "help-open LaTeXConfig"
+               Submenu "Specific Manuals|p" "examples"
                Separator
                Item "About LyX|X" "dialog-show aboutlyx"
        End
 
-#
-# InsetMath context menu
-#
-       Menu "context-math"
-               Item "Equation Label|L" "label-insert"
-               Item "Toggle Labeling/Numbering|T" "math-number-toggle"
-       End
-
-
-#
-# InsetRef context menu
-#
-       Menu "context-ref"
-               Item "Next Cross-Reference|N" "reference-next"
-               Item "Go to Label|G" "label-goto"
-               Submenu "Change Type|y" "edit_reftype"
-               Item "Edit...|E" "next-inset-toggle"
-       End
-
-       Menu "edit_reftype"
-               Item "<reference>|r" "next-inset-modify changetype ref"
-               Item "(<reference>)|e" "next-inset-modify changetype eqref"
-               Item "<page>|p" "next-inset-modify changetype pageref"
-               Item "on page <page>|o" "next-inset-modify changetype vpageref"
-               Item "<reference> on page <page>|f" "next-inset-modify changetype vref"
-               Item "Formatted reference|t" "next-inset-modify changetype prettyref"
-       End
-
-#
-# InsetLabel context menu
-#
-       Menu "context-label"
-               Item "Next Cross-Reference|N" "reference-next"
-               Item "Go back to Reference|G" "bookmark-goto 0"
-               Item "Edit...|E" "next-inset-toggle"
-       End
-
-#
-# InsetCollapsable context menu
-#
-       Menu "context-collapsable"
-               Item "Open Inset|O" "next-inset-toggle open"
-               Item "Close Inset|C" "next-inset-toggle close"
-               Separator
-               OptItem "Settings...|S" "inset-settings"
-       End
-
-#
-# InsetBox context menu
-#
-
-       Menu "context-box"
-               Submenu "Change Type|y" "edit_boxtype"
-               Item "Settings...|S" "inset-settings box"
+       Menu "examples"
+               Item "Beamer Presentations|B" "help-open beamer"
+               Item "Braille|a" "help-open Braille"
+               Item "Colored boxes|r" "help-open colored-boxes"
+               Item "Feynman-diagram|F" "help-open FeynmanDiagrams"
+               Item "Knitr|K" "help-open knitr"
+               Item "LilyPond|P" "help-open lilypond"
+               Item "Linguistics|L" "help-open linguistics"
+               Item "Multilingual Captions|C" "help-open MultilingualCaptions"
+               Item "Paralist|t" "help-open paralist"
+               Item "PDF comments|D" "help-open PDF-comment"
+               Item "PDF forms|o" "help-open PDF-form"
+               Item "Hazard and Precautionary Statements|H" "help-open H-P-statements"
+               Item "Sweave|S" "help-open sweave"
+               Item "XY-pic|X" "help-open xypic"
        End
 
-       Menu "edit_boxtype"
-               Item "Frameless|l" "next-inset-modify changetype Frameless"
-               Item "Simple frame|f" "next-inset-modify changetype Boxed"
-               Item "Simple frame, page breaks|p" "next-inset-modify changetype Framed"
-               Item "Oval, thin|O" "next-inset-modify changetype ovalbox"
-               Item "Oval, thick|v" "next-inset-modify changetype Ovalbox"
-               Item "Drop Shadow|w" "next-inset-modify changetype Shadowbox"
-               Item "Shaded background|b" "next-inset-modify changetype Shaded"
-               Item "Double frame|D" "next-inset-modify changetype Doublebox"
-       End
-
-
-#
-# InsetNote context menu
-#
-
-       Menu "context-note"
-               Item "LyX Note|N" "next-inset-modify note Note Note"
-               Item "Comment|C" "next-inset-modify note Note Comment"
-               Item "Greyed Out|G" "next-inset-modify note Note Greyedout"
-       End
-
-
-#
-# InsetSpace context menu
-#
-       Menu "context-space"
-               Submenu "Change Type|y" "edit_spacetype"
-               Item "Edit...|E" "next-inset-toggle"
-       End
-
-       Menu "edit_spacetype"
-               Item "Interword Space|w" "next-inset-modify space \space{}"
-               Item "Protected Space|P" "next-inset-modify space ~"
-               Item "Thin Space|T" "next-inset-modify space \thinspace{}"
-               Item "Quad Space|Q" "next-inset-modify space \quad{}"
-               Item "QQuad Space|u" "next-inset-modify space \qquad{}"
-               Item "Enspace|E" "next-inset-modify space \enspace{}"
-               Item "Enskip|k" "next-inset-modify space \enskip{}"
-               Item "Negative Thin Space|N" "next-inset-modify space \negthinspace{}"
-               Item "Horizontal Fill|F" "next-inset-modify space \hfill{}"
-               Item "Protected Horizontal Fill|i" "next-inset-modify space \hspace*{\fill}"
-               Item "Horizontal Fill (Dots)|D" "next-inset-modify space \dotfill{}"
-               Item "Horizontal Fill (Rule)|R" "next-inset-modify space \hrulefill{}"
-               Item "Custom Length|C" "command-sequence next-inset-modify space \hspace{} \length 1in; next-inset-toggle"
-       End
-
-#
-# InsetVSpace context menu
-#
-       Menu "context-vspace"
-               Submenu "Change Type|y" "edit_vspacetype"
-               Item "Edit...|E" "next-inset-toggle"
-       End
-
-       Menu "edit_vspacetype"
-               Item "DefSkip|D" "next-inset-modify vspace defskip"
-               Item "SmallSkip|S" "next-inset-modify vspace smallskip"
-               Item "MedSkip|M" "next-inset-modify vspace medskip"
-               Item "BigSkip|B" "next-inset-modify vspace bigskip"
-               Item "VFill|F" "next-inset-modify vspace vfill"
-               Item "Custom|C" "command-sequence next-inset-modify vspace 1in; next-inset-toggle"
-       End
-
-#
-# Edit context menu
-#
-       Menu "context-edit"
-               Item "Cut" "cut"
-               Item "Copy" "copy"
-               Item "Paste" "paste"
-               Submenu "Paste Recent|e" "edit_pasterecent"
-               Separator
-               Item "Jump to Saved Bookmark|B" "bookmark-goto 0"
-               Separator
-               Item "Move Paragraph Up|o" "paragraph-move-up"
-               Item "Move Paragraph Down|v" "paragraph-move-down"
-               Separator
-               Item "Apply Last Text Style|A" "font-free-apply"
-               Submenu "Text Style|S" "edit_textstyles"
-               Item "Paragraph Settings...|P" "layout-paragraph"
-               Separator
-               Item "Fullscreen Mode" "ui-toggle fullscreen"
-       End
-
-#
-# Math Macro context menu
-#
-
-       Menu "context-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
-
-#
-# InsetListing context menu
-#
-
-       Menu "context-listings"
-               Item "Cut" "cut"
-               Item "Copy" "copy"
-               Item "Paste" "paste"
-               Submenu "Paste Recent|e" "edit_pasterecent"
-               Separator
-               Item "Settings...|S" "inset-settings listings"
-       End
-
-#
-# InsetGraphics context menu
-#
-
-       Menu "context-graphics"
-               Item "Edit...|E" "graphics-edit"
-               Separator
-               Item "Settings...|S" "next-inset-toggle"
-       End
 
 End
+