Allow row-breaking after some insets

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

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index beca1c683bee7b42dd5acffdefe1dcb4a2b1c4d2..1723fd1484276d88297195ed680051b7651c0e14 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -12,7 +12,7 @@
 #ifndef INSETBRANCH_H
 #define INSETBRANCH_H
 
-#include "InsetCollapsable.h"
+#include "InsetCollapsible.h"
 
 namespace lyx {
 
@@ -42,7 +42,7 @@ public:
 
 /// The Branch inset for alternative, conditional output.
 
-class InsetBranch : public InsetCollapsable
+class InsetBranch : public InsetCollapsible
 {
 public:
        ///
@@ -78,7 +78,7 @@ private:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void toString(odocstream &) const;
        ///
@@ -88,26 +88,19 @@ private:
        ///
        std::string contextMenuName() const;
        ///
-       void addToToc(DocIterator const & di, bool output_active,
-                                 UpdateType utype) const;
-       ///
-       void setParams(InsetBranchParams const & params) { params_ = params; }
+       void updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted = false);
 
        /** \returns true if params_.branch is listed as 'selected' in
                \c buffer. \p child only checks within child documents.
         */
        bool isBranchSelected(bool const child = false) const;
-       ///
-       bool isBranchActive(bool const child = false) const
-               // XOR
-               { return isBranchSelected(child) != params_.inverted; }
        /*!
         * Is the content of this inset part of the output document?
         *
-        * Note that Branch insets are only considered part of the
-        * document when they are selected.
+        * Note that Branch insets are considered part of the
+        * document when they are selected XOR inverted.
         */
-       bool producesOutput() const { return isBranchSelected(); }
+       bool producesOutput() const;
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///