]> git.lyx.org Git - lyx.git/blobdiff - lib/ui/stdmenus.ui
add some missing LFUNs to the menu
[lyx.git] / lib / ui / stdmenus.ui
index cc184826112db31d1ad91f1078cb14ccf8ef7062..078628a49e86f5d0e3d62a49524fee5a3605ef23 100644 (file)
+# -*- text -*-
+
+# file stdmenus.ui
+# This file is part of LyX, the document processor.
+# Licence details can be found in the file COPYING.
+
+# author Jean-Marc Lasgouttes
+# author John Levon
+# author Michael Gerz
+
+# 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/)
+
 Menuset
 
-    Menubar
+       Menubar
 # Make the first 4 menus be as much as expected as possible
-       Submenu "File|F" "file"
-       Submenu "Edit|E" "edit"
-       Submenu "View|V" "view"
-       Submenu "Insert|I" "insert"
-       Submenu "Navigate|N" "navigate"
-       Submenu "Document|D" "document"
-       Submenu "Tools|T" "tools"
-       Submenu "Help|H" "help"
-    End
+               Submenu "File|F" "file"
+               Submenu "Edit|E" "edit"
+               Submenu "View|V" "view"
+               Submenu "Insert|I" "insert"
+               Submenu "Navigate|N" "navigate"
+               Submenu "Document|D" "document"
+               Submenu "Tools|T" "tools"
+               Submenu "Help|H" "help"
+       End
 
 #
 # FILE MENU
 #
 
-    Menu "file"
-       Item "New|N" "buffer-new"
-       Item "New from Template...|T" "buffer-new-template"
-       Item "Open...|O" "file-open"
+       Menu "file"
+               Item "New|N" "buffer-new"
+               Item "New from Template...|m" "buffer-new-template"
+               Item "Open...|O" "file-open"
 # This seems a much more sensible place to me
-       Submenu "Open recent|t" "lastfiles"
-       Separator
-       Item "Close|C" "buffer-close"
-       Item "Save|S" "buffer-write"
-       Item "Save As...|A" "buffer-write-as"
-       Item "Revert|R" "buffer-reload"
-       Submenu "Version Control|V" "file_vc"
-       Separator
-       Submenu "Import|I" "file_import"
-       Submenu "Export|E" "file_export"
-       Item "Print...|P" "buffer-print"
-       OptItem "Fax...|F" "buffer-export fax"
-       Separator
-       Item "Exit|x" "lyx-quit"
-    End
-
-    Menu "lastfiles"
-       Lastfiles
-    End
-    Menu "file_vc"
-       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 "Undo Last Check In|U" "vc-undo-last"
-       OptItem "Show History|H" "vc-history"
-    End
-
-    Menu "file_import"
-       ImportFormats
-    End
-
-    Menu "file_export"
-       ExportFormats
-       Item "Custom...|C" "buffer-export custom"
-    End
+               Submenu "Open recent|t" "lastfiles"
+               Separator
+               Item "Close|C" "buffer-close"
+               Item "Save|S" "buffer-write"
+               Item "Save As...|A" "buffer-write-as"
+               Item "Revert|R" "buffer-reload"
+               Submenu "Version Control|V" "file_vc"
+               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 "Exit|x" "lyx-quit"
+       End
+
+       Menu "lastfiles"
+               Lastfiles
+       End
+
+       Menu "file_vc"
+               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 "Undo Last Check In|U" "vc-undo-last"
+               OptItem "Show History|H" "dialog-show vclog"
+       End
+
+       Menu "file_import"
+               ImportFormats
+       End
+
+       Menu "file_export"
+               ExportFormats
+               Item "Custom...|C" "buffer-export custom"
+       End
 
 #
 # EDIT MENU
 #
 
