Jean-Marc's fix for wrong descent

[lyx.git] / src / mathed / formula.h

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index 501f1db2b10767f5075b4d24809b48253089cfa9..fd9c7550bef78ccc1e601f95ea8ba270d9cde67f 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -1,41 +1,39 @@
 // -*- C++ -*-
-/*
- *  File:        formula.h
- *  Purpose:     Declaration of formula inset
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
- *  Created:     January 1996
- *  Description: Allows the edition of math paragraphs inside Lyx. 
+
+/**
+ *  \file formula.h
  *
- *  Copyright: 1996, Alejandro Aguilar Sierra
+ *  This file is part of LyX, the document processor.
+ *  Licence details can be found in the file COPYING.
  *
- *  Version: 0.4, Lyx project.
+ *  \author Alejandro Aguilar Sierra
+ *  \author André Pönitz
  *
- *   You are free to use and modify this code under the terms of
- *   the GNU General Public Licence version 2 or later.
+ *  Full author contact details are available in file CREDITS.
  */
 
-#ifndef INSET_FORMULA_H 
+#ifndef INSET_FORMULA_H
 #define INSET_FORMULA_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-#include "mathed/formulabase.h"
-#include "math_defs.h"
+#include "formulabase.h"
 #include "math_atom.h"
 
-class MathMatrixInset;
+#include <boost/scoped_ptr.hpp>
 
-///
+/// The main LyX math inset
 class InsetFormula : public InsetFormulaBase {
 public:
        ///
        InsetFormula();
        ///
-       explicit InsetFormula(MathInsetTypes);
+       explicit InsetFormula(BufferView *);
+       ///
+       explicit InsetFormula(const string & data);
        ///
-       explicit InsetFormula(string const &);
+       InsetFormula(InsetFormula const &);
+       ///
+       ~InsetFormula();
        ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
@@ -44,8 +42,6 @@ public:
        int width(BufferView *, LyXFont const &) const;
        ///
        void draw(BufferView *, LyXFont const &, int, float &, bool) const;
-       ///
-       void metrics() const;
 
        ///
        void write(Buffer const *, std::ostream &) const;
@@ -58,7 +54,7 @@ public:
        ///
        int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &) const;
+       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
 
        ///
        Inset * clone(Buffer const &, bool same_id = false) const;
@@ -69,28 +65,29 @@ public:
        ///
        bool insetAllowed(Inset::Code code) const;
        ///
-       virtual RESULT localDispatch(BufferView *, kb_action, string const &);
-       ///
        std::vector<string> const getLabelList() const;
        ///
-       void handleExtern(string const & arg, BufferView * bv);
-       ///
-       bool display() const;
-       ///
-       bool ams() const;
-       ///
-       MathInsetTypes getType() const;
-       ///
        MathAtom const & par() const { return par_; }
        ///
        MathAtom & par() { return par_; }
-public:
        ///
+       void generatePreview() const;
+       ///
+       void addPreview(grfx::PreviewLoader &) const;
+       ///
+       //void mutate(string const & type);
+
+private:
+       /// available in AMS only?
+       bool ams() const;
+
+       /// contents
        MathAtom par_;
 
-       /// Access
-       MathMatrixInset * mat();
-       /// Access
-       MathMatrixInset const * mat() const;
+       /// Use the Pimpl idiom to hide the internals of the previewer.
+       class PreviewImpl;
+       friend class PreviewImpl;
+       /// The pointer never changes although *preview_'s contents may.
+       boost::scoped_ptr<PreviewImpl> const preview_;
 };
 #endif