more cursor dispatch

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index b127b7fa99af113dab191eaad6031eba5c73374b..8c03ab0cb1acc9636f1351e23d6dfa27f3a27689 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -40,10 +40,11 @@
 #include "frontends/LyXView.h"
 
 #include "support/filetools.h"
-#include "support/lyxfunctional.h"
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
+#include <boost/bind.hpp>
+
 #include <algorithm>
 
 using lyx::support::compare_ascii_no_case;
@@ -51,7 +52,11 @@ using lyx::support::contains;
 using lyx::support::MakeDisplayPath;
 using lyx::support::token;
 
+using boost::bind;
+
+using std::auto_ptr;
 using std::endl;
+using std::equal_to;
 using std::find_if;
 using std::max;
 using std::sort;
@@ -62,6 +67,23 @@ 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;
 
@@ -190,6 +212,7 @@ Menu & Menu::read(LyXLex & lex)
                md_item = 1,
                md_branches,
                md_documents,
+               md_charstyles,
                md_endmenu,
                md_exportformats,
                md_importformats,
@@ -209,6 +232,7 @@ Menu & Menu::read(LyXLex & lex)
 
        struct keyword_item menutags[md_last - 1] = {
                { "branches", md_branches },
+               { "charstyles", md_charstyles },
                { "documents", md_documents },
                { "end", md_endmenu },
                { "exportformats", md_exportformats },
@@ -258,6 +282,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;
@@ -523,6 +551,28 @@ void expandFloatInsert(Menu & tomenu, LyXView const * 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,
@@ -598,7 +648,7 @@ void expandToc(Menu & tomenu, LyXView const * view)
                        continue;
 
                // All the rest is for floats
-               Menu * menu = new Menu;
+               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) {
@@ -610,7 +660,7 @@ void expandToc(Menu & tomenu, LyXView const * view)
                string const & floatName = cit->first;
                // Is the _(...) really needed here? (Lgb)
                MenuItem item(MenuItem::Submenu, _(floatName));
-               item.submenu(menu);
+               item.submenu(menu.release());
                tomenu.add(item);
        }
 
@@ -690,6 +740,10 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
                        expandFormats(cit->kind(), tomenu, view);
                        break;
 
+               case MenuItem::CharStyles:
+                       expandCharStyleInsert(tomenu, view);
+                       break;
+
                case MenuItem::FloatListInsert:
                        expandFloatListInsert(tomenu, view);
                        break;
@@ -736,9 +790,22 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
 
 bool Menu::hasSubmenu(string const & name) const
 {
+#if 1
        return find_if(begin(), end(),
-                      lyx::compare_memfun(&MenuItem::submenuname,
-                                          name)) != end();
+                      bind(std::equal_to<string>(),
+                           bind(&MenuItem::submenuname, _1),
+                           name)) != end();
+#else
+       // I would have prefered this, but I am not sure if it
+       // makes a difference. (Lgb)
+       return find_if(
+               make_transform_iterator(begin(),
+                                       bind(&MenuItem::submenuname, _1)),
+               make_transform_iterator(end(),
+                                       bind(&MenuItem::submenuname, _1)),
+               name
+               ).base() != end();
+#endif
 }
 
 
@@ -807,15 +874,13 @@ 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));
+       const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name));
        if (cit == end())
                lyxerr << "No submenu named " << name << endl;
        BOOST_ASSERT(cit != end());
@@ -825,10 +890,10 @@ Menu const & MenuBackend::getMenu(string const & name) const
 
 Menu & MenuBackend::getMenu(string const & name)
 {
-       MenuList::iterator it =
-               find_if(menulist_.begin(), menulist_.end(),
-                       lyx::compare_memfun(&Menu::name, name));
-       BOOST_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);
 }