-    Menu "edit"
-       Item "Undo|U" "undo"
-       Item "Redo|d" "redo"
-       Separator
-       Item "Cut" "cut"
-       Item "Copy" "copy"
-       Item "Paste" "paste"
-       Item "Find & Replace...|F" "find-replace"
-       Separator
-       Item "Text Style...|S" "layout-character"
-       Item "Paragraph Settings...|P" "layout-paragraph"
-       Separator
+       Menu "edit"
+               Item "Undo|U" "undo"
+               Item "Redo|R" "redo"
+               Separator
+               Item "Cut" "cut"
+               Item "Copy" "copy"
+               Item "Paste" "paste"
+               Submenu "Paste Recent" "pasterecent"
+               Submenu "Paste External Clipboard/Selection" "edit_paste"
+               Separator
+               Item "Find & Replace...|F" "dialog-show findreplace"
+               Separator
+               Item "Word in Small Capitals" "word-capitalize"
+               Item "Word in Uppercase" "word-upcase"
+               Item "Word in Lowercase" "word-lowcase"
+               Separator
+               Item "Text Style...|S" "dialog-show character"
+               Item "Paragraph Settings...|P" "layout-paragraph"
+               Separator
 # Mathed b0rkage means these don't work properly
-       OptSubmenu "Table|T" "edit_tabular"
-       OptSubmenu "Math|M" "edit_math"
-       Separator
-       OptItem "Increase List Depth|I" "depth-increment"
-       OptItem "Decrease List Depth|D" "depth-decrement"
+               OptSubmenu "Table|T" "edit_tabular"
+               OptSubmenu "Math|M" "edit_math"
+               OptSubmenu "Rows & Columns|C" "tabular_features"
+               Separator
+               OptItem "Increase List Depth|I" "depth-increment"
+               OptItem "Decrease List Depth|D" "depth-decrement"
 # This is where the context-specific stuff is supposed to go.
 # The idea is that everything on here can disappear and should
 # only appear when relevant (getStatus). Only stuff that needs
 # a right-click to bring up the dialog should appear here (it is not
 # obvious what the context is for the others)
-       OptItem "TeX Code Settings...|C" "inset-settings ert"
+               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 "Minipage Settings...|M" "inset-settings minipage"
-       OptItem "Text Wrap Settings...|W" "inset-settings wrap"
+               OptItem "Float Settings...|a" "inset-settings float"
+               OptItem "Text Wrap Settings...|W" "inset-settings wrap"
+               OptItem "Note Settings...|N" "inset-settings note"
+               OptItem "Branch Settings...|B" "inset-settings branch"
+               OptItem "Box Settings...|x" "inset-settings box"
 # 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"
-       OptItem "Table Settings...|a" "layout-tabular"
-    End
+               OptItem "Table Settings...|a" "layout-tabular"
+       End
+
+       Menu "edit_paste"
+               Item "Clipboard as Lines|C" "clipboard-paste"
+               Item "Clipboard as Paragraphs|a" "clipboard-paste paragraph"
+               Item "Selection as Lines|L" "primary-selection-paste"
+               Item "Selection as Paragraphs|P" "primary-selection-paste paragraph"
+       End
+
+       Menu "pasterecent"
+               PasteRecent
+       End
 
 # not much we can do to help here
