X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulabase.h;h=a91eed0b38d80c09e101176f92d2e6920096ca2d;hb=e093e5e80c334995a77445c8e66a9f3c9594dda1;hp=54e255495608269b31acca090f821ff2fe196b19;hpb=a3f60ae91edbbbe66a7e2b941cb31a928a43c5b3;p=lyx.git

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index 54e2554956..a91eed0b38 100644
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -4,7 +4,7 @@
  *  Purpose:     Common parts of the math LyX insets
  *  Author:      André Pönitz
  *  Created:     May 2001
- *  Description: Allows the edition of math paragraphs inside Lyx. 
+ *  Description: Allows the edition of math paragraphs inside Lyx.
  *
  *  Copyright: 2001, The LyX Project
  *
@@ -12,25 +12,27 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#ifndef INSET_FORMULABASE_H 
+#ifndef INSET_FORMULABASE_H
 #define INSET_FORMULABASE_H
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include <iosfwd>
 #include "insets/inset.h"
+#include "frontends/mouse_state.h"
 #include "lyxfont.h"
 
 // only for getType():
 #include "math_defs.h"
 
+#include <iosfwd>
+
 class Buffer;
 class BufferView;
 class MathAtom;
 
-///
+/// An abstract base class for all math related LyX insets
 class InsetFormulaBase : public UpdatableInset {
 public:
 	///
@@ -64,7 +66,7 @@ public:
 	/// what appears in the minibuffer when opening
 	virtual string const editMessage() const;
 	///
-	virtual void edit(BufferView *, int x, int y, unsigned int button);
+	virtual void edit(BufferView *, int x, int y, mouse_button::state button);
 	///
 	virtual void edit(BufferView *, bool front = true);
 	///
@@ -78,19 +80,17 @@ public:
 	///
 	virtual void toggleInsetSelection(BufferView * bv);
 	///
-	virtual void insetButtonPress(BufferView *, int x, int y, int button);
+	virtual void insetButtonPress(BufferView *, int x, int y, mouse_button::state button);
 	///
-	virtual bool insetButtonRelease(BufferView *, int x, int y, int button);
+	virtual bool insetButtonRelease(BufferView *, int x, int y, mouse_button::state button);
 	///
-	virtual void insetKeyPress(XKeyEvent * ev);
-	///
-	virtual void insetMotionNotify(BufferView *, int x, int y, int state);
+	virtual void insetMotionNotify(BufferView *, int x, int y, mouse_button::state state);
 	///
 	virtual void insetUnlock(BufferView *);
-   
+
 	/// To allow transparent use of math editing functions
 	virtual RESULT localDispatch(BufferView *, kb_action, string const &);
-    
+
 	///
 	virtual std::vector<string> const getLabelList() const;
 	///
@@ -104,20 +104,28 @@ public:
 
 	///
 	virtual bool searchForward(BufferView *, string const &,
-	                           bool const & = true, bool const & = false);
+				   bool = true, bool = false);
 	///
 	virtual bool searchBackward(BufferView *, string const &,
-	                            bool const & = true, bool const & = false);
+				    bool = true, bool = false);
 	///
 	virtual bool isTextInset() const { return true; }
+	///
+	virtual void mutateToText();
+	///
+	virtual void revealCodes(BufferView *) const;
+	///
+	virtual Inset::EDITABLE editable() const { return HIGHLY_EDITABLE; }
 
 
 private:
 	/// unimplemented
 	void operator=(const InsetFormulaBase &);
+	/// common base for handling accents
+	void handleAccent(BufferView * bv, string const & arg, string const & name);
 
 	///
-	mutable BufferView * view_;	
+	mutable BufferView * view_;
 	///
 	mutable LyXFont font_;
 
@@ -126,6 +134,8 @@ protected:
 	void metrics(BufferView * bv, LyXFont const & font) const;
 	///
 	void metrics(BufferView * bv = 0) const;
+	///
+	void handleFont(BufferView * bv, string const & arg, string const & font);
 
 	///
 	mutable int xo_;