citation patch from Angus

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index a5ab17d0a4c2194d2f4ef9d267a160e34dd505f4..6e6b2c7282a9a3082397083b7b73f0905f74f72b 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -38,6 +38,11 @@ MenuItem::MenuItem(Kind kind, string const & label,
        case Separator:
        case Documents:
        case Lastfiles:
+       case Toc:
+       case References:
+       case ViewFormats:
+       case UpdateFormats:
+       case ExportFormats:
                break;
        case Command:
                action_ = lyxaction.LookupFunc(command);
@@ -64,27 +69,37 @@ Menu & Menu::add(MenuItem const & i)
 }
 
 
-void Menu::read(LyXLex & lex)
+Menu & Menu::read(LyXLex & lex)
 {
        enum Menutags {
                md_item = 1,
                md_documents,
                md_endmenu,
+               md_exportformats,
                md_lastfiles,
                md_optitem,
-               md_submenu,
+               md_references,
                md_separator,
+               md_submenu,
+               md_toc,
+               md_updateformats,
+               md_viewformats,
                md_last
        };
 
        struct keyword_item menutags[md_last-1] = {
                { "documents", md_documents },
                { "end", md_endmenu },
+               { "exportformats", md_exportformats },
                { "item", md_item },
                { "lastfiles", md_lastfiles },
                { "optitem", md_optitem }, 
+               { "references", md_references },
                { "separator", md_separator },
-               { "submenu", md_submenu }
+               { "submenu", md_submenu },
+               { "toc", md_toc },
+               { "updateformats", md_updateformats },
+               { "viewformats", md_viewformats }
        };
 
        lex.pushTable(menutags, md_last - 1);
@@ -111,15 +126,39 @@ void Menu::read(LyXLex & lex)
                        optional = false;
                        break;
                }
+
                case md_separator:
                        add(MenuItem(MenuItem::Separator));
                        break;
+
                case md_lastfiles:
                        add(MenuItem(MenuItem::Lastfiles));
                        break;
+
                case md_documents:
                        add(MenuItem(MenuItem::Documents));
                        break;
+
+               case md_toc:
+                       add(MenuItem(MenuItem::Toc));
+                       break;
+
+               case md_references:
+                       add(MenuItem(MenuItem::References));
+                       break;
+
+               case md_viewformats:
+                       add(MenuItem(MenuItem::ViewFormats));
+                       break;
+
+               case md_updateformats:
+                       add(MenuItem(MenuItem::UpdateFormats));
+                       break;
+
+               case md_exportformats:
+                       add(MenuItem(MenuItem::ExportFormats));
+                       break;
+
                case md_submenu: {
                        lex.next();
                        char * tmp = strdup(lex.GetString().c_str());
@@ -130,9 +169,11 @@ void Menu::read(LyXLex & lex)
                        add(MenuItem(MenuItem::Submenu, mlabel, mname));
                        break;
                }
+
                case md_endmenu:
                        quit = true;
                        break;
+
                default:
                        lex.printError("menubar::read: "
                                       "Unknown menu tag: `$$Token'");
@@ -140,6 +181,7 @@ void Menu::read(LyXLex & lex)
                }
        }
        lex.popTable();
+       return *this;
 }
 
 
@@ -168,23 +210,29 @@ 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_menu: {
                        lex.next();
                        string name = lex.GetString();
-                       Menu menu(name, false);
-                       menu.read(lex);
-                       add(menu);
-                       break;
-               }
-               case md_menubar: {
-                       lex.next();
-                       string name = lex.GetString();
-                       Menu menubar(name, true);
-                       menubar.read(lex);
-                       add(menubar);
+                       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);
+                               menu.read(lex);
+                               add(menu);
+                       }
+                       menubar = false;
                        break;
                }
                case md_endmenuset:
@@ -267,7 +315,8 @@ void MenuBackend::add(Menu const & menu)
 
 bool MenuBackend::hasMenu(string const & name) const
 {
-       for (const_iterator cit = begin(); cit != end(); ++cit) {
+       const_iterator mend = end();
+       for (const_iterator cit = begin(); cit != mend; ++cit) {
                if ((*cit).name() == name)
                        return true;
        }
@@ -277,10 +326,25 @@ bool MenuBackend::hasMenu(string const & name) const
 
 Menu const & MenuBackend::getMenu(string const & name) const
 {
-       for (const_iterator cit = begin(); cit != end(); ++cit) {
+       const_iterator mend = end();
+       for (const_iterator cit = begin(); cit != mend; ++cit) {
+               if ((*cit).name() == name)
+                       return (*cit);
+       }
+       Assert(false); // we actually require the name to exist.
+       return menulist_.front();
+}
+
+
+Menu & MenuBackend::getMenu(string const & name)
+{
+       MenuList::iterator end = menulist_.end();
+       for (MenuList::iterator cit = menulist_.begin(); 
+            cit != end; ++cit) {
                if ((*cit).name() == name)
                        return (*cit);
        }
        Assert(false); // we actually require the name to exist.
        return menulist_.front();
 }
+