architectural changes to tex2lyx

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

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index 846ade741b392c9fc12c116302520246104780b7..63b85275fe78c6685155bdf590be749c23f3711c 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -1,61 +1,51 @@
 // -*- 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
 #define INSET_FORMULA_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "formulabase.h"
 #include "math_atom.h"
 
 #include <boost/scoped_ptr.hpp>
 
-class MathHullInset;
 
-///
+/// The main LyX math inset
 class InsetFormula : public InsetFormulaBase {
 public:
        ///
-       InsetFormula();
+       InsetFormula(bool chemistry = false);
        ///
        explicit InsetFormula(BufferView *);
        ///
-       explicit InsetFormula(const string & data);
+       explicit InsetFormula(string const & data);
        ///
        InsetFormula(InsetFormula const &);
        ///
        ~InsetFormula();
        ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       int width(BufferView *, LyXFont const &) const;
-       ///
-       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+       void draw(PainterInfo & pi, int x, int y) const;
 
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
        void read(Buffer const *, LyXLex & lex);
        ///
-       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) const;
        ///
@@ -64,19 +54,15 @@ public:
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
 
        ///
-       Inset * clone(Buffer const &, bool same_id = false) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset::Code lyxCode() const;
-       ///
-       bool insetAllowed(Inset::Code code) const;
-       ///
-       virtual RESULT localDispatch(FuncRequest const &);
+       InsetOld::Code lyxCode() const;
        ///
-       std::vector<string> const getLabelList() const;
+       bool insetAllowed(InsetOld::Code code) const;
        ///
-       string hullType() const;
+       void getLabelList(std::vector<string> &) const;
        ///
        MathAtom const & par() const { return par_; }
        ///
@@ -84,13 +70,11 @@ public:
        ///
        void generatePreview() const;
        ///
-       void addPreview(grfx::PreviewLoader &) const;
+       void addPreview(lyx::graphics::PreviewLoader &) const;
        ///
        void mutate(string const & type);
 
 private:
-       /// Is this a displayed environment?
-       bool display() const;
        /// available in AMS only?
        bool ams() const;