Fix to formula macros from Dekel

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

diff --git a/ChangeLog b/ChangeLog
index 91cf5cd842e855527f307532748e9bc39bc16d69..f45e6cd60809ebe797ea5a27a8cb81daa20877d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-09-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/frontends/Liason.C: add "using: declaration.
+
+2000-08-31  Dekel Tsur  <dekel@math.tau.ac.il>
+
+       * 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  <dekel@math.tau.ac.il>
 
        * src/converter.C (add_options): New function.

diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C
index 570bb24239d9e97493f2ab54a1bc95754a46d2ab..dd9be1651d6233037c38a2b03016ea692326d5d1 100644 (file)
--- 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 b7763baf4efc8fb2ced12d8a5591bad4ac5e6261..c28130b9fe900a99fc1f37df145048e651fb4463 100644 (file)
--- 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 8707a2922df323bddbccd22c3e7ce352ae91bf85..f23c3d24299ecb9de922a341a86ac902cc3604da 100644 (file)
--- 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 a68705933dd2997f19462f4a2e88fa6a6fa4e0f7..9f1a3a36eef9d29343daaba73459e926f8ece2fe 100644 (file)
--- 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();