Added inset-select-all to emacs bindings

[lyx.git] / src / insets / InsetBranch.cpp

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index db047c2f3d3085e5bbbd08fa7dea03dc6f44013d..144123f8712f00709ab1c7ce96dc1c07c357d601 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -106,11 +106,10 @@ docstring const InsetBranch::buttonLabel(BufferView const & bv) const
        docstring symb = docstring(1, char_type(master_selected ? 0x2714 : 0x2716));
        if (inchild && master_selected != child_selected)
                symb += char_type(child_selected ? 0x2714 : 0x2716);
-       s = symb + s;
        if (decoration() == InsetLayout::CLASSIC)
-               return isOpen(bv) ? s : getNewLabel(s);
+               return symb + (isOpen(bv) ? s : getNewLabel(s));
        else
-               return params_.branch + ": " + getNewLabel(s);
+               return symb + params_.branch + ": " + getNewLabel(s);
 }
 
 
@@ -263,13 +262,13 @@ void InsetBranch::latex(otexstream & os, OutputParams const & runparams) const
 }
 
 
-int InsetBranch::plaintext(odocstream & os,
-                          OutputParams const & runparams) const
+int InsetBranch::plaintext(odocstringstream & os,
+                          OutputParams const & runparams, size_t max_length) const
 {
        if (!isBranchSelected())
                return 0;
 
-       int len = InsetText::plaintext(os, runparams);
+       int len = InsetText::plaintext(os, runparams, max_length);
        return len;
 }
 
@@ -300,10 +299,10 @@ void InsetBranch::toString(odocstream & os) const
 }
 
 
-void InsetBranch::forToc(docstring & os, size_t maxlen) const
+void InsetBranch::forOutliner(docstring & os, size_t maxlen) const
 {
        if (isBranchSelected())
-               InsetCollapsable::forToc(os, maxlen);
+               InsetCollapsable::forOutliner(os, maxlen);
 }
 
 
@@ -349,17 +348,18 @@ void InsetBranch::string2params(string const & in, InsetBranchParams & params)
 }
 
 
-void InsetBranch::addToToc(DocIterator const & cpit) const
+void InsetBranch::addToToc(DocIterator const & cpit, bool output_active) const
 {
        DocIterator pit = cpit;
        pit.push_back(CursorSlice(const_cast<InsetBranch &>(*this)));
 
        Toc & toc = buffer().tocBackend().toc("branch");
        docstring str = params_.branch + ": ";
-       text().forToc(str, TOC_ENTRY_LENGTH);
-       toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
+       text().forOutliner(str, TOC_ENTRY_LENGTH);
+       toc.push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
        // Proceed with the rest of the inset.
-       InsetCollapsable::addToToc(cpit);
+       bool const doing_output = output_active && isBranchSelected();
+       InsetCollapsable::addToToc(cpit, doing_output);
 }