-    Menu "edit_tabular"
-       Item "Add Row|A" "tabular-feature append-row"
-       Item "Delete Row|w" "tabular-feature delete-row"
-       Separator
-       Item "Add Column|u" "tabular-feature append-column"
-       Item "Delete Column|D" "tabular-feature delete-column"
-       Separator
-       Item "Multicolumn|M" "tabular-feature multicolumn"
-       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 "Left aligned|e" "tabular-feature align-left"
-       Item "Centered|C" "tabular-feature align-center"
-       Item "Right aligned|i" "tabular-feature align-right"
-       Item "Top aligned|o" "tabular-feature valign-top"
-       Item "Vertically Centered|V" "tabular-feature valign-center"
-       Item "Bottom aligned|g" "tabular-feature valign-bottom"
-    End
-
-    Menu "edit_math"
-       Item "Toggle Numbering|N" "math-number"
-       Item "Toggle Numbering of Line|u" "math-nonumber"
-       Submenu "Change Limits Type|L" "edit_math_limits"
-       Separator
-       Submenu "Change Formula Type|F" "edit_math_mutate"
-       Separator
-       Submenu "Use Computer Algebra System|S" "edit_math_extern"
-       Separator
-       Submenu "Alignment|A" "edit_math_align"
-       Separator
-       Item "Add Row|R" "tabular-feature append-row"
-       Item "Delete Row|D" "tabular-feature delete-row"
-       Item "Copy Row" "tabular-feature copy-row"
-       Item "Swap Rows" "tabular-feature swap-row"
-       Separator
-       Item "Add Column|C" "tabular-feature append-column"
-       Item "Delete Column|e" "tabular-feature delete-column"
-       Item "Copy Column" "tabular-feature copy-column"
-       Item "Swap Columns" "tabular-feature swap-column"
-    End
-
-    Menu "edit_math_limits"
-        Item "Default|t"  "math-limits empty"
-        Item "Display|D"  "math-limits limits"
-        Item "Inline|I"  "math-limits nolimits"
-    End
-
-    Menu "edit_math_extern"
-       Item "Octave" "math-extern octave"
-       Item "Maxima" "math-extern maxima"
-       Item "Mathematica" "math-extern mathematica"
-       Separator
-       Item "Maple, simplify" "math-extern maple simplify"
-       Item "Maple, factor" "math-extern maple factor"
-       Item "Maple, evalm" "math-extern maple evalm"
-       Item "Maple, evalf" "math-extern maple evalf"
-    End
-
-    Menu "edit_math_mutate"
-       Item "Inline Formula|I" "math-mutate simple"
-       Item "Displayed Formula|D" "math-mutate equation"
-       Item "Eqnarray Environment|q" "math-mutate eqnarray"
-       Item "Align Environment|A" "math-mutate align"
-       Item "AlignAt Environment" "math-mutate alignat"
-       Item "Flalign Environment|f" "math-mutate flalign"
-       Item "Gather Environment" "math-mutate gather"
-       Item "Multline Environment" "math-mutate multline"
-    End
-
-    Menu "edit_math_align"
-       Item "Left-aligned|L" "tabular-feature align-left"
-       Item "Centered|C" "tabular-feature align-center"
-       Item "Right-aligned|R" "tabular-feature align-right"
-       Separator
-       Item "Top-aligned|T" "tabular-feature valign-top"
-       Item "Centered Vertically|e" "tabular-feature valign-center"
-       Item "Bottom-aligned|B" "tabular-feature valign-bottom"
-    End
+       Menu "edit_tabular"
+               Item "Multicolumn|M" "tabular-feature multicolumn"
+               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
+       End
+
+       Menu "tabular_features"
+               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" "tabular-feature valign-top"
+               Item "Middle|M" "tabular-feature valign-middle"
+               Item "Bottom|B" "tabular-feature valign-bottom"
+               Separator
+               Item "Add Row" "tabular-feature append-row"
+               Item "Delete Row" "tabular-feature delete-row"
+               Item "Copy Row" "tabular-feature copy-row"
+               Item "Swap Rows" "tabular-feature swap-row"
+               Separator
+               Item "Add Column" "tabular-feature append-column"
+               Item "Delete Column" "tabular-feature delete-column"
+               Item "Copy Column" "tabular-feature copy-column"
+               Item "Swap Columns" "tabular-feature swap-column"
+       End
+
+       Menu "edit_math"
+               Item "Toggle Numbering|N" "math-number"
+               Item "Toggle Numbering of Line|u" "math-nonumber"
+               Submenu "Change Limits Type|L" "edit_math_limits"
+               Separator
+               Submenu "Change Formula Type|F" "edit_math_mutate"
+               Separator
+               Submenu "Use Computer Algebra System|S" "edit_math_extern"
+               Separator
+               Item "Add Line Above" "tabular-feature add-hline-above"
+               Item "Add Line Below" "tabular-feature add-hline-below"
+               Item "Delete Line Above" "tabular-feature delete-hline-above"
+               Item "Delete Line Below" "tabular-feature delete-hline-below"
+               Separator
+               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_limits"
+                Item "Default|t"  "math-limits empty"
+                Item "Display|D"  "math-limits limits"
+                Item "Inline|I"  "math-limits nolimits"
+       End
+
+       Menu "edit_math_extern"
+               Item "Octave" "math-extern octave"
+               Item "Maxima" "math-extern maxima"
+               Item "Mathematica" "math-extern mathematica"
+               Separator
+               Item "Maple, simplify" "math-extern maple simplify"
+               Item "Maple, factor" "math-extern maple factor"
+               Item "Maple, evalm" "math-extern maple evalm"
+               Item "Maple, evalf" "math-extern maple evalf"
+       End
+
+       Menu "edit_math_mutate"
+               Item "Inline Formula|I" "math-mutate simple"
+               Item "Displayed Formula|D" "math-mutate equation"
+               Item "Eqnarray Environment|q" "math-mutate eqnarray"
+               Item "AMS align Environment|a" "math-mutate align"
+               Item "AMS alignat Environment|t" "math-mutate alignat"
+               Item "AMS flalign Environment|f" "math-mutate flalign"
+               Item "AMS gather Environment|g" "math-mutate gather"
+               Item "AMS multline Environment|m" "math-mutate multline"
+       End
 
 #
 # VIEW MENU
 #
 
