Added support for natively zipped file formats that do not need decompression for...

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

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 01cd795bd9ff4cf622d50c37048247625b852cab..01d9cdcefe442a6f7917597f97e413cfc09698ac 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -203,9 +203,10 @@ bool InsetBranch::isBranchSelected() const
 }
 
 
-int InsetBranch::latex(odocstream & os, OutputParams const & runparams) const
+void InsetBranch::latex(otexstream & os, OutputParams const & runparams) const
 {
-       return isBranchSelected() ?  InsetText::latex(os, runparams) : 0;
+       if (isBranchSelected())
+               InsetText::latex(os, runparams);
 }
 
 
@@ -215,11 +216,8 @@ int InsetBranch::plaintext(odocstream & os,
        if (!isBranchSelected())
                return 0;
 
-       os << '[' << buffer().B_("branch") << ' ' << params_.branch << ":\n";
-       InsetText::plaintext(os, runparams);
-       os << "\n]";
-
-       return PLAINTEXT_NEWLINE + 1; // one char on a separate line
+       int len = InsetText::plaintext(os, runparams);
+       return len;
 }
 
 
@@ -233,7 +231,7 @@ int InsetBranch::docbook(odocstream & os,
 docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
        if (isBranchSelected())
-                return InsetText::xhtml(xs, rp);
+               xhtmlParagraphs(text(), buffer(), xs, rp);
        return docstring();
 }
 
@@ -245,6 +243,13 @@ void InsetBranch::toString(odocstream & os) const
 }
 
 
+void InsetBranch::forToc(docstring & os, size_t maxlen) const
+{
+       if (isBranchSelected())
+               InsetCollapsable::forToc(os, maxlen);
+}
+
+
 void InsetBranch::validate(LaTeXFeatures & features) const
 {
        if (isBranchSelected())
@@ -287,14 +292,15 @@ void InsetBranch::string2params(string const & in, InsetBranchParams & params)
 }
 
 
-void InsetBranch::addToToc(DocIterator const & cpit)
+void InsetBranch::addToToc(DocIterator const & cpit) const
 {
        DocIterator pit = cpit;
-       pit.push_back(CursorSlice(*this));
+       pit.push_back(CursorSlice(const_cast<InsetBranch &>(*this)));
 
        Toc & toc = buffer().tocBackend().toc("branch");
-       docstring const str = params_.branch + ": " + text().getPar(0).asString();
-       toc.push_back(TocItem(pit, 0, str, toolTipText()));
+       docstring str = params_.branch + ": ";
+       text().forToc(str, TOC_ENTRY_LENGTH);
+       toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
        // Proceed with the rest of the inset.
        InsetCollapsable::addToToc(cpit);
 }