The free_spacing patch and fix to the mess that Rob discovered.

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

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 8f8c02d2824cfa3075b2e6d65138cf36ab7b182d..8a9d2a98a2c52adc2635bda3bebb1f0aef8af28f 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -1,25 +1,20 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file insetert.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
  *
- *           Copyright 1998 The LyX Team.
- *
- *======================================================
+ * Full author contact details are available in file CREDITS
  */
-// The pristine updatable inset: Text
-
 
 #ifndef INSETERT_H
 #define INSETERT_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "insetcollapsable.h"
-#include <sigc++/signal_system.h>
 
 /** A collapsable text inset for LaTeX insertions.
 
@@ -62,39 +57,26 @@ public:
        ///
        bool insertInset(BufferView *, Inset *);
        ///
-       bool insetAllowed(Inset::Code) const { return false; }
+       bool insetAllowed(Inset::Code code) const { return code == Inset::NEWLINE_CODE; }
        ///
        void setFont(BufferView *, LyXFont const &,
                             bool toggleall = false, bool selectall = false);
        ///
-       void edit(BufferView *, int, int, unsigned int);
-       ///
-       void edit(BufferView * bv, bool front = true);
-       ///
        EDITABLE editable() const;
        ///
-       SigC::Signal0<void> hideDialog;
-       ///
-       void insetButtonPress(BufferView *, int x, int y, int button);
-       ///
-       bool insetButtonRelease(BufferView * bv, int x, int y, int button);
-       ///
-       void insetMotionNotify(BufferView *, int x, int y, int state);
-       ///
-       int latex(Buffer const *, std::ostream &, bool fragile,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *,
                          std::ostream &, int linelen = 0) const;
        ///
        int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &) const;
+       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///
        void validate(LaTeXFeatures &) const {}
        ///
-       UpdatableInset::RESULT localDispatch(BufferView *, kb_action,
-                                            string const &);
+       RESULT localDispatch(FuncRequest const &);
        ///
        bool checkInsertChar(LyXFont &);
        ///
@@ -112,16 +94,14 @@ public:
        ///
        void close(BufferView *) const;
        ///
-       bool allowSpellcheck() { return false; }
-       string const selectNextWordToSpellcheck(BufferView *, float &) const;
-       ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
+       bool allowSpellcheck() const { return false; }
+
+       WordLangTuple const
+       selectNextWordToSpellcheck(BufferView *, float &) const;
        ///
-       int width(BufferView *, LyXFont const &) const;
+       void dimension(BufferView *, LyXFont const &, Dimension &) const;
        ///
-       void draw(BufferView *, const LyXFont &, int , float &, bool) const;
+       void draw(BufferView *, const LyXFont &, int , float &) const;
        /// set the status of the inset
        void status(BufferView *, ERTStatus const st) const;
        ///
@@ -134,8 +114,20 @@ public:
        }
        ///
        int getMaxWidth(BufferView *, UpdatableInset const *) const;
+       ///
+       void update(BufferView *, bool =false);
 
 private:
+       ///
+       void lfunMousePress(FuncRequest const &);
+       ///
+       // the bool return is used to see if we opened a dialog so that we can
+       // check this from an outer inset and open the dialog of the outer inset
+       // if that one has one!
+       ///
+       bool lfunMouseRelease(FuncRequest const &);
+       ///
+       void lfunMouseMotion(FuncRequest const &);
        ///
        void init();
        ///
@@ -151,4 +143,28 @@ private:
        mutable ERTStatus status_;
 };
 
+
+#include "mailinset.h"
+
+class InsetERTMailer : public MailInset {
+public:
+       ///
+       InsetERTMailer(InsetERT & inset);
+       ///
+       virtual InsetBase & inset() const { return inset_; }
+       ///
+       virtual string const & name() const { return name_; }
+       ///
+       virtual string const inset2string() const;
+       ///
+       static void string2params(string const &, InsetERT::ERTStatus &);
+       ///
+       static string const params2string(InsetERT::ERTStatus);
+private:
+       ///
+       static string const name_;
+       ///
+       InsetERT & inset_;
+};
+
 #endif