-    Menu "view"
+       Menu "view"
 # FIXME: this must become Open Footnote, Close Margin Note etc. as appropriate
 #      Item "Open Float|O" "inset-toggle"
 # A common feature request JMarc wants to see
 #      Item "Open All Footnotes|F" "open-footnotes"
 #      Item "Close All Footnotes|C" "close-footnotes"
-# FIXME: better in Document menu ? Not sure.
-       Item "Remove All Error Boxes|E" "error-remove-all"
-       Item "Display Tooltips|D" "toggle-tooltips"
-       Separator
-       Submenu "Update|U" "document_update"
-       ViewFormats
-       Separator
-        Documents
-    End
-    Menu "document_update"
-       UpdateFormats
-    End
+               Item "Display Tooltips|i" "tooltips-toggle"
+               Separator
+               Item "View source|s" "dialog-show view-source"
+               Submenu "Update|U" "document_update"
+               ViewFormats
+               Separator
+           Documents
+       End
+
+       Menu "document_update"
+               UpdateFormats
+       End
 
 #
 # INSERT MENU
 #
-    Menu "insert"
+       Menu "insert"
 # Try and group things a little better, and percolate the most
 # commonly used to good positions (exception being mathed, but
 # most people using mathed learn key shortcuts quite quickly anyway)
-       Submenu "Math|h" "insert_math"
-       Submenu "Special Character|S" "insert_special"
-       Submenu "Float|a" "insert_float"
-       Submenu "List / TOC|O" "insert_toc"
+               Submenu "Math|h" "insert_math"
+               Submenu "Special Character|S" "insert_special"
+               Submenu "Special Formatting|o" "insert_formatting"
+               Submenu "List / TOC|i" "insert_toc"
+               Submenu "Float|a" "insert_float"
 # YUCK
-       Submenu "File|e" "insert_file"
-       Separator
-       Item "Citation Reference...|C" "dialog-show-new-inset citation"
-       Item "Cross Reference...|R" "dialog-show-new-inset ref"
-       Item "Label...|L" "label-insert"
-       Item "Index Entry|I" "index-insert"
+               Submenu "Note|N" "insert_note"
+               OptSubmenu "Branch|B" "branches"
+               OptSubmenu "Character Style|y" "charstyle"
+               Submenu "File|e" "insert_file"
+               Item "Box" "box-insert Frameless"
+               Separator
+               Item "Citation...|C" "dialog-show-new-inset citation"
+               Item "Cross-reference...|r" "dialog-show-new-inset ref"
+               Item "Label...|L" "label-insert"
+               Item "Index Entry|d" "index-insert"
+               Item "Date" "date-insert"
 # I'm going to kill this dumb dialog, but for now ...
