Attached is very minor cleanups for mathed and support. john -- On Year 2000 compliance : "Unfortunately, it is not possible to gather similar assurances on the compliance of viruses." - Dr. Solomon's RIP
diff -u -p -r1.40 ChangeLog --- src/mathed/ChangeLog 2001/02/20 17:45:56 1.40 +++ src/mathed/ChangeLog 2001/02/23 14:59:05 @@ -1,3 +1,8 @@ +2001-02-23 John Levon <[EMAIL PROTECTED]> + + * math_parser.C: + * formula.C: make DEBUG into lyxerr + 2001-02-14 André Pönitz <[EMAIL PROTECTED]> * math_parinset.[Ch]: make array a real MathArray, not just a Index: src/mathed/formula.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formula.C,v retrieving revision 1.88 diff -u -p -r1.88 formula.C --- src/mathed/formula.C 2001/02/20 17:45:56 1.88 +++ src/mathed/formula.C 2001/02/23 14:59:05 @@ -296,7 +296,7 @@ void InsetFormula::Validate(LaTeXFeature } -void InsetFormula::Read(Buffer const *, LyXLex & lex) +void InsetFormula::Read(Buffer const *buffer, LyXLex & lex) { istream & is = lex.getStream(); @@ -327,9 +327,8 @@ void InsetFormula::Read(Buffer const *, " or missing \\end_inset!" << endl; } -#ifdef DEBUG - Write(lyxerr); -#endif + if (lyxerr.debugging(Debug::MATHED)) + Write(buffer, lyxerr); } Index: src/mathed/math_parser.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_parser.C,v retrieving revision 1.33 diff -u -p -r1.33 math_parser.C --- src/mathed/math_parser.C 2001/02/20 17:45:56 1.33 +++ src/mathed/math_parser.C 2001/02/23 14:59:05 @@ -876,9 +876,7 @@ void mathed_parse(MathedArray & array, u crow = mt->getRowSt(); } -#ifdef DEBUG - lyxerr << "MATH BEGIN[" << mathed_env << "]" << endl; -#endif + lyxerr[Debug::MATHED] << "MATH BEGIN[" << mathed_env << "]" << endl; } else { // lyxerr << "MATHCRO[" << yytext << "]"; MathMacro * p = @@ -924,9 +922,7 @@ void mathed_parse(MathedArray & array, u } else { mathed_label = yytext.data(); } -#ifdef DEBUG - lyxerr << "Label[" << mathed_label << "]" << endl; -#endif + lyxerr[Debug::MATHED] << "Label[" << mathed_label << "]" << endl; break; } default: Index: src/support/ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v retrieving revision 1.6 diff -u -p -r1.6 ChangeLog --- src/support/ChangeLog 2001/02/14 19:22:41 1.6 +++ src/support/ChangeLog 2001/02/23 14:59:05 @@ -1,3 +1,7 @@ +2001-02-16 John Levon <[EMAIL PROTECTED]> + + * syscontr.h: fix header include + 2001-02-14 Lars Gullik Bjønnes <[EMAIL PROTECTED]> * fmt.C: Index: src/support/syscontr.h =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/syscontr.h,v retrieving revision 1.5 diff -u -p -r1.5 syscontr.h --- src/support/syscontr.h 2000/09/14 17:53:12 1.5 +++ src/support/syscontr.h 2001/02/23 14:59:05 @@ -4,7 +4,7 @@ #pragma interface #endif -#include <LString.h> +#include "LString.h" class Systemcalls;