use stream-like syntax for LaTeX output

[lyx.git] / src / mathed / formulabase.C

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 01b585f828a86cd2db8a039ec3af9a891f71c8cf..f7b9e49b3364d2f59e9e25fda2dc6df101c3324c 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -1,4 +1,4 @@
- /*
+/*
 *  File:        formulabase.C
 *  Purpose:     Implementation of common parts of the LyX  math insets
 *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
@@ -16,6 +16,7 @@
 #include <fstream>
 
 #include "Lsstream.h"
+#include "support/LAssert.h"
 
 #ifdef __GNUG__
 #pragma implementation
@@ -103,6 +104,7 @@ MathArrayInset * matrixpar(MathInset::idx_type & idx)
 
 
 InsetFormulaBase::InsetFormulaBase()
+       : view_(0), font_(0)
 {
        // This is needed as long the math parser is not re-entrant
        MathMacroTable::builtinMacros();
@@ -115,6 +117,17 @@ void InsetFormulaBase::validate(LaTeXFeatures &) const
 {}
 
 
+void InsetFormulaBase::metrics(BufferView * bv, LyXFont const * f) const 
+{
+       if (bv)
+               view_ = bv;
+       if (f)
+               font_ = f;
+       MathMetricsInfo mi(view_, font_, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       par()->metrics(mi);
+}
+
+
 string const InsetFormulaBase::editMessage() const
 {
        return _("Math editor mode");
@@ -123,19 +136,14 @@ string const InsetFormulaBase::editMessage() const
 
 void InsetFormulaBase::edit(BufferView * bv, int x, int /*y*/, unsigned int)
 {
-       mathcursor = new MathCursor(this);
-
        if (!bv->lockInset(this))
                lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl;
 
-       metrics();
+       mathcursor = new MathCursor(this, x == 0);
+       metrics(bv);
        // if that is removed, we won't get the magenta box when entering an
        // inset for the first time
        bv->updateInset(this, false);
-       if (x == 0)
-               mathcursor->first();
-       else
-               mathcursor->last();
        sel_x = 0;
        sel_y = 0;
        sel_flag = false;
@@ -237,7 +245,7 @@ vector<string> const InsetFormulaBase::getLabelList() const
 
 void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty)
 {
-       metrics();
+       metrics(bv);
        bv->updateInset(this, dirty);
 }
 
@@ -305,16 +313,13 @@ void InsetFormulaBase::insetKeyPress(XKeyEvent *)
 }
 
 
-int greek_kb_flag = 0;
-
 UpdatableInset::RESULT
 InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                            string const & arg)
 {
-       //lyxerr << "InsetFormulaBase::LocalDispatch: act: " << action
+       //lyxerr << "InsetFormulaBase::localDispatch: act: " << action
        //      << " arg: '" << arg << "' cursor: " << mathcursor << "\n";
 
-
        if (!mathcursor) 
                return UNDISPATCHED;
 
@@ -470,7 +475,6 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        case LFUN_VECTOR:       handleAccent(bv, "vec"); break;
 
        //  Math fonts
-       case LFUN_GREEK:        handleFont(bv, LM_TC_GREEK1); break;
        case LFUN_GREEK_TOGGLE: handleFont(bv, LM_TC_GREEK); break;
        case LFUN_BOLD:         handleFont(bv, LM_TC_BF); break;
        case LFUN_SANS:         handleFont(bv, LM_TC_SF); break;
@@ -480,6 +484,12 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        case LFUN_NOUN:         handleFont(bv, LM_TC_BB); break;
        case LFUN_DEFAULT:      handleFont(bv, LM_TC_VAR); break;
 
+       case LFUN_GREEK: 
+               handleFont(bv, LM_TC_GREEK1);
+               if (arg.size())
+                       mathcursor->interpret(arg[0]);
+               break;
+
        case LFUN_MATH_MODE:
                handleFont(bv, LM_TC_TEXTRM);
                //bv->owner()->message(_("math text mode toggled"));
@@ -511,12 +521,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        case LFUN_MATH_SPACE:
        {
                bv->lockedInsetStoreUndo(Undo::EDIT);
-               //MathSpaceInset * p = mathcursor->prevSpaceInset();
-               //if (p) 
-               //      p->incSpace();
-               //else
-               //      mathcursor->insert(new MathSpaceInset(1));
-               mathcursor->insert(new MathSpaceInset(1));
+               mathcursor->insert(MathAtom(new MathSpaceInset(1)));
                updateLocal(bv, true);
                break;
        }
@@ -542,7 +547,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        case LFUN_PROTECTEDSPACE:
                //lyxerr << " called LFUN_PROTECTEDSPACE\n";
                bv->lockedInsetStoreUndo(Undo::INSERT);
-               mathcursor->insert(new MathSpaceInset(1));
+               mathcursor->insert(MathAtom(new MathSpaceInset(1)));
                updateLocal(bv, true);
                break;
 
@@ -649,10 +654,11 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                result = UNDISPATCHED;
        }
 
+       lyx::Assert(mathcursor);
        //mathcursor->normalize();
 
-       if (was_macro != mathcursor->inMacroMode()
-                               && action >= 0 && action != LFUN_BACKSPACE) 
+       if (//was_macro != mathcursor->inMacroMode() &&
+                               action >= 0 && action != LFUN_BACKSPACE) 
                updateLocal(bv, true);
        
        if (mathcursor->selection() || was_selection)
@@ -683,8 +689,7 @@ void mathDispatchCreation(BufferView * bv, string const & arg, bool display)
                //      sel = "";
                //else
 
-               string sel = bv->getLyXText()->selectionAsString(bv->buffer(),
-                                                                false);
+               string sel = bv->getLyXText()->selectionAsString(bv->buffer(), false);
 
                InsetFormulaBase * f;
                if (sel.empty()) {
@@ -766,9 +771,11 @@ void mathDispatchInsertMatrix(BufferView * bv, string const & arg)
 void mathDispatchInsertMath(BufferView * bv, string const & arg)
 {
        if (bv->available()) {
-               if (arg.size() && arg[0] == '\\')
-                       openNewInset(bv, new InsetFormula(arg));
-               else
+               if (arg.size() && arg[0] == '\\') {
+                       InsetFormula * f = new InsetFormula(arg);
+                       if (!bv->insertInset(f))
+                               delete f;
+               } else
                        mathDispatchMathMode(bv, arg);
        }
 }
@@ -779,8 +786,7 @@ void mathDispatchGreek(BufferView * bv, string const & arg)
        if (bv->available()) { 
                InsetFormula * f = new InsetFormula;
                if (openNewInset(bv, f)) {
-                       bv->theLockingInset()->localDispatch(bv, LFUN_GREEK, string());
-                       bv->theLockingInset()->localDispatch(bv, LFUN_SELFINSERT, arg);
+                       bv->theLockingInset()->localDispatch(bv, LFUN_GREEK, arg);
                        bv->unlockInset(f);
                }
        }