Better TOC output for XHTML, per Rob and Pavel.

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

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 3995de23dfb86afeebf84b323cad6b24c04979da..c51c728e4f1610a4ce2a070a2cd11087f6240e78 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -14,7 +14,6 @@
 
 #include "InsetCollapsable.h"
 
-
 namespace lyx {
 
 class InsetBranchParams {
@@ -44,8 +43,6 @@ class InsetBranch : public InsetCollapsable
 public:
        ///
        InsetBranch(Buffer *, InsetBranchParams const &);
-       ///
-       ~InsetBranch();
 
        ///
        static std::string params2string(InsetBranchParams const &);
@@ -66,11 +63,9 @@ private:
        ///
        docstring const buttonLabel(BufferView const & bv) const;
        ///
-       ColorCode backgroundColor() const;
+       ColorCode backgroundColor(PainterInfo const &) const;
        ///
-       bool showInsetDialog(BufferView *) const;
-       ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -78,13 +73,15 @@ private:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       void tocString(odocstream &) const;
+       void toString(odocstream &) const;
+       ///
+       void forToc(docstring &, size_t) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       docstring contextMenuName() const;
        ///
-       void addToToc(DocIterator const &);
+       void addToToc(DocIterator const &) const;
        ///
        InsetBranchParams const & params() const { return params_; }
        ///
@@ -112,7 +109,7 @@ private:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       docstring name() const { return from_ascii("Branch"); }
+       docstring layoutName() const { return from_ascii("Branch"); }
        ///
        Inset * clone() const { return new InsetBranch(*this); }