-       Separator
-       Item "Table...|T" "tabular-insert"
-       Item "Graphics...|G" "dialog-show-new-inset graphics"
-       Item "URL...|U" "url-insert"
-       Item "Footnote|F" "footnote-insert"
-       Item "Marginal Note|M" "marginalnote-insert"
-       Item "Note|N" "note-insert"
-       Item "Minipage|p" "minipage-insert"
-       Item "Short Title" "optional-insert"
-       Item "TeX|X" "ert-insert"
-       Item "External Material...|x" "dialog-show-new-inset external"
-       Item "Child document...|d" "dialog-show-new-inset include"
-    End
-
-    Menu "insert_special"
-       Item "Superscript|S" "command-sequence math-mode ; math-superscript ; font-free-apply; "
-       Item "Subscript|u" "command-sequence math-mode ; math-subscript ; font-free-apply; "
-       Item "Horizontal Fill|H" "hfill-insert"
-       Item "Hyphenation Point|P" "hyphenation-point-insert"
-       Item "Ligature Break|k" "ligature-break-insert"
-       Item "Protected Blank|B" "protected-space-insert"
-       Item "Linebreak|L" "break-line"
-       Item "Ellipsis|i" "dots-insert"
-       Item "End of Sentence|E" "end-of-sentence-period-insert"
-       Item "Ordinary Quote|Q" "self-insert \""
-       Item "Menu Separator|M" "menu-separator-insert"
-    End
-
-    Menu "insert_math"
-       Item "Inline Formula|I" "math-mode"
-       Item "Display Formula|D" "math-display"
-       Item "Eqnarray Environment|E" "command-sequence math-mode; math-mutate eqnarray;"
-       Item "AMS align Environment|A" "command-sequence math-mode; math-mutate align;"
-       Item "AMS alignat Environment|t" "command-sequence math-mode; math-mutate alignat;"
-       Item "AMS flalign Environment|f" "command-sequence math-mode; math-mutate flalign;"
-       Item "AMS gather Environment" "command-sequence math-mode; math-mutate gather;"
-       Item "AMS multline Environment" "command-sequence math-mode; math-mutate multline;"
-       Separator
-       Item "Array Environment|y" "math-matrix 2 2"
-       Item "Cases Environment|C" "math-insert \cases"
-       Separator
-       Submenu "Font Change|f" "insert_math_font"
-       Item "Math Panel|l" "math-panel"
-    End
-
-    Menu "insert_math_font"
-       Item "Math normal font" "math-insert \mathnormal"
-       Separator
-       Item "Math calligraphic family" "math-insert \mathcal"
-       Item "Math fraktur family" "math-insert \mathfrak"
-       Item "Math roman family" "math-insert \mathrm"
-       Item "Math sans serif family" "math-insert \mathsf"
-       Separator
-       Item "Math bold series" "math-insert \mathbf"
-       Separator
-       Item "Text normal font" "math-insert \textnormal"
-       Separator
-       Item "Text roman family" "math-insert \textrm"
-       Item "Text sans serif family" "math-insert \textsf"
-       Item "Text typewriter family" "math-insert \texttt"
-       Separator
-       Item "Text bold series" "math-insert \textbf"
-       Item "Text medium series" "math-insert \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"
-               End
-
-    Menu "insert_float"
-       FloatInsert
+               Separator
+               Item "Table...|T" "tabular-insert"
+               Item "Graphics...|G" "dialog-show-new-inset graphics"
+               Item "URL...|U" "url-insert"
+               Item "Footnote|F" "footnote-insert"
+               Item "Marginal Note|M" "marginalnote-insert"
+               Item "Short Title" "optional-insert"
+               Item "TeX Code|X" "ert-insert"
+       End
+
+       Menu "insert_special"
+               Item "Ellipsis|i" "dots-insert"
+               Item "End of Sentence|E" "end-of-sentence-period-insert"
+               Item "Ordinary Quote|Q" "self-insert \""
+               Item "Single Quote|S" "quote-insert single"
+               Item "Menu Separator|M" "menu-separator-insert"
+               Item "Phonetic Symbols|y" "command-sequence math-mode on; math-insert \text\textipa ; char-forward ;"
+       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;"
+               Separator
+               Item "Protected Space|r" "space-insert protected"
+               Item "Inter-word Space|w" "space-insert normal"
+               Item "Thin Space|T" "space-insert thin"
+               Item "Horizontal Fill|H" "hfill-insert"
+               Item "Horizontal Line" "line-insert"
+               Item "Vertical Space..." "dialog-show-new-inset vspace"
+               Separator
+               Item "Hyphenation Point|P" "hyphenation-point-insert"
+               Item "Ligature Break|k" "ligature-break-insert"
+               Item "Line Break|L" "break-line"
+               Item "Page Break" "pagebreak-insert"
+       End
+
+       Menu "insert_math"
+               Item "Inline Formula|I" "math-mode on"
+               Item "Display Formula|D" "math-display"
+               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;"
+               Item "AMS flalign Environment|f" "command-sequence math-mode on; math-mutate flalign;"
+               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
+               Item "Array Environment|y" "math-matrix 2 2"
+               Item "Cases Environment|C" "math-insert \cases"
+               Item "Aligned Environment" "command-sequence math-insert \aligned; tabular-feature append-column"
+               Item "AlignedAt Environment" "command-sequence math-insert \alignedat; tabular-feature append-column"
+               Item "Gathered Environment" "math-insert \gathered"
+               Item "Split Environment|S" "command-sequence math-insert \split; tabular-feature append-column"
+               Separator
+               Submenu "Font Change|o" "insert_math_font"
+               Item "Math Panel|P" "dialog-show mathpanel"
+       End
+
+       Menu "insert_math_font"
+               Item "Math Normal Font" "math-insert \mathnormal"
+               Separator
+               Item "Math Calligraphic Family" "math-insert \mathcal"
+               Item "Math Fraktur Family" "math-insert \mathfrak"
+               Item "Math Roman Family" "math-insert \mathrm"
+               Item "Math Sans Serif Family" "math-insert \mathsf"
+               Separator
+               Item "Math Bold Series" "math-insert \mathbf"
+               Separator
+               Item "Text Normal Font" "math-insert \textnormal"
+               Separator
+               Item "Text Roman Family" "math-insert \textrm"
+               Item "Text Sans Serif Family" "math-insert \textsf"
+               Item "Text Typewriter Family" "math-insert \texttt"
+               Separator
+               Item "Text Bold Series" "math-insert \textbf"
+               Item "Text Medium Series" "math-insert \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"
+                       End
+
+       Menu "insert_float"
+               FloatInsert
 # This has got to be better than "Wrap", anyway
