Helge's infamous brackets bug

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 294599d1cf3e0042c23799418b6aea525c7b3c9b..89101d55e66943ca0ef604845eae7eea5bf32f96 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -41,7 +41,7 @@
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
 
@@ -435,13 +435,14 @@ void expandLastfiles(Menu & tomenu, LyXView const * view)
        LastFiles::const_iterator end = lastfiles.end();
 
        for (; lfit != end && ii < 10; ++lfit, ++ii) {
-               string const label = tostr(ii) + ". "
+               string const label = convert<string>(ii) + ". "
                        + MakeDisplayPath((*lfit), 30)
-                       + '|' + tostr(ii);
+                       + '|' + convert<string>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view);
        }
 }
 
+
 void expandDocuments(Menu & tomenu, LyXView const * view)
 {
        typedef vector<string> Strings;
@@ -459,7 +460,7 @@ void expandDocuments(Menu & tomenu, LyXView const * view)
        for (; docit != end; ++docit, ++ii) {
                string label = MakeDisplayPath(*docit, 20);
                if (ii < 10)
-                       label = tostr(ii) + ". " + label + '|' + tostr(ii);
+                       label = convert<string>(ii) + ". " + label + '|' + convert<string>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view);
        }
 }
@@ -512,9 +513,9 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
 
                if (kind == MenuItem::ImportFormats) {
                        if ((*fit)->name() == "text")
-                               label = _("ASCII text as lines");
+                               label = _("Plain Text as Lines");
                        else if ((*fit)->name() == "textparagraph")
-                               label = _("ASCII text as paragraphs");
+                               label = _("Plain Text as Paragraphs");
                        label += "...";
                }
                if (!(*fit)->shortcut().empty())
@@ -606,14 +607,23 @@ void expandToc2(Menu & tomenu,
                lyx::toc::Toc::size_type to, int depth)
 {
        int shortcut_count = 0;
+
+       // check whether depth is smaller than the smallest depth in toc.
+       int min_depth = 1000;
+       for (lyx::toc::Toc::size_type i = from; i < to; ++i)
+               min_depth = std::min(min_depth, toc_list[i].depth);
+       if (min_depth > depth)
+               depth = min_depth;
+
+
        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);
+                               if (label.find(convert<string>(shortcut_count + 1)) != string::npos)
+                                       label += '|' + convert<string>(++shortcut_count);
                        }
                        tomenu.add(MenuItem(MenuItem::Command, label,
                                            FuncRequest(toc_list[i].action())));
@@ -630,8 +640,8 @@ void expandToc2(Menu & tomenu,
                        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 (label.find(convert<string>(shortcut_count + 1)) != string::npos)
+                                       label += '|' + convert<string>(++shortcut_count);
                                }
                        if (new_pos == pos + 1) {
                                tomenu.add(MenuItem(MenuItem::Command,
@@ -656,7 +666,9 @@ void expandToc(Menu & tomenu, LyXView const * view)
        // know that all the entries in a TOC will be have status_ ==
        // OK, so we avoid this unnecessary overhead (JMarc)
 
-       if (!view->buffer()) {
+
+       Buffer const * buf = view->buffer();
+       if (!buf) {
                tomenu.add(MenuItem(MenuItem::Command,
                                    _("No Documents Open!"),
                                    FuncRequest(LFUN_NOACTION)),
@@ -664,7 +676,8 @@ void expandToc(Menu & tomenu, LyXView const * view)
                return;
        }
 
-       lyx::toc::TocList toc_list = lyx::toc::getTocList(*view->buffer());
+       FloatList const & floatlist = buf->params().getLyXTextClass().floats();
+       lyx::toc::TocList toc_list = lyx::toc::getTocList(*buf);
        lyx::toc::TocList::const_iterator cit = toc_list.begin();
        lyx::toc::TocList::const_iterator end = toc_list.end();
        for (; cit != end; ++cit) {
@@ -682,8 +695,7 @@ void expandToc(Menu & tomenu, LyXView const * view)
                                           label,
                                           FuncRequest(ccit->action())));
                }
-               string const & floatName = cit->first;
-               // Is the _(...) really needed here? (Lgb)
+               string const & floatName = floatlist.getType(cit->first).listName();
                MenuItem item(MenuItem::Submenu, _(floatName));
                item.submenu(menu.release());
                tomenu.add(item);
@@ -715,7 +727,7 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view)
 
        for (unsigned int index = 0; cit != end; ++cit, ++index) {
                tomenu.add(MenuItem(MenuItem::Command, *cit,
-                                   FuncRequest(LFUN_PASTE, tostr(index))));
+                                   FuncRequest(LFUN_PASTE, convert<string>(index))));
        }
 }
 
@@ -725,15 +737,15 @@ void expandBranches(Menu & tomenu, LyXView const * view)
        if (!view || !view->buffer())
                return;
 
-       BufferParams const & params = view->buffer()->params();
+       BufferParams const & params = view->buffer()->getMasterBuffer()->params();
 
-       std::list<Branch>::const_iterator cit = params.branchlist().begin();
-       std::list<Branch>::const_iterator end = params.branchlist().end();
+       BranchList::const_iterator cit = params.branchlist().begin();
+       BranchList::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);
+                       label = convert<string>(ii) + ". " + label + "|" + convert<string>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label,
                                    FuncRequest(LFUN_INSERT_BRANCH,
                                                cit->getBranch())), view);