]> git.lyx.org Git - lyx.git/blobdiff - src/MenuBackend.C
float2string #4 (Spacing)
[lyx.git] / src / MenuBackend.C
index 4f44e3fa60379ddf7c9fe124c45aeeebef122161..294599d1cf3e0042c23799418b6aea525c7b3c9b 100644 (file)
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
+/**
+ * \file MenuBackend.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author André Pönitz
+ * \author Dekel Tsur
+ * \author Martin Vermeer
  *
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <algorithm>
 #include "MenuBackend.h"
-#include "lyxlex.h"
-#include "LyXAction.h"
-#include "debug.h"
-#include "gettext.h"
-#include "lastfiles.h"
+
+#include "BranchList.h"
+#include "buffer.h"
 #include "bufferlist.h"
-#include "converter.h"
+#include "bufferparams.h"
+#include "CutAndPaste.h"
+#include "debug.h"
 #include "exporter.h"
-#include "importer.h"
+#include "Floating.h"
 #include "FloatList.h"
-#include "support/LAssert.h"
+#include "format.h"
+#include "gettext.h"
+#include "importer.h"
+#include "kbmap.h"
+#include "lastfiles.h"
+#include "LyXAction.h"
+#include "lyx_main.h" // for lastfiles
+#include "lyxfunc.h"
+#include "lyxlex.h"
+#include "toc.h"
+
+#include "frontends/LyXView.h"
+
 #include "support/filetools.h"
-#include "support/lyxfunctional.h"
 #include "support/lstrings.h"
+#include "support/tostr.h"
 
-extern LyXAction lyxaction;
-extern LastFiles * lastfiles; 
-extern BufferList bufferlist;
+#include <boost/bind.hpp>
+
+#include <algorithm>
+
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::MakeDisplayPath;
+using lyx::support::token;
 
+using boost::bind;
+
+using std::auto_ptr;
 using std::endl;
-using std::vector;
-using std::pair;
+using std::equal_to;
 using std::find_if;
+using std::max;
 using std::sort;
+using std::string;
+using std::vector;
+
+
+extern BufferList bufferlist;
+extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
+
+namespace {
+
+class MenuNamesEqual : public std::unary_function<Menu, bool> {
+public:
+       MenuNamesEqual(string const & name)
+               : name_(name) {}
+       bool operator()(Menu const & menu) const
+       {
+               return menu.name() == name_;
+       }
+private:
+       string name_;
+};
+
+} // namespace anon
+
 
 // This is the global menu definition
 MenuBackend menubackend;
 
 
-MenuItem::MenuItem(Kind kind, string const & label, 
-                  string const & command, bool optional) 
-       : kind_(kind), label_(label), optional_(optional)
+MenuItem::MenuItem(Kind kind)
+       : kind_(kind), optional_(false)
+{}
+
+
+MenuItem::MenuItem(Kind kind, string const & label,
+                  string const & submenu, bool optional)
+       : kind_(kind), label_(label),
+         submenuname_(submenu), optional_(optional)
 {
-       switch (kind) {
-       case Separator:
-       case Documents:
-       case Lastfiles:
-       case Toc:
-       case ViewFormats:
-       case UpdateFormats:
-       case ExportFormats:
-       case ImportFormats:
-       case FloatListInsert:
-       case FloatInsert:
-               break;
-       case Command:
-               action_ = lyxaction.LookupFunc(command);
+       BOOST_ASSERT(kind == Submenu);
+}
 
-               if (action_ == LFUN_UNKNOWN_ACTION) {
-                       lyxerr << "MenuItem(): LyX command `"
-                              << command << "' does not exist." << endl; 
-               }
-               if (optional_)
-                       lyxerr[Debug::GUI] << "Optional item " 
-                                          << command << endl; 
-               break;
-       case Submenu:
-               submenu_ = command;
-               break;
-       }
+
+MenuItem::MenuItem(Kind kind, string const & label,
+                  FuncRequest const & func, bool optional)
+       : kind_(kind), label_(label), func_(func), optional_(optional)
+{
+       func_.origin = FuncRequest::UI;
 }
 
-string const MenuItem::label() const 
-{ 
-       return token(label_, '|', 0); 
+
+MenuItem::~MenuItem()
+{}
+
+
+void MenuItem::submenu(Menu * menu)
+{
+       submenu_.reset(menu);
+}
+
+
+string const MenuItem::label() const
+{
+       return token(label_, '|', 0);
 }
 
+
 string const MenuItem::shortcut() const
-{ 
-       return token(label_, '|', 1); 
+{
+       return token(label_, '|', 1);
+}
+
+
+string const MenuItem::binding() const
+{
+       if (kind_ != Command)
+               return string();
+
+       // Get the keys bound to this action, but keep only the
+       // first one later
+       kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_);
+
+       if (bindings.size()) {
+               return bindings.begin()->print();
+       } else {
+               lyxerr[Debug::KBMAP]
+                       << "No binding for "
+                       << lyxaction.getActionName(func_.action)
+                       << '(' << func_.argument << ')' << endl;
+               return string();
+       }
+
 }
 
 
-Menu & Menu::add(MenuItem const & i)
+Menu & Menu::add(MenuItem const & i, LyXView const * view)
 {
-       items_.push_back(i);
+       if (!view) {
+               items_.push_back(i);
+               return *this;
+       }
+
+       switch (i.kind()) {
+
+       case MenuItem::Command: {
+               FuncStatus status =
+                       view->getLyXFunc().getStatus(i.func());
+               if (status.unknown()
+                   || (!status.enabled() && i.optional()))
+                       break;
+               items_.push_back(i);
+               items_.back().status(status);
+               break;
+       }
+
+       case MenuItem::Submenu: {
+               if (i.submenu()) {
+                       bool enabled = false;
+                       for (const_iterator cit = i.submenu()->begin();
+                            cit != i.submenu()->end(); ++cit) {
+                               if ((cit->kind() == MenuItem::Command
+                                    || cit->kind() == MenuItem::Submenu)
+                                   && cit->status().enabled()) {
+                                       enabled = true;
+                                       break;
+                               }
+                       }
+                       if (enabled || !i.optional()) {
+                               items_.push_back(i);
+                               items_.back().status().enabled(enabled);
+                       }
+               }
+               else
+                       items_.push_back(i);
+               break;
+       }
+
+       case MenuItem::Separator:
+               if (!items_.empty()
+                   && items_.back().kind() != MenuItem::Separator)
+                       items_.push_back(i);
+               break;
+
+       default:
+               items_.push_back(i);
+       }
+
        return *this;
 }
 
@@ -101,12 +214,15 @@ Menu & Menu::read(LyXLex & lex)
 {
        enum Menutags {
                md_item = 1,
+               md_branches,
                md_documents,
+               md_charstyles,
                md_endmenu,
                md_exportformats,
                md_importformats,
                md_lastfiles,
                md_optitem,
+               md_optsubmenu,
                md_separator,
                md_submenu,
                md_toc,
@@ -114,10 +230,13 @@ Menu & Menu::read(LyXLex & lex)
                md_viewformats,
                md_floatlistinsert,
                md_floatinsert,
+               md_pasterecent,
                md_last
        };
 
        struct keyword_item menutags[md_last - 1] = {
+               { "branches", md_branches },
+               { "charstyles", md_charstyles },
                { "documents", md_documents },
                { "end", md_endmenu },
                { "exportformats", md_exportformats },
@@ -126,7 +245,9 @@ Menu & Menu::read(LyXLex & lex)
                { "importformats", md_importformats },
                { "item", md_item },
                { "lastfiles", md_lastfiles },
-               { "optitem", md_optitem }, 
+               { "optitem", md_optitem },
+               { "optsubmenu", md_optsubmenu },
+               { "pasterecent", md_pasterecent },
                { "separator", md_separator },
                { "submenu", md_submenu },
                { "toc", md_toc },
@@ -151,8 +272,8 @@ Menu & Menu::read(LyXLex & lex)
                        string const name = _(lex.getString());
                        lex.next(true);
                        string const command = lex.getString();
-                       add(MenuItem(MenuItem::Command, name, 
-                                    command, optional));
+                       FuncRequest func = lyxaction.lookupFunc(command);
+                       add(MenuItem(MenuItem::Command, name, func, optional));
                        optional = false;
                        break;
                }
@@ -165,6 +286,10 @@ Menu & Menu::read(LyXLex & lex)
                        add(MenuItem(MenuItem::Lastfiles));
                        break;
 
+               case md_charstyles:
+                       add(MenuItem(MenuItem::CharStyles));
+                       break;
+
                case md_documents:
                        add(MenuItem(MenuItem::Documents));
                        break;
@@ -196,13 +321,26 @@ Menu & Menu::read(LyXLex & lex)
                case md_floatinsert:
                        add(MenuItem(MenuItem::FloatInsert));
                        break;
-                       
+
+               case md_pasterecent:
+                       add(MenuItem(MenuItem::PasteRecent));
+                       break;
+
+               case md_branches:
+                       add(MenuItem(MenuItem::Branches));
+                       break;
+
+               case md_optsubmenu:
+                       optional = true;
+                       // fallback to md_submenu
                case md_submenu: {
                        lex.next(true);
                        string const mlabel = _(lex.getString());
                        lex.next(true);
                        string const mname = lex.getString();
-                       add(MenuItem(MenuItem::Submenu, mlabel, mname));
+                       add(MenuItem(MenuItem::Submenu, mlabel, mname,
+                                    optional));
+                       optional = false;
                        break;
                }
 
@@ -211,7 +349,7 @@ Menu & Menu::read(LyXLex & lex)
                        break;
 
                default:
-                       lex.printError("menubar::read: "
+                       lex.printError("Menu::read: "
                                       "Unknown menu tag: `$$Token'");
                        break;
                }
@@ -221,10 +359,24 @@ Menu & Menu::read(LyXLex & lex)
 }
 
 
+MenuItem const & Menu::operator[](size_type i) const
+{
+       return items_[i];
+}
+
+
+bool Menu::hasFunc(FuncRequest const & func) const
+{
+       return find_if(begin(), end(),
+                      bind(std::equal_to<FuncRequest>(),
+                           bind(&MenuItem::func, _1),
+                           func)) != end();
+}
+
 void Menu::checkShortcuts() const
 {
        // This is a quadratic algorithm, but we do not care because
-       // it is used for debugging only.
+       // menus are short enough
        for (const_iterator it1 = begin(); it1 != end(); ++it1) {
                string shortcut = it1->shortcut();
                if (shortcut.empty())
@@ -233,9 +385,9 @@ void Menu::checkShortcuts() const
                        lyxerr << "Menu warning: menu entry \""
                               << it1->label()
                               << "\" does not contain shortcut `"
-                              << shortcut << '\'' << endl;
+                              << shortcut << "'." << endl;
                for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
-                       if (!compare_no_case(it2->shortcut(), shortcut)) {
+                       if (!compare_ascii_no_case(it2->shortcut(), shortcut)) {
                                lyxerr << "Menu warning: menu entries "
                                       << '"' << it1->fulllabel()
                                       << "\" and \"" << it2->fulllabel()
@@ -246,173 +398,424 @@ void Menu::checkShortcuts() const
        }
 }
 
+
+void MenuBackend::specialMenu(string const &name)
+{
+       if (hasMenu(name))
+               specialmenu_ = &getMenu(name);
+}
+
+
 namespace {
 
 class compare_format {
 public:
        bool operator()(Format const * p1, Format const * p2) {
-               return *p1 < *p2;       
+               return *p1 < *p2;
        }
 };
 
-} // namespace anon
+string const limit_string_length(string const & str)
+{
+       string::size_type const max_item_length = 45;
+
+       if (str.size() > max_item_length)
+               return str.substr(0, max_item_length - 3) + "...";
+       else
+               return str;
+}
 
 
-void Menu::expand(Menu & tomenu, Buffer * buf) const
+void expandLastfiles(Menu & tomenu, LyXView const * view)
 {
-       for (const_iterator cit = begin();
-            cit != end() ; ++cit) {
-               switch (cit->kind()) {
-               case MenuItem::Lastfiles: {
-                       int ii = 1;
-                       LastFiles::const_iterator lfit = lastfiles->begin();
-                       LastFiles::const_iterator end = lastfiles->end();
-                       
-                       for (; lfit != end && ii < 10; ++lfit, ++ii) {
-                               string const label = tostr(ii) + ". "
-                                       + MakeDisplayPath((*lfit), 30)
-                                       + '|' + tostr(ii);
-                               int const action = lyxaction.
-                                       getPseudoAction(LFUN_FILE_OPEN,
-                                                       (*lfit));
-                               tomenu.add(MenuItem(MenuItem::Command,
-                                                   label, action));
+       LastFiles const & lastfiles = LyX::cref().lastfiles();
+
+       int ii = 1;
+       LastFiles::const_iterator lfit = lastfiles.begin();
+       LastFiles::const_iterator end = lastfiles.end();
+
+       for (; lfit != end && ii < 10; ++lfit, ++ii) {
+               string const label = tostr(ii) + ". "
+                       + MakeDisplayPath((*lfit), 30)
+                       + '|' + tostr(ii);
+               tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view);
+       }
+}
+
+void expandDocuments(Menu & tomenu, LyXView const * view)
+{
+       typedef vector<string> Strings;
+       Strings const names = bufferlist.getFileNames();
+
+       if (names.empty()) {
+               tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"),
+                                   FuncRequest(LFUN_NOACTION)), view);
+               return;
+       }
+
+       int ii = 1;
+       Strings::const_iterator docit = names.begin();
+       Strings::const_iterator end = names.end();
+       for (; docit != end; ++docit, ++ii) {
+               string label = MakeDisplayPath(*docit, 20);
+               if (ii < 10)
+                       label = tostr(ii) + ". " + label + '|' + tostr(ii);
+               tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view);
+       }
+}
+
+
+void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
+{
+       if (!view->buffer() && kind != MenuItem::ImportFormats) {
+               tomenu.add(MenuItem(MenuItem::Command,
+                                   _("No Documents Open!"),
+                                   FuncRequest(LFUN_NOACTION)),
+                                   view);
+               return;
+       }
+
+       typedef vector<Format const *> Formats;
+       Formats formats;
+       kb_action action;
+
+       switch (kind) {
+       case MenuItem::ImportFormats:
+               formats = Importer::GetImportableFormats();
+               action = LFUN_IMPORT;
+               break;
+       case MenuItem::ViewFormats:
+               formats = Exporter::GetExportableFormats(*view->buffer(), true);
+               action = LFUN_PREVIEW;
+               break;
+       case MenuItem::UpdateFormats:
+               formats = Exporter::GetExportableFormats(*view->buffer(), true);
+               action = LFUN_UPDATE;
+               break;
+       default:
+               formats = Exporter::GetExportableFormats(*view->buffer(), false);
+               action = LFUN_EXPORT;
+       }
+       sort(formats.begin(), formats.end(), compare_format());
+
+       Formats::const_iterator fit = formats.begin();
+       Formats::const_iterator end = formats.end();
+       for (; fit != end ; ++fit) {
+               if ((*fit)->dummy())
+                       continue;
+               string label = (*fit)->prettyname();
+               // we need to hide the default graphic export formats
+               // from the external menu, because we need them only
+               // for the internal lyx-view and external latex run
+               if (label == "EPS" || label == "XPM" || label == "PNG")
+                       continue;
+
+               if (kind == MenuItem::ImportFormats) {
+                       if ((*fit)->name() == "text")
+                               label = _("ASCII text as lines");
+                       else if ((*fit)->name() == "textparagraph")
+                               label = _("ASCII text as paragraphs");
+                       label += "...";
+               }
+               if (!(*fit)->shortcut().empty())
+                       label += '|' + (*fit)->shortcut();
+
+               tomenu.add(MenuItem(MenuItem::Command, label,
+                                   FuncRequest(action, (*fit)->name())),
+                          view);
+       }
+}
+
+
+void expandFloatListInsert(Menu & tomenu, LyXView const * view)
+{
+       if (!view->buffer()) {
+               tomenu.add(MenuItem(MenuItem::Command,
+                                   _("No Documents Open!"),
+                                   FuncRequest(LFUN_NOACTION)),
+                          view);
+               return;
+       }
+
+       FloatList const & floats =
+               view->buffer()->params().getLyXTextClass().floats();
+       FloatList::const_iterator cit = floats.begin();
+       FloatList::const_iterator end = floats.end();
+       for (; cit != end; ++cit) {
+               tomenu.add(MenuItem(MenuItem::Command,
+                                   _(cit->second.listName()),
+                                   FuncRequest(LFUN_FLOAT_LIST,
+                                               cit->second.type())),
+                          view);
+       }
+}
+
+
+void expandFloatInsert(Menu & tomenu, LyXView const * view)
+{
+       if (!view->buffer()) {
+               tomenu.add(MenuItem(MenuItem::Command,
+                                   _("No Documents Open!"),
+                                   FuncRequest(LFUN_NOACTION)),
+                          view);
+               return;
+       }
+
+       FloatList const & floats =
+               view->buffer()->params().getLyXTextClass().floats();
+       FloatList::const_iterator cit = floats.begin();
+       FloatList::const_iterator end = floats.end();
+       for (; cit != end; ++cit) {
+               // normal float
+               string const label = _(cit->second.name());
+               tomenu.add(MenuItem(MenuItem::Command, label,
+                                   FuncRequest(LFUN_INSET_FLOAT,
+                                               cit->second.type())),
+                          view);
+       }
+}
+
+
+void expandCharStyleInsert(Menu & tomenu, LyXView const * view)
+{
+       if (!view->buffer()) {
+               tomenu.add(MenuItem(MenuItem::Command,
+                                   _("No Documents Open!"),
+                                   FuncRequest(LFUN_NOACTION)),
+                          view);
+               return;
+       }
+       CharStyles & charstyles =
+               view->buffer()->params().getLyXTextClass().charstyles();
+       CharStyles::iterator cit = charstyles.begin();
+       CharStyles::iterator end = charstyles.end();
+       for (; cit != end; ++cit) {
+               string const label = cit->name;
+               tomenu.add(MenuItem(MenuItem::Command, label,
+                                   FuncRequest(LFUN_INSERT_CHARSTYLE,
+                                               cit->name)), view);
+       }
+}
+
+
+Menu::size_type const max_number_of_items = 25;
+
+void expandToc2(Menu & tomenu,
+               lyx::toc::Toc const & toc_list,
+               lyx::toc::Toc::size_type from,
+               lyx::toc::Toc::size_type to, int depth)
+{
+       int shortcut_count = 0;
+       if (to - from <= max_number_of_items) {
+               for (lyx::toc::Toc::size_type i = from; i < to; ++i) {
+                       string label(4 * max(0, toc_list[i].depth - depth),' ');
+                       label += limit_string_length(toc_list[i].str);
+                       if (toc_list[i].depth == depth
+                           && shortcut_count < 9) {
+                               if (label.find(tostr(shortcut_count + 1)) != string::npos)
+                                       label += '|' + tostr(++shortcut_count);
                        }
+                       tomenu.add(MenuItem(MenuItem::Command, label,
+                                           FuncRequest(toc_list[i].action())));
                }
-               break;
-               
-               case MenuItem::Documents: {
-                       typedef vector<string> Strings;
-                       
-                       Strings const names = bufferlist.getFileNames();
-                       
-                       if (names.empty()) {
+       } else {
+               lyx::toc::Toc::size_type pos = from;
+               while (pos < to) {
+                       lyx::toc::Toc::size_type new_pos = pos + 1;
+                       while (new_pos < to &&
+                              toc_list[new_pos].depth > depth)
+                               ++new_pos;
+
+                       string label(4 * max(0, toc_list[pos].depth - depth), ' ');
+                       label += limit_string_length(toc_list[pos].str);
+                       if (toc_list[pos].depth == depth &&
+                           shortcut_count < 9) {
+                               if (label.find(tostr(shortcut_count + 1)) != string::npos)
+                                       label += '|' + tostr(++shortcut_count);
+                               }
+                       if (new_pos == pos + 1) {
                                tomenu.add(MenuItem(MenuItem::Command,
-                                                   _("No Documents Open!"),
-                                                   LFUN_NOACTION));
-                               break;
+                                                   label, FuncRequest(toc_list[pos].action())));
+                       } else {
+                               MenuItem item(MenuItem::Submenu, label);
+                               item.submenu(new Menu);
+                               expandToc2(*item.submenu(),
+                                          toc_list, pos, new_pos, depth + 1);
+                               tomenu.add(item);
                        }
+                       pos = new_pos;
+               }
+       }
+}
 
-                       Strings::const_iterator docit = names.begin();
-                       Strings::const_iterator end = names.end();
-                       for (; docit != end ; ++docit) {
-                               int const action = lyxaction
-                                       .getPseudoAction(LFUN_SWITCHBUFFER,
-                                                        *docit);
-                               string const label =
-                                       MakeDisplayPath(*docit, 30);
-                               tomenu.add(MenuItem(MenuItem::Command,
-                                                   label, action));
-                       }
+
+void expandToc(Menu & tomenu, LyXView const * view)
+{
+       // To make things very cleanly, we would have to pass view to
+       // all MenuItem constructors and to expandToc2. However, we
+       // know that all the entries in a TOC will be have status_ ==
+       // OK, so we avoid this unnecessary overhead (JMarc)
+
+       if (!view->buffer()) {
+               tomenu.add(MenuItem(MenuItem::Command,
+                                   _("No Documents Open!"),
+                                   FuncRequest(LFUN_NOACTION)),
+                          view);
+               return;
+       }
+
+       lyx::toc::TocList toc_list = lyx::toc::getTocList(*view->buffer());
+       lyx::toc::TocList::const_iterator cit = toc_list.begin();
+       lyx::toc::TocList::const_iterator end = toc_list.end();
+       for (; cit != end; ++cit) {
+               // Handle this later
+               if (cit->first == "TOC")
+                       continue;
+
+               // All the rest is for floats
+               auto_ptr<Menu> menu(new Menu);
+               lyx::toc::Toc::const_iterator ccit = cit->second.begin();
+               lyx::toc::Toc::const_iterator eend = cit->second.end();
+               for (; ccit != eend; ++ccit) {
+                       string const label = limit_string_length(ccit->str);
+                       menu->add(MenuItem(MenuItem::Command,
+                                          label,
+                                          FuncRequest(ccit->action())));
                }
-               break;
+               string const & floatName = cit->first;
+               // Is the _(...) really needed here? (Lgb)
+               MenuItem item(MenuItem::Submenu, _(floatName));
+               item.submenu(menu.release());
+               tomenu.add(item);
+       }
+
+       // Handle normal TOC
+       cit = toc_list.find("TOC");
+       if (cit == end) {
+               tomenu.add(MenuItem(MenuItem::Command,
+                                   _("No Table of contents"),
+                                   FuncRequest()),
+                          view);
+       } else {
+               expandToc2(tomenu, cit->second, 0, cit->second.size(), 0);
+       }
+}
+
+
+void expandPasteRecent(Menu & tomenu, LyXView const * view)
+{
+       if (!view || !view->buffer())
+               return;
+
+       vector<string> const sel =
+               lyx::cap::availableSelections(*view->buffer());
+
+       vector<string>::const_iterator cit = sel.begin();
+       vector<string>::const_iterator end = sel.end();
+
+       for (unsigned int index = 0; cit != end; ++cit, ++index) {
+               tomenu.add(MenuItem(MenuItem::Command, *cit,
+                                   FuncRequest(LFUN_PASTE, tostr(index))));
+       }
+}
+
+
+void expandBranches(Menu & tomenu, LyXView const * view)
+{
+       if (!view || !view->buffer())
+               return;
+
+       BufferParams const & params = view->buffer()->params();
+
+       std::list<Branch>::const_iterator cit = params.branchlist().begin();
+       std::list<Branch>::const_iterator end = params.branchlist().end();
+
+       for (int ii = 1; cit != end; ++cit, ++ii) {
+               string label = cit->getBranch();
+               if (ii < 10)
+                       label = tostr(ii) + ". " + label + "|" + tostr(ii);
+               tomenu.add(MenuItem(MenuItem::Command, label,
+                                   FuncRequest(LFUN_INSERT_BRANCH,
+                                               cit->getBranch())), view);
+       }
+}
+
+
+} // namespace anon
+
+
+void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
+                        LyXView const * view) const
+{
+       for (Menu::const_iterator cit = frommenu.begin();
+            cit != frommenu.end() ; ++cit) {
+               switch (cit->kind()) {
+               case MenuItem::Lastfiles:
+                       expandLastfiles(tomenu, view);
+                       break;
+
+               case MenuItem::Documents:
+                       expandDocuments(tomenu, view);
+                       break;
 
                case MenuItem::ImportFormats:
                case MenuItem::ViewFormats:
                case MenuItem::UpdateFormats:
-               case MenuItem::ExportFormats: {
-                       typedef vector<Format const *> Formats;
-                       
-                       Formats formats;
-                       
-                       kb_action action;
-                       switch (cit->kind()) {
-                       case MenuItem::ImportFormats:
-                               formats = Importer::GetImportableFormats();
-                               action = LFUN_IMPORT;
-                               break;
-                       case MenuItem::ViewFormats:
-                               formats = Exporter::GetExportableFormats(buf, true); 
-                               action = LFUN_PREVIEW;
-                               break;
-                       case MenuItem::UpdateFormats:
-                               formats = Exporter::GetExportableFormats(buf, true); 
-                               action = LFUN_UPDATE;
-                               break;
-                       default:
-                               formats = Exporter::GetExportableFormats(buf, false); 
-                               action = LFUN_EXPORT;
-                       }
-                       sort(formats.begin(), formats.end(), compare_format());
-
-                       Formats::const_iterator fit = formats.begin();
-                       Formats::const_iterator end = formats.end();
-                       
-                       for (; fit != end ; ++fit) {
-                               if ((*fit)->dummy())
-                                       continue;
-                               string label = (*fit)->prettyname();
-                               if (cit->kind() == MenuItem::ImportFormats)
-                                       if ((*fit)->name() == "text")
-                                               label = _("Ascii text as lines");
-                                       else if ((*fit)->name() == "textparagraph")
-                                               label = _("Ascii text as paragraphs");
-                               if (!(*fit)->shortcut().empty())
-                                       label += "|" + (*fit)->shortcut();
-                               int const action2 = lyxaction.
-                                       getPseudoAction(action,
-                                                       (*fit)->name());
-                               tomenu.add(MenuItem(MenuItem::Command,
-                                                   label, action2));
-                       }
-               }
-               break;
+               case MenuItem::ExportFormats:
+                       expandFormats(cit->kind(), tomenu, view);
+                       break;
+
+               case MenuItem::CharStyles:
+                       expandCharStyleInsert(tomenu, view);
+                       break;
 
                case MenuItem::FloatListInsert:
-               {
-                       FloatList::const_iterator cit = floatList.begin();
-                       FloatList::const_iterator end = floatList.end();
-                       for (; cit != end; ++cit) {
-                               int const action =  lyxaction
-                                       .getPseudoAction(LFUN_FLOAT_LIST,
-                                                        cit->second.type());
-                               string label = _("List of ");
-                               label += cit->second.name();
-                               tomenu.add(MenuItem(MenuItem::Command,
-                                                   label, action));
-                       }
-               }
-               break;
+                       expandFloatListInsert(tomenu, view);
+                       break;
 
                case MenuItem::FloatInsert:
-               {
-                       FloatList::const_iterator cit = floatList.begin();
-                       FloatList::const_iterator end = floatList.end();
-                       for (; cit != end; ++cit) {
-                               // normal float
-                               int const action = lyxaction
-                                       .getPseudoAction(LFUN_INSET_FLOAT,
-                                                        cit->second.type());
-                               string const label = cit->second.name();
-                               tomenu.add(MenuItem(MenuItem::Command,
-                                                   label, action));
-                               
-                               // and the wide version
-                               int const action2 = lyxaction
-                                       .getPseudoAction(LFUN_INSET_WIDE_FLOAT,
-                                                        cit->second.type());
-                               string const label2 = _("Wide ") + label;
-                               tomenu.add(MenuItem(MenuItem::Command,
-                                                   label2, action2));
-                       }
+                       expandFloatInsert(tomenu, view);
+                       break;
+
+               case MenuItem::PasteRecent:
+                       expandPasteRecent(tomenu, view);
+                       break;
+
+               case MenuItem::Branches:
+                       expandBranches(tomenu, view);
+                       break;
+
+               case MenuItem::Toc:
+                       expandToc(tomenu, view);
+                       break;
+
+               case MenuItem::Submenu: {
+                       MenuItem item(*cit);
+                       item.submenu(new Menu(cit->submenuname()));
+                       expand(getMenu(cit->submenuname()),
+                              *item.submenu(), view);
+                       tomenu.add(item, view);
                }
                break;
-               
-               default:
-                       tomenu.add(*cit);
+
+               case MenuItem::Separator:
+                       tomenu.add(*cit, view);
+                       break;
+
+               case MenuItem::Command:
+                       if (!specialmenu_
+                           || !specialmenu_->hasFunc(cit->func()))
+                               tomenu.add(*cit, view);
                }
        }
 
-       // Check whether the shortcuts are unique
-       if (lyxerr.debugging(Debug::GUI))
-               checkShortcuts();
-}
-
+       // we do not want the menu to end with a separator
+       if (!tomenu.empty()
+           && tomenu.items_.back().kind() == MenuItem::Separator)
+               tomenu.items_.pop_back();
 
-bool Menu::hasSubmenu(string const & name) const
-{
-       return find_if(begin(), end(),
-                      lyx::compare_memfun(&MenuItem::submenu, name)) != end();
+       // Check whether the shortcuts are unique
+       tomenu.checkShortcuts();
 }
 
 
@@ -432,7 +835,7 @@ void MenuBackend::read(LyXLex & lex)
        };
 
        //consistency check
-       if (compare_no_case(lex.getString(), "menuset")) {
+       if (compare_ascii_no_case(lex.getString(), "menuset")) {
                lyxerr << "Menubackend::read: ERROR wrong token:`"
                       << lex.getString() << '\'' << endl;
        }
@@ -442,29 +845,22 @@ void MenuBackend::read(LyXLex & lex)
                lex.printTable(lyxerr);
 
        bool quit = false;
-       bool menubar = false;
 
        while (lex.isOK() && !quit) {
                switch (lex.lex()) {
-               case md_menubar: 
-                       menubar = true;
-                       // fallback to md_menu
+               case md_menubar:
+                       menubar_.read(lex);
+                       break;
                case md_menu: {
                        lex.next(true);
                        string const name = lex.getString();
                        if (hasMenu(name)) {
-                               if (getMenu(name).menubar() == menubar) {
-                                       getMenu(name).read(lex);
-                               } else {
-                                       lex.printError("Cannot append to menu `$$Token' unless it is of the same type");
-                                       return;
-                               }
-                       } else {                                
-                               Menu menu(name, menubar);
+                               getMenu(name).read(lex);
+                       } else {
+                               Menu menu(name);
                                menu.read(lex);
                                add(menu);
                        }
-                       menubar = false;
                        break;
                }
                case md_endmenuset:
@@ -480,65 +876,6 @@ void MenuBackend::read(LyXLex & lex)
 }
 
 
-void MenuBackend::defaults()
-{
-       menulist_.clear();
-
-       lyxerr[Debug::GUI] << "MenuBackend::defaults: using default values" 
-                          << endl;
-
-       Menu file("file");
-       file
-               .add(MenuItem(MenuItem::Command, _("New...|N"), "buffer-new"))
-               .add(MenuItem(MenuItem::Command, _("Open...|O"), "buffer-open"))
-               .add(MenuItem(MenuItem::Submenu, _("Import|I"), "import"))
-               .add(MenuItem(MenuItem::Command, _("Quit|Q"), "lyx-quit"))
-               .add(MenuItem(MenuItem::Separator))
-               .add(MenuItem(MenuItem::Lastfiles));
-       add(file);
-
-       Menu import("import");
-       import
-               .add(MenuItem(MenuItem::Command,
-                             _("LaTeX...|L"), "buffer-import latex"))
-               .add(MenuItem(MenuItem::Command,
-                             _("LinuxDoc...|L"), "buffer-import linuxdoc"));
-       add(import);
-       Menu edit("edit");
-       edit
-               .add(MenuItem(MenuItem::Command, _("Cut"), "cut"))
-               .add(MenuItem(MenuItem::Command, _("Copy"), "copy"))
-               .add(MenuItem(MenuItem::Command, _("Paste"), "paste"))
-               .add(MenuItem(MenuItem::Command, _("Emphasize"), "font-emph"));
-       add(edit);
-
-       Menu documents("documents");
-       documents.add(MenuItem(MenuItem::Documents));
-       add(documents);
-
-       Menu main("main", true);
-       main
-               .add(MenuItem(MenuItem::Submenu, _("File|F"), "file"))
-               .add(MenuItem(MenuItem::Submenu, _("Edit|E"), "edit"))
-               .add(MenuItem(MenuItem::Submenu,
-                             _("Documents|D"), "documents"));
-       add(main);
-
-       Menu main_nobuffer("main_nobuffer", true);
-       main_nobuffer.add(MenuItem(MenuItem::Submenu, _("File|F"), "file"));
-       add(main_nobuffer);
-
-       if (lyxerr.debugging(Debug::GUI)) {
-               for (const_iterator cit = begin();
-                   cit != end() ; ++cit)
-                       lyxerr << "Menu name: " << cit->name() 
-                              << ", Menubar: " << cit->menubar() 
-                              << endl;
-       }
-}
-
-
 void MenuBackend::add(Menu const & menu)
 {
        menulist_.push_back(menu);
@@ -547,25 +884,31 @@ void MenuBackend::add(Menu const & menu)
 
 bool MenuBackend::hasMenu(string const & name) const
 {
-       return find_if(begin(), end(),
-                      lyx::compare_memfun(&Menu::name, name)) != end();
+       return find_if(begin(), end(), MenuNamesEqual(name)) != end();
 }
 
 
 Menu const & MenuBackend::getMenu(string const & name) const
 {
-       const_iterator cit = find_if(begin(), end(),
-                                    lyx::compare_memfun(&Menu::name, name));
-       lyx::Assert(cit != end());
+       const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name));
+       if (cit == end())
+               lyxerr << "No submenu named " << name << endl;
+       BOOST_ASSERT(cit != end());
        return (*cit);
 }
 
 
 Menu & MenuBackend::getMenu(string const & name)
 {
-       MenuList::iterator it =
-               find_if(menulist_.begin(), menulist_.end(),
-                       lyx::compare_memfun(&Menu::name, name));
-       lyx::Assert(it != menulist_.end());
+       iterator it = find_if(begin(), end(), MenuNamesEqual(name));
+       if (it == end())
+               lyxerr << "No submenu named " << name << endl;
+       BOOST_ASSERT(it != end());
        return (*it);
 }
+
+
+Menu const & MenuBackend::getMenubar() const
+{
+       return menubar_;
+}