-       Item "Text Wrap Float|W" "wrap-insert figure"
-    End
-
-    Menu "insert_toc"
-       Item "Table of Contents|C" "toc-insert"
-       FloatListInsert
-       Item "Index List|I" "index-print"
-       Item "BibTeX Reference...|B" "dialog-show-new-inset bibtex"
-    End
-
-    Menu "insert_file"
-       Item "LyX Document...|X" "file-insert"
-       Item "ASCII as Lines...|L" "file-insert-ascii"
-       Item "ASCII as Paragraphs...|P" "file-insert-ascii-para"
-    End
+               Item "Text Wrap Float|W" "wrap-insert figure"
+       End
+
+       Menu "insert_toc"
+               Item "Table of Contents|C" "toc-insert"
+               FloatListInsert
+               Item "Index List|I" "index-print"
+               Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex"
+       End
+
+       Menu "insert_file"
+               Item "LyX Document...|X" "file-insert"
+               Item "Plain Text as Lines...|L" "file-insert-ascii"
+               Item "Plain Text as Paragraphs...|P" "file-insert-ascii-para"
+               Separator
+               Item "External Material...|M" "dialog-show-new-inset external"
+               Item "Child Document...|d" "dialog-show-new-inset include"
+       End
+
+       Menu "insert_note"
+               Item "LyX Note|N" "note-insert Note"
+               Item "Comment|C" "note-insert Comment"
+               Item "Greyed Out|G" "note-insert Greyedout"
+       End
+
+       Menu "branches"
+               Branches
+       End
+
+       Menu "charstyle"
+               CharStyles
+       End
 
 #
 # DOCUMENT MENU
 #
-    Menu "document"
-       OptItem "Build Program|B" "build-program"
-       Item "LaTeX Log File...|L" "latex-view-log"
-       Item "Table of Contents...|T" "toc-view"
-       Separator
-       Submenu "Change tracking|C" "edit_change"
-       Item "LaTeX Preamble...|P" "layout-preamble"
-       Item "Settings...|S" "layout-document"
-       Item "Start Appendix Here|A" "appendix"
-    End
-    Menu "edit_change"
-       Item "Track changes|T" "track-changes"
-       Item "Merge changes...|M" "merge-changes"
-       Item "Accept all changes|A" "accept-all-changes"
-       Item "Reject all changes|R" "reject-all-changes"
-    End
+
+       Menu "document"
+               Submenu "Change Tracking|C" "edit_change"
+               OptItem "Build Program|B" "build-program"
+               Item "LaTeX Log|L" "dialog-show latexlog"
+               Item "Table of Contents|T" "toc-view"
+               Item "Start Appendix Here|A" "appendix"
+               Separator
+               Item "Compressed|o" "buffer-toggle-compression"
+               Item "Read-Only|R" "buffer-toggle-read-only"
+               Item "Settings...|S" "dialog-show document"
+       End
+
+       Menu "edit_change"
+               Item "Track Changes|T" "changes-track"
+               Item "Merge Changes...|M" "changes-merge"
+               Item "Accept Change|A" "change-accept"
+               Item "Reject Change|R" "change-reject"
+               Item "Accept All Changes|c" "all-changes-accept"
+               Item "Reject All Changes|e" "all-changes-reject"
+               Item "Show Changes in Output|S" "changes-output"
+       End
 
 #
 # NAVIGATE MENU
 #
