using std::sort;
using std::string;
using std::vector;
-
+using std::stack;
namespace {
md_bookmarks,
md_charstyles,
md_custom,
+ md_elements,
md_endmenu,
md_exportformats,
md_importformats,
{ "charstyles", md_charstyles },
{ "custom", md_custom },
{ "documents", md_documents },
+ { "elements", md_elements },
{ "end", md_endmenu },
{ "exportformats", md_exportformats },
{ "floatinsert", md_floatinsert },
add(MenuItem(MenuItem::Custom));
break;
+ case md_elements:
+ add(MenuItem(MenuItem::Elements));
+ break;
+
case md_documents:
add(MenuItem(MenuItem::Documents));
break;
}
+bool Menu::searchFunc(FuncRequest & func, stack<docstring> & names)
+{
+ const_iterator m = begin();
+ const_iterator m_end = end();
+ for (; m != m_end; ++m) {
+ if (m->kind() == MenuItem::Command && m->func() == func) {
+ names.push(m->label());
+ return true;
+ } else if (m->kind() == MenuItem::Submenu) {
+ names.push(m->label());
+ Menu submenu = menubackend.getMenu(m->submenuname());
+ if (submenu.searchFunc(func, names))
+ return true;
+ else
+ names.pop();
+ }
+ }
+ return false;
+}
+
+
void MenuBackend::specialMenu(Menu const & menu)
{
specialmenu_ = menu;
}
-void expandCharStyleInsert(Menu & tomenu, Buffer const * buf, std::string s)
+void expandFlexInsert(Menu & tomenu, Buffer const * buf, std::string s)
{
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
FuncRequest(LFUN_NOACTION)));
return;
}
- InsetLayouts & insetlayouts =
+ InsetLayouts const & insetlayouts =
buf->params().getTextClass().insetlayouts();
- InsetLayouts::iterator cit = insetlayouts.begin();
- InsetLayouts::iterator end = insetlayouts.end();
+ InsetLayouts::const_iterator cit = insetlayouts.begin();
+ InsetLayouts::const_iterator end = insetlayouts.end();
for (; cit != end; ++cit) {
docstring const label = cit->first;
if (cit->second.lyxtype == s)
tomenu.addWithStatusCheck(MenuItem(MenuItem::Command,
- label, FuncRequest(LFUN_CHARSTYLE_INSERT,
+ label, FuncRequest(LFUN_FLEX_INSERT,
label)));
}
}
break;
case MenuItem::CharStyles:
- expandCharStyleInsert(tomenu, buf, "charstyle");
+ expandFlexInsert(tomenu, buf, "charstyle");
break;
case MenuItem::Custom:
- expandCharStyleInsert(tomenu, buf, "custom");
+ expandFlexInsert(tomenu, buf, "custom");
+ break;
+
+ case MenuItem::Elements:
+ expandFlexInsert(tomenu, buf, "element");
break;
case MenuItem::FloatListInsert: