X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.h;h=6106ce5a5c3babbd8923c8783d5e2a2d59cf9b6b;hb=997f0621c5346bb623cf86713c4fe1be0c941104;hp=ecd2f7d7e2b5ffdeec15201629240705ead56043;hpb=8b00b355ca7012ca703c78a8be89193ac6435fcb;p=lyx.git

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index ecd2f7d7e2..6106ce5a5c 100644
--- 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 {
 
@@ -20,13 +20,17 @@ class InsetBranchParams {
 public:
 	///
 	explicit InsetBranchParams(docstring const & b = docstring())
-		: branch(b) {}
+		: branch(b), inverted(false) {}
+	InsetBranchParams(docstring const & b, bool i)
+		: branch(b), inverted(i) {}
 	///
 	void write(std::ostream & os) const;
 	///
 	void read(Lexer & lex);
 	///
 	docstring branch;
+	///
+	bool inverted;
 };
 
 
@@ -38,7 +42,7 @@ public:
 
 /// The Branch inset for alternative, conditional output.
 
-class InsetBranch : public InsetCollapsable
+class InsetBranch : public InsetCollapsible
 {
 public:
 	///
@@ -52,41 +56,39 @@ public:
 	docstring branch() const { return params_.branch; }
 	///
 	void rename(docstring const & newname) { params_.branch = newname; }
+	///
+	InsetBranchParams const & params() const { return params_; }
 
 private:
 	///
-	InsetCode lyxCode() const { return BRANCH_CODE; }
+	InsetCode lyxCode() const override { return BRANCH_CODE; }
 	///
-	void write(std::ostream &) const;
+	void write(std::ostream &) const override;
 	///
-	void read(Lexer & lex);
+	void read(Lexer & lex) override;
 	///
-	docstring const buttonLabel(BufferView const & bv) const;
+	docstring const buttonLabel(BufferView const &) const override;
 	///
-	ColorCode backgroundColor(PainterInfo const &) const;
+	ColorCode backgroundColor(PainterInfo const &) const override;
 	///
-	void latex(otexstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const override;
 	///
 	int plaintext(odocstringstream & ods, OutputParams const & op,
-	              size_t max_length = INT_MAX) const;
+	              size_t max_length = INT_MAX) const override;
 	///
-	int docbook(odocstream &, OutputParams const &) const;
+	void docbook(XMLStream &, OutputParams const &) const override;
 	///
-	docstring xhtml(XHTMLStream &, OutputParams const &) const;
+	docstring xhtml(XMLStream &, OutputParams const &) const override;
 	///
-	void toString(odocstream &) const;
+	void toString(odocstream &) const override;
 	///
-	void forOutliner(docstring &, size_t) const;
+	void forOutliner(docstring &, size_t const, bool const) const override;
 	///
-	void validate(LaTeXFeatures &) const;
+	void validate(LaTeXFeatures &) const override;
 	///
-	std::string contextMenuName() const;
-	///
-	void addToToc(DocIterator const & di, bool output_active) const;
-	///
-	InsetBranchParams const & params() const { return params_; }
+	std::string contextMenuName() const override;
 	///
-	void setParams(InsetBranchParams const & params) { params_ = params; }
+	void updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted = false) override;
 
 	/** \returns true if params_.branch is listed as 'selected' in
 		\c buffer. \p child only checks within child documents.
@@ -95,24 +97,24 @@ private:
 	/*!
 	 * 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 override;
 	///
-	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const override;
 	///
-	bool isMacroScope() const;
+	bool isMacroScope() const override;
 	///
-	docstring toolTip(BufferView const & bv, int x, int y) const;
+	docstring toolTip(BufferView const & bv, int x, int y) const override;
 	///
-	bool usePlainLayout() const { return false; }
+	bool usePlainLayout() const override { return false; }
 	///
-	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	void doDispatch(Cursor & cur, FuncRequest & cmd) override;
 	///
-	docstring layoutName() const { return from_ascii("Branch:") + branch(); }
+	docstring layoutName() const override { return from_ascii("Branch:") + branch(); }
 	///
-	Inset * clone() const { return new InsetBranch(*this); }
+	Inset * clone() const override { return new InsetBranch(*this); }
 
 	///
 	friend class InsetBranchParams;