-    Menu "navigate"
-       Submenu "Bookmarks|B" "navigate_bookmarks"
-       Item "Error|E" "error-next"
-       Item "Note|N" "note-next"
-       Item "Refs|R" "reference-goto"
-       Separator
-       Toc
-    End
-
-    Menu "navigate_bookmarks"
-       Item "Save Bookmark 1|S" "bookmark-save 1"
-       Item "Save Bookmark 2" "bookmark-save 2"
-       Item "Save Bookmark 3" "bookmark-save 3"
-       Separator
-       Item "Go to Bookmark 1|1" "bookmark-goto 1"
-       Item "Go to Bookmark 2|2" "bookmark-goto 2"
-       Item "Go to Bookmark 3|3" "bookmark-goto 3"
-    End
+       Menu "navigate"
+               Submenu "Bookmarks|B" "navigate_bookmarks"
+               Item "Next Note|N" "note-next"
+               Item "Go to Label|L" "label-goto"
+               Separator
+               Toc
+       End
+
+       Menu "navigate_bookmarks"
+               Item "Go to Bookmark 1|1" "bookmark-goto 1"
+               Item "Go to Bookmark 2|2" "bookmark-goto 2"
+               Item "Go to Bookmark 3|3" "bookmark-goto 3"
+               Item "Go to Bookmark 4|4" "bookmark-goto 4"
+               Item "Go to Bookmark 5|5" "bookmark-goto 5"
+               Separator
+               Item "Save Bookmark 1|S" "bookmark-save 1"
+               Item "Save Bookmark 2" "bookmark-save 2"
+               Item "Save Bookmark 3" "bookmark-save 3"
+               Item "Save Bookmark 4" "bookmark-save 4"
+               Item "Save Bookmark 5" "bookmark-save 5"
+       End
 
 #
 # TOOLS MENU
 #
-    Menu "tools"
-       Item "Spellchecker...|S" "spellchecker"
-       OptItem "Thesaurus...|T" "thesaurus-entry"
-       OptItem "Check TeX|h" "buffer-chktex"
-       Separator
-       Item "View Child Processes...|C" "show-forks"
-       Item "TeX Information...|I" "help-Texinfo"
-       Separator
+
+       Menu "tools"
+               Item "Spellchecker...|S" "dialog-show spellchecker"
+               OptItem "Thesaurus...|T" "thesaurus-entry"
+               Item "Count Words|W" "words-count"
+               OptItem "Check TeX|h" "buffer-chktex"
+               Item "TeX Information|I" "dialog-show texinfo"
+               Separator
 # A LOT of applications have Tools->Prefs. Remember this
 # should be rarely used - Edit menu is not a good place to
 # have it.
-       Item "Preferences...|P" "dialog-preferences"
-       Item "Reconfigure|R" "reconfigure"
-    End
+               Item "Reconfigure|R" "reconfigure"
+               Item "Preferences...|P" "dialog-show prefs"
+       End
+
 #
 # HELP MENU
 #
-    Menu "help"
-       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 "Customization|C" "help-open Customization"
-       Item "FAQ|F" "help-open FAQ"
-       Item "Table of Contents|a" "help-open TOC"
-       Item "LaTeX Configuration|L" "help-open LaTeXConfig"
-       Separator
-       Item "About LyX...|X" "help-aboutlyx"
-    End
+       Menu "help"
+               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 "Customization|C" "help-open Customization"
+               Item "FAQ|F" "help-open FAQ"
+               Item "Table of Contents|a" "help-open TOC"
+               Item "LaTeX Configuration|L" "help-open LaTeXConfig"
+               Separator
+               Item "About LyX|X" "dialog-show aboutlyx"
+       End
+
+#
+#  LYX MENU - this menu is only used by LyX/Mac
+#
+
+       Menu "LyX"
+               Item "About LyX" "dialog-show aboutlyx"
+               Item "Preferences..." "dialog-show prefs"
+               Item "Quit LyX" "lyx-quit"
+       End
 
 End