* BufferView::updateMetrics(): split up the method in two for the SinglePar case.

[lyx.git] / src / MenuBackend.cpp

diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp
index c81ce2759495fdfcf38862efdc71fe65ae37e267..fec705230dd64dddca6ce2f7518f36575a1abc3b 100644 (file)
--- a/src/MenuBackend.cpp
+++ b/src/MenuBackend.cpp
@@ -219,6 +219,7 @@ Menu & Menu::read(Lexer & lex)
                md_bookmarks,
                md_charstyles,
                md_custom,
+               md_elements,
                md_endmenu,
                md_exportformats,
                md_importformats,
@@ -243,6 +244,7 @@ Menu & Menu::read(Lexer & lex)
                { "charstyles", md_charstyles },
                { "custom", md_custom },
                { "documents", md_documents },
+               { "elements", md_elements },
                { "end", md_endmenu },
                { "exportformats", md_exportformats },
                { "floatinsert", md_floatinsert },
@@ -300,6 +302,10 @@ Menu & Menu::read(Lexer & lex)
                        add(MenuItem(MenuItem::Custom));
                        break;
 
+               case md_elements:
+                       add(MenuItem(MenuItem::Elements));
+                       break;
+
                case md_documents:
                        add(MenuItem(MenuItem::Documents));
                        break;
@@ -619,7 +625,7 @@ void expandFloatInsert(Menu & tomenu, Buffer const * buf)
 }
 
 
-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,
@@ -627,15 +633,15 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf, std::string s)
                                    FuncRequest(LFUN_NOACTION)));
                return;
        }
-       CharStyles & charstyles =
-               buf->params().getTextClass().charstyles();
-       CharStyles::iterator cit = charstyles.begin();
-       CharStyles::iterator end = charstyles.end();
+       InsetLayouts const & insetlayouts =
+               buf->params().getTextClass().insetlayouts();
+       InsetLayouts::const_iterator cit = insetlayouts.begin();
+       InsetLayouts::const_iterator end = insetlayouts.end();
        for (; cit != end; ++cit) {
-               docstring const label = from_utf8(cit->name);
-               if (cit->lyxtype == s)
+               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)));
        }
 }
@@ -884,11 +890,15 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
                        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: