X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2FInsetBranch.h;h=4100a631ccd6261180113112280f8687f0829f1d;hb=12c7e7dde3851ad894380fd42ba741dd3d0cbcc7;hp=72d30a263ff199fd3c614a7d1da606e7ab39d278;hpb=897436efbb9bd641b61467d185a2dfae9839e575;p=lyx.git

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 72d30a263f..4100a631cc 100644
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -13,15 +13,12 @@
 #define INSETBRANCH_H
 
 #include "InsetCollapsable.h"
-#include "MailInset.h"
-
 
 namespace lyx {
 
-class Buffer;
-
 class InsetBranchParams {
 public:
+	///
 	explicit InsetBranchParams(docstring const & b = docstring())
 		: branch(b) {}
 	///
@@ -33,41 +30,57 @@ public:
 };
 
 
-/** The Branch inset for alternative, conditional output.
+/////////////////////////////////////////////////////////////////////////
+//
+// InsetBranch
+//
+/////////////////////////////////////////////////////////////////////////
 
-*/
-class InsetBranch : public InsetCollapsable {
+/// The Branch inset for alternative, conditional output.
+
+class InsetBranch : public InsetCollapsable
+{
 public:
 	///
-	InsetBranch(BufferParams const &, InsetBranchParams const &);
+	InsetBranch(Buffer *, InsetBranchParams const &);
+
+	///
+	static std::string params2string(InsetBranchParams const &);
+	///
+	static void string2params(std::string const &, InsetBranchParams &);
+	///
+	docstring branch() const { return params_.branch; }
 	///
-	~InsetBranch();
+	void rename(docstring const & newname) { params_.branch = newname; }
+
+private:
 	///
-	virtual docstring const editMessage() const;
+	InsetCode lyxCode() const { return BRANCH_CODE; }
 	///
-	Inset::Code lyxCode() const { return Inset::BRANCH_CODE; }
+	void write(std::ostream &) const;
 	///
-	void write(Buffer const &, std::ostream &) const;
+	void read(Lexer & lex);
 	///
-	void read(Buffer const & buf, Lexer & lex);
+	docstring const buttonLabel(BufferView const & bv) const;
 	///
-	void setButtonLabel();
+	ColorCode backgroundColor(PainterInfo const &) const;
 	///
-	bool showInsetDialog(BufferView *) const;
+	int latex(odocstream &, OutputParams const &) const;
 	///
-	int latex(Buffer const &, odocstream &,
-		  OutputParams const &) const;
+	int plaintext(odocstream &, OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, odocstream &,
-		      OutputParams const &) const;
+	int docbook(odocstream &, OutputParams const &) const;
 	///
-	int docbook(Buffer const &, odocstream &,
-		    OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
-	void textString(Buffer const & buf, odocstream &) const;
+	void tocString(odocstream &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 	///
+	docstring contextMenu(BufferView const &, int, int) const;
+	///
+	void addToToc(DocIterator const &);
+	///
 	InsetBranchParams const & params() const { return params_; }
 	///
 	void setParams(InsetBranchParams const & params) { params_ = params; }
@@ -75,49 +88,33 @@ public:
 	/** \returns true if params_.branch is listed as 'selected' in
 	    \c buffer. This handles the case of child documents.
 	 */
-	bool isBranchSelected(Buffer const & buffer) const;
+	bool isBranchSelected() const;
+	/*!
+	 * 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.
+	 */
+	bool producesOutput() const { return isBranchSelected(); }
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
-
-protected:
 	///
-	InsetBranch(InsetBranch const &);
+	bool isMacroScope() const;
 	///
-	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
-	docstring name() const { return from_ascii("Branch"); }
-private:
-	friend class InsetBranchParams;
-
-	virtual std::auto_ptr<Inset> doClone() const;
-
-	/// used by the constructors
-	void init();
-	///
-	InsetBranchParams params_;
-};
-
-
-class InsetBranchMailer : public MailInset {
-public:
+	bool usePlainLayout() const { return false; }
 	///
-	InsetBranchMailer(InsetBranch & inset);
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	virtual Inset & inset() const { return inset_; }
-	///
-	virtual std::string const & name() const { return name_; }
-	///
-	virtual std::string const inset2string(Buffer const &) const;
-	///
-	static std::string const params2string(InsetBranchParams const &);
+	docstring name() const { return from_ascii("Branch"); }
 	///
-	static void string2params(std::string const &, InsetBranchParams &);
+	Inset * clone() const { return new InsetBranch(*this); }
 
-private:
 	///
-	static std::string const name_;
+	friend class InsetBranchParams;
 	///
-	InsetBranch & inset_;
+	InsetBranchParams params_;
 };
 
 } // namespace lyx