make mathed compile (but not link), adjust

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2430 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am
index 277d713f0afe965d708929f0176d7df41ffd9a1e..e0ad3e22efadf093056667ab06269f0791f03234 100644 (file)
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -7,6 +7,12 @@ ETAGS_ARGS = --lang=c++
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
 
+
+#      math_bigopinset.C \
+#      math_bigopinset.h \
+#      math_funcliminset.C \
+#      math_funcliminset.h \
+
 libmathed_la_SOURCES = \
        array.C \
        array.h \
@@ -20,8 +26,6 @@ libmathed_la_SOURCES = \
        formulamacro.h \
        math_arrayinset.C \
        math_arrayinset.h \
-       math_bigopinset.C \
-       math_bigopinset.h \
        math_charinset.C \
        math_charinset.h \
        math_cursor.C \
@@ -39,8 +43,6 @@ libmathed_la_SOURCES = \
        math_fracinset.h \
        math_funcinset.C \
        math_funcinset.h \
-       math_funcliminset.C \
-       math_funcliminset.h \
        math_gridinset.C \
        math_gridinset.h \
        math_hash.C \

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index abb95af028edde36630e78cb246cbfb5644abe9f..0269ab391a93b1fc2bad46c6a675b48d67ac5fd1 100644 (file)
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -30,14 +30,18 @@
 #include "formulabase.h"
 #include "math_cursor.h"
 #include "math_arrayinset.h"
+#if 0
 #include "math_bigopinset.h"
+#endif
 #include "math_symbolinset.h"
 #include "math_decorationinset.h"
 #include "math_deliminset.h"
 #include "math_dotsinset.h"
 #include "math_fracinset.h"
 #include "math_funcinset.h"
+#if 0
 #include "math_funcliminset.h"
+#endif
 #include "math_gridinset.h"
 #include "math_macro.h"
 #include "math_macroarg.h"
@@ -674,12 +678,16 @@ void MathCursor::interpret(string const & s)
                        p = new MathFuncInset(s);
        } else {
                switch (l->token) {
-                       case LM_TK_BIGSYM: 
+                       case LM_TK_BIGSYM:
+#if 0
                                p = new MathBigopInset(l);
+#endif
                                break;
 
                        case LM_TK_FUNCLIM:
+#if 0
                                p = new MathFuncLimInset(l);
+#endif
                                break;
 
                        case LM_TK_SYM: 

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 2cd004774958411a6cc31e7bdba8c0c9862398d2..dc7ff9427262f55c8c5d450c4f5001a3db2f315c 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -29,13 +29,17 @@
 #include "array.h"
 #include "math_inset.h"
 #include "math_arrayinset.h"
+#if 0
 #include "math_bigopinset.h"
+#endif
 #include "math_dotsinset.h"
 #include "math_decorationinset.h"
 #include "math_deliminset.h"
 #include "math_fracinset.h"
 #include "math_funcinset.h"
+#if 0
 #include "math_funcliminset.h"
+#endif
 #include "math_macro.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
@@ -660,12 +664,16 @@ void mathed_parse_into(MathArray & array, unsigned flags)
 
                case LM_TK_BIGSYM:  
                        limits = 0;
+#if 0
                        array.push_back(new MathBigopInset(yylval.l));
+#endif
                        break;
 
                case LM_TK_FUNCLIM:
                        limits = 0;
+#if 0
                        array.push_back(new MathFuncLimInset(yylval.l));
+#endif
                        break;
 
                case LM_TK_SYM:
@@ -898,7 +906,7 @@ MathMacroTemplate * mathed_parse_macro(istream & is)
 MathMatrixInset * mathed_parse_normal(LyXLex & lex)
 {
        yyis     = &lex.getStream();
-       yylineno = lex.GetLineNo();
+       yylineno = lex.getLineNo();
 
        MathMatrixInset * p = mathed_parse_normal();
 
@@ -906,9 +914,9 @@ MathMatrixInset * mathed_parse_normal(LyXLex & lex)
        lex.setLineNo(yylineno);
 
        // reading of end_inset
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                lex.nextToken();
-               if (lex.GetString() == "\\end_inset")
+               if (lex.getString() == "\\end_inset")
                        break;
                lyxerr[Debug::MATHED] << "InsetFormula::Read: Garbage before \\end_inset,"
                        " or missing \\end_inset!" << endl;
@@ -920,7 +928,7 @@ MathMatrixInset * mathed_parse_normal(LyXLex & lex)
 MathMacroTemplate * mathed_parse_macro(LyXLex & lex)
 {
        yyis     = &lex.getStream();
-       yylineno = lex.GetLineNo();
+       yylineno = lex.getLineNo();
 
        MathMacroTemplate * p = mathed_parse_macro();
 
@@ -928,9 +936,9 @@ MathMacroTemplate * mathed_parse_macro(LyXLex & lex)
        lex.setLineNo(yylineno);
 
        // reading of end_inset
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                lex.nextToken();
-               if (lex.GetString() == "\\end_inset")
+               if (lex.getString() == "\\end_inset")
                        break;
                lyxerr[Debug::MATHED] << "InsetFormula::Read: Garbage before \\end_inset,"
                        " or missing \\end_inset!" << endl;