Overhaul the branches code.

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

diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h
index 0ba0f0f634833717f7d225c91c424262ce9c11d9..f76465c2c970cf72cd41d174c9349fd5f0268714 100644 (file)
--- a/src/insets/insetbranch.h
+++ b/src/insets/insetbranch.h
@@ -14,18 +14,20 @@
 
 
 #include "insetcollapsable.h"
-#include "BranchList.h"
 
- struct InsetBranchParams {
+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;
-       /// Hack -- MV
-       BranchList branchlist;
- };
+};
 
 
 /** The Branch inset for alternative, conditional output.
@@ -34,9 +36,7 @@
 class InsetBranch : public InsetCollapsable {
 public:
        ///
-
-
-       InsetBranch(BufferParams const &, std::string const &);
+       InsetBranch(BufferParams const &, InsetBranchParams const &);
        /// Copy constructor
        InsetBranch(InsetBranch const &);
        ///
@@ -56,16 +56,17 @@ public:
        ///
        bool showInsetDialog(BufferView *) const;
        ///
-       dispatch_result localDispatch(FuncRequest const &);
-       ///
        int latex(Buffer const &, std::ostream &,
-                       LatexRunParams const &) const;
+                       OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &,
+                    OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &, bool) const;
+       int docbook(Buffer const &, std::ostream &,
+                   OutputParams const & runparams) const;
        ///
-       int ascii(Buffer const &, std::ostream &, int) const;
+       int plaintext(Buffer const &, std::ostream &,
+                 OutputParams const & runparams) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
@@ -73,6 +74,16 @@ public:
        ///
        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;
 
@@ -87,7 +98,7 @@ private:
 class InsetBranchMailer : public MailInset {
 public:
        ///
-       InsetBranchMailer(std::string const & name, InsetBranch & inset);
+       InsetBranchMailer(InsetBranch & inset);
        ///
        virtual InsetBase & inset() const { return inset_; }
        ///
@@ -95,13 +106,13 @@ public:
        ///
        virtual std::string const inset2string(Buffer const &) const;
        ///
-       static std::string const params2string(std::string const &, InsetBranchParams const &);
+       static std::string const params2string(InsetBranchParams const &);
        ///
        static void string2params(std::string const &, InsetBranchParams &);
 
 private:
        ///
-       std::string const name_;
+       static std::string const name_;
        ///
        InsetBranch & inset_;
 };