make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/math_defs.h b/src/mathed/math_defs.h
index d192c9fb2f20f3322abc502c7b62a8e8ab49b710..5130dfdcc61499b7761922e9a8060af307c7722e 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,75 +24,27 @@
 #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 {
-       ///
-       LM_ST_DISPLAY = 0,
-       ///
-       LM_ST_TEXT,
-       ///
-       LM_ST_SCRIPT,
-       ///
-       LM_ST_SCRIPTSCRIPT
-};
-
-
-/** The restrictions of a standard LaTeX math paragraph
-  allows to get a small number of text codes (<30) */
-enum MathedTextCodes  {
-       /// This must be >= 0
+enum MathTextCodes  {
+       /// 
        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
-       LM_TC_CONST,
-       /// Internal code for variables
+       /// internal code for variables
        LM_TC_VAR,
+       /// internal code for stuff in wrapped in mbox etc
+       LM_TC_BOX,
+       ///
+       LM_TC_CONST,
        ///
        LM_TC_RM,
        ///
        LM_TC_CAL,
        ///
+       LM_TC_EUFRAK,
+       ///
        LM_TC_BF,
+       //
+       LM_TC_BB,
        ///
        LM_TC_SF,
        ///
@@ -101,121 +53,64 @@ enum MathedTextCodes  {
        LM_TC_IT,
        ///
        LM_TC_TEXTRM,
-       /// Math mode TeX characters ",;:{}"
+       /// math mode TeX characters ",;:{}"  
        LM_TC_TEX,
-       /// Special characters "{}&#_%"
-       LM_TC_SPECIAL,
-       /// Internal code for operators
-       LM_TC_BOP,
-       /// Internal code for symbols
+       /// internal code when typing greek
+       LM_TC_GREEK,
+       /// internal code when typing a single greek character
+       LM_TC_GREEK1,
+       /// internal code for symbols
        LM_TC_SYMB,
+       /// internal code for symbols that get bigger in displayed math
+       LM_TC_BOLDSYMB,
+       ///
+       LM_TC_CMR,
+       ///
+       LM_TC_CMSY,
+       ///
+       LM_TC_CMM,
        ///
-       LM_TC_BOPS,
+       LM_TC_CMEX,
        ///
-       LM_TC_BSYM,
+       LM_TC_MSA,
        ///
-       LM_FONT_END,
-       
-       /// This must be < 32 
-       LM_TC_MAX
+       LM_TC_MSB,
+       ///
+       LM_FONT_END
 };
 
-/// Defined in math_macro.C
-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_XALIGNAT,
+       ///
+       LM_OT_XXALIGNAT,
        ///
        LM_OT_MULTLINE,
        ///
-       LM_OT_MULTLINEN,
+       LM_OT_GATHER,
        /// An array
        LM_OT_MATRIX,
 
-       /// A big operator
-       LM_OT_BIGOP,
        /// A LaTeX macro
        LM_OT_UNDEF,
        ///
-       LM_OT_FUNC,
-       ///
        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 {
-       ///
-       LMB_NONE = 0,
-       ///
-       LMB_RELATION,
-       ///
-       LMB_OPERATOR,
-       ///
-       LMB_BOP = (LMB_RELATION | LMB_OPERATOR)
-};
-
-
-/// Paragraph permissions
-enum MathedParFlag {
-       LMPF_BASIC = 0,
-       /// If false can use a non-standard size
-       LMPF_FIXED_SIZE = 1,
-       /// If true can insert newlines 
-       LMPF_ALLOW_CR  = 2,
-       /// If true can use tabs
-       LMPF_ALLOW_TAB = 4,
-       /// If true can insert new columns
-       LMPF_ALLOW_NEW_COL = 8,
-       /// Smaller than current size (frac)
-       LMPF_SMALLER = 16,
-       /// Script size (subscript, stackrel)
-       LMPF_SCRIPT = 32
-};
-
 #endif