fix pullArg when pressing <Delete> at the end of an cell

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

diff --git a/src/mathed/math_defs.h b/src/mathed/math_defs.h
index c207d821fa1dad230251bca498e9b76a50f5695a..356ec41193233bd0a5fd3e165aab6c49c94d7376 100644 (file)
--- a/src/mathed/math_defs.h
+++ b/src/mathed/math_defs.h
@@ -10,7 +10,7 @@
  *
  *  Copyright: 1996, 1997 Alejandro Aguilar Sierra
  *
- *   Version: 0.8beta, Mathed & Lyx project.
+ *   Version: 0.8beta, Math & Lyx project.
  *
  *   You are free to use and modify this code under the terms of
  *   the GNU General Public Licence version 2 or later.
@@ -24,29 +24,9 @@
 #pragma interface
 #endif
 
-#include <iosfwd>
-
-#include "LString.h"
-
-///
-enum math_align {
-       ///
-       MATH_ALIGN_LEFT = 1,
-       ///
-       MATH_ALIGN_RIGHT = 2,
-       ///
-       MATH_ALIGN_BOTTOM = 4,
-       ///
-       MATH_ALIGN_TOP = 8
-};
-///
-static int const MATH_COLSEP = 8;
-///
-static int const MATH_ROWSEP = 8;
-
 
 /// Standard Math Sizes (Math mode styles)
-enum MathedStyles {
+enum MathStyles {
        ///
        LM_ST_DISPLAY = 0,
        ///
@@ -57,33 +37,25 @@ enum MathedStyles {
        LM_ST_SCRIPTSCRIPT
 };
 
+// decrease math size for super- and subscripts
+MathStyles smallerStyleScript(MathStyles);
+
+// decrease math size for fractions
+MathStyles smallerStyleFrac(MathStyles st);
+
+
 
 /** The restrictions of a standard LaTeX math paragraph
   allows to get a small number of text codes (<30) */
-enum MathedTextCodes  {
+enum MathTextCodes  {
        /// This must be >= 0
        LM_TC_MIN = 0,
-       /// Open and Close group
-       LM_TC_OPEN,
-       ///
-       LM_TC_CLOSE,
-       /// Tabulator
-       LM_TC_TAB,
-       /// New line
-       LM_TC_CR,
        /// Math Inset
        LM_TC_INSET,
-       /// Super and sub scripts
-       LM_TC_UP,
-       ///
-       LM_TC_DOWN,
-       /// Editable Math Inset
-       LM_TC_ACTIVE_INSET,
-       /// Editable Text Inset
-       LM_TC_TEXT_INSET,
+
        ///
        LM_FONT_BEGIN,
-       /// Internal code for constants
+       /// Internal code for constants  4
        LM_TC_CONST,
        /// Internal code for variables
        LM_TC_VAR,
@@ -101,11 +73,11 @@ enum MathedTextCodes  {
        LM_TC_IT,
        ///
        LM_TC_TEXTRM,
-       /// Math mode TeX characters ",;:{}"
+       /// Math mode TeX characters ",;:{}"  20
        LM_TC_TEX,
        /// Special characters "{}&#_%"
        LM_TC_SPECIAL,
-       /// Internal code for operators
+       /// Internal code for operators  22
        LM_TC_BOP,
        /// Internal code for symbols
        LM_TC_SYMB,
@@ -120,39 +92,28 @@ enum MathedTextCodes  {
        LM_TC_MAX
 };
 
-///
-std::ostream & operator<<(std::ostream &, MathedTextCodes mtc);
-
 
 /// Types of lyx-math insets 
-enum MathedInsetTypes  {
-       ///
-       LM_OT_MIN = 0,
-       /// A simple paragraph
-       LM_OT_PAR,
-       /// A simple numbered paragraph
-       LM_OT_PARN,
-       /// A multiline paragraph
-       LM_OT_MPAR,
-       /// A multiline numbered paragraph
-       LM_OT_MPARN,
+enum MathInsetTypes  {
        ///
-       LM_OT_ALIGN,
+       LM_OT_SIMPLE = 0,
        ///
-       LM_OT_ALIGNN,
+       LM_OT_EQUATION,
+       /// 
+       LM_OT_EQNARRAY,
+       ///
+       LM_OT_ALIGN,
        ///
        LM_OT_ALIGNAT,
        ///
-       LM_OT_ALIGNATN,
+       LM_OT_XALIGN,
        ///
-       LM_OT_MULTLINE,
+       LM_OT_XXALIGN,
        ///
-       LM_OT_MULTLINEN,
+       LM_OT_MULTLINE,
        /// An array
        LM_OT_MATRIX,
 
-       /// A big operator
-       LM_OT_BIGOP,
        /// A LaTeX macro
        LM_OT_UNDEF,
        ///
@@ -160,36 +121,14 @@ enum MathedInsetTypes  {
        ///
        LM_OT_FUNCLIM,
        ///
-       LM_OT_SCRIPT,
-       ///
-       LM_OT_SPACE,
-       ///
-       LM_OT_DOTS,
-       /// A fraction
-       LM_OT_FRAC,
-       ///
-       LM_OT_ATOP,
-       ///
-       LM_OT_STACKREL,
-       /// A radical
-       LM_OT_SQRT,
-       /// A delimiter
-       LM_OT_DELIM,
-       /// A decoration
-       LM_OT_DECO,
-       /// An accent
-       LM_OT_ACCENT,
-       ///
        LM_OT_MACRO,
        ///
-       LM_OT_MACRO_ARG,
-       ///
        LM_OT_MAX
 };
 
 
 ///
-enum MathedBinaryTypes {
+enum MathBinaryTypes {
        ///
        LMB_NONE = 0,
        ///
@@ -202,7 +141,7 @@ enum MathedBinaryTypes {
 
 
 /// Paragraph permissions
-enum MathedParFlag {
+enum MathParFlag {
        LMPF_BASIC = 0,
        /// If false can use a non-standard size
        LMPF_FIXED_SIZE = 1,