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 b608fd19cc1a7a509331095e908eeee5dfed3f5f..c51c728e4f1610a4ce2a070a2cd11087f6240e78 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -14,7 +14,6 @@
 
 #include "InsetCollapsable.h"
 
-
 namespace lyx {
 
 class InsetBranchParams {
@@ -43,18 +42,18 @@ class InsetBranch : public InsetCollapsable
 {
 public:
        ///
-       InsetBranch(Buffer const &, InsetBranchParams const &);
-       ///
-       ~InsetBranch();
+       InsetBranch(Buffer *, InsetBranchParams const &);
 
        ///
        static std::string params2string(InsetBranchParams const &);
        ///
        static void string2params(std::string const &, InsetBranchParams &);
+       ///
+       docstring branch() const { return params_.branch; }
+       ///
+       void rename(docstring const & newname) { params_.branch = newname; }
 
 private:
-       ///
-       docstring editMessage() const;
        ///
        InsetCode lyxCode() const { return BRANCH_CODE; }
        ///
@@ -62,29 +61,31 @@ private:
        ///
        void read(Lexer & lex);
        ///
-       void setButtonLabel();
+       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;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       void textString(odocstream &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       ///
+       void toString(odocstream &) const;
+       ///
+       void forToc(docstring &, size_t) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
-       void addToToc(DocIterator const &);
+       docstring contextMenuName() const;
+       ///
+       void addToToc(DocIterator const &) const;
        ///
        InsetBranchParams const & params() const { return params_; }
        ///
        void setParams(InsetBranchParams const & params) { params_ = params; }
-       ///
-       virtual bool usePlainLayout() { return false; }
 
        /** \returns true if params_.branch is listed as 'selected' in
            \c buffer. This handles the case of child documents.
@@ -108,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); }