From 66088f1487d2e84fbd90109498c76852a9c6938b Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 5 Sep 2000 14:15:09 +0000 Subject: [PATCH] Fix to formula macros from Dekel git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1002 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 10 ++++++++++ src/frontends/Liason.C | 2 ++ src/frontends/xforms/GUIRunTime.C | 2 +- src/mathed/formulamacro.C | 2 +- src/mathed/math_macro.C | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91cf5cd842..f45e6cd608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-09-05 Jean-Marc Lasgouttes + + * src/frontends/Liason.C: add "using: declaration. + +2000-08-31 Dekel Tsur + + * src/mathed/math_macro.C (Metrics): Set the size of the template + + * src/mathed/formulamacro.C (Latex): Fixed the returned value + 2000-09-04 Dekel Tsur * src/converter.C (add_options): New function. diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C index 570bb24239..dd9be1651d 100644 --- a/src/frontends/Liason.C +++ b/src/frontends/Liason.C @@ -29,6 +29,8 @@ #include "minibuffer.h" #include "support/syscall.h" +using std::endl; + extern LyXRC lyxrc; #ifndef NEW_EXPORT extern bool RunScript(Buffer * buffer, bool wait, string const & command, diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C index b7763baf4e..c28130b9fe 100644 --- a/src/frontends/xforms/GUIRunTime.C +++ b/src/frontends/xforms/GUIRunTime.C @@ -38,7 +38,7 @@ void GUIRunTime::runTime() XEvent ev; while (!finished) { if (fl_check_forms() == FL_EVENT) { - lyxerr << "LyX: This shouldn't appen..." << endl; + lyxerr << "LyX: This shouldn't happen..." << endl; fl_XNextEvent(&ev); } } diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 8707a2922d..f23c3d2429 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -77,7 +77,7 @@ int InsetFormulaMacro::Latex(Buffer const *, ostream & os, bool /*fragile*/, bool /*free_spacing*/) const { tmacro->WriteDef(os, true); // or false? - return 1; + return 2; } diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C index a68705933d..9f1a3a36ee 100644 --- a/src/mathed/math_macro.C +++ b/src/mathed/math_macro.C @@ -113,6 +113,7 @@ void MathMacro::Metrics() { if (nargs > 0) tmplate->update(this); + tmplate->SetStyle(size); tmplate->Metrics(); width = tmplate->Width(); ascent = tmplate->Ascent(); -- 2.39.2