Overhaul the branches code.

[features.git] / src / insets / insetbranch.h

diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h
index d4e043bf9556a11f92a8d99bdc36106d8850d51d..f76465c2c970cf72cd41d174c9349fd5f0268714 100644 (file)
--- a/src/insets/insetbranch.h
+++ b/src/insets/insetbranch.h
@@ -6,7 +6,7 @@
  *
  * \author Martin Vermeer
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETBRANCH_H
@@ -14,69 +14,76 @@
 
 
 #include "insetcollapsable.h"
-#include "BranchList.h"
-
- struct InsetBranchParams {
-       ///
-       void write(std::ostream & os) const;
-       ///
-       void read(LyXLex & lex);
-       ///
-       string branch;
-       /// Hack -- MV
-       BranchList branchlist;
- };
- 
- 
+
+class BranchList;
+
+
+struct InsetBranchParams {
+       explicit InsetBranchParams(std::string const & b = std::string())
+               : branch(b) {}
+       ///
+       void write(std::ostream & os) const;
+       ///
+       void read(LyXLex & lex);
+       ///
+       std::string branch;
+};
+
+
 /** The Branch inset for alternative, conditional output.
 
 */
 class InsetBranch : public InsetCollapsable {
 public:
        ///
-
-       
-       InsetBranch(BufferParams const &, string const &);
-       /// Copy constructor
-       InsetBranch(InsetBranch const &);
-       ///
+       InsetBranch(BufferParams const &, InsetBranchParams const &);
+       /// Copy constructor
+       InsetBranch(InsetBranch const &);
+       ///
        ~InsetBranch();
-       ///
+       ///
        virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       string const editMessage() const;
+       std::string const editMessage() const;
        ///
        InsetOld::Code lyxCode() const { return InsetOld::BRANCH_CODE; }
        ///
-       void write(Buffer const *, std::ostream &) const;
+       void write(Buffer const &, std::ostream &) const;
        ///
-       void read(Buffer const * buf, LyXLex & lex);
+       void read(Buffer const & buf, LyXLex & lex);
        ///
        void setButtonLabel();
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
-       ///
-       void draw(PainterInfo & pi, int x, int y) const;
-       ///
        bool showInsetDialog(BufferView *) const;
        ///
-       dispatch_result localDispatch(FuncRequest const &);
+       int latex(Buffer const &, std::ostream &,
+                       OutputParams const &) const;
        ///
-       int latex(Buffer const *, std::ostream &,
-                       LatexRunParams const &) const;
+       int linuxdoc(Buffer const &, std::ostream &,
+                    OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int docbook(Buffer const &, std::ostream &,
+                   OutputParams const & runparams) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool) const;
-       ///
-       int ascii(Buffer const *, std::ostream &, int) const;
+       int plaintext(Buffer const &, std::ostream &,
+                 OutputParams const & runparams) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
        InsetBranchParams const & params() const { return params_; }
        ///
        void setParams(InsetBranchParams const & params) { params_ = params; }
-       
+
+       /** \returns true if params_.branch is listed as 'selected' in
+           \c branchlist.
+        */
+       bool isBranchSelected(BranchList const & branchlist) const;
+
+protected:
+       ///
+       virtual
+       DispatchResult
+       priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
 private:
        friend class InsetBranchParams;
 
@@ -91,21 +98,21 @@ private:
 class InsetBranchMailer : public MailInset {
 public:
        ///
-       InsetBranchMailer(string const & name, InsetBranch & inset);
+       InsetBranchMailer(InsetBranch & inset);
        ///
        virtual InsetBase & inset() const { return inset_; }
        ///
-       virtual string const & name() const { return name_; }
+       virtual std::string const & name() const { return name_; }
        ///
-       virtual string const inset2string(Buffer const &) const;
+       virtual std::string const inset2string(Buffer const &) const;
        ///
-       static string const params2string(string const &, InsetBranchParams const &);
+       static std::string const params2string(InsetBranchParams const &);
        ///
-       static void string2params(string const &, InsetBranchParams &);
+       static void string2params(std::string const &, InsetBranchParams &);
 
 private:
        ///
-       string const name_;
+       static std::string const name_;
        ///
        InsetBranch & inset_;
 };