anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 1823 by reverting to the mbox solution of 1.3

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9717 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-03-16 17:06:47 +00:00
parent 0153a52b57
commit da92b37c1d
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mathed/ChangeLog
View File

@ -1,3 +1,12 @@
2005-03-15 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* math_nestinset.C (doDispatch): create a MathBoxInset for mbox
rather than a MathMBoxInset, since the latter is not usable yet.
Fixes bug 1823.
* math_factory.C (createMathInset): Don't hardwire mbox, but read it
from lib/symbols again. This makes it possible to create other
"mbox-like" boxes.
2005-03-02 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* math_parser.C (parse1): Don't parse "\|" following a "\left" or

5
src/mathed/Makefile.am
View File

@ -100,8 +100,6 @@ libmathed_la_SOURCES = \
math_mathmlstream.h \
math_matrixinset.C \
math_matrixinset.h \
math_mboxinset.C \
math_mboxinset.h \
math_nestinset.C \
math_nestinset.h \
math_numberinset.C \
@ -151,3 +149,6 @@ libmathed_la_SOURCES = \
command_inset.C \
ref_inset.h \
ref_inset.C
# math_mboxinset.C
# math_mboxinset.h

10
src/mathed/math_factory.C
View File

@ -253,8 +253,12 @@ MathAtom createMathInset(string const & s)
return MathAtom(new MathSpaceInset(l->name));
if (inset == "dots")
return MathAtom(new MathDotsInset(l));
// if (inset == "mbox")
// return MathAtom(new MathBoxInset(l->name));
if (inset == "mbox")
// return MathAtom(new MathMBoxInset);
// MathMBoxInset is proposed to replace MathBoxInset,
// but is not ready yet (it needs a BufferView for
// construction)
return MathAtom(new MathBoxInset(l->name));
// if (inset == "fbox")
// return MathAtom(new MathFboxInset(l));
if (inset == "style")
@ -275,8 +279,6 @@ MathAtom createMathInset(string const & s)
return MathAtom(new MathMacroArgument(s[2] - '0'));
if (s == "boxed")
return MathAtom(new MathBoxedInset());
if (s == "mbox")
return MathAtom(new MathBoxInset("mbox"));
if (s == "fbox")
return MathAtom(new MathFboxInset());
if (s == "framebox")

6
src/mathed/math_nestinset.C
View File

@ -13,6 +13,7 @@
#include "math_nestinset.h"
#include "math_arrayinset.h"
#include "math_boxinset.h"
#include "math_braceinset.h"
#include "math_commentinset.h"
#include "math_data.h"
@ -21,7 +22,7 @@
#include "math_hullinset.h"
#include "math_mathmlstream.h"
#include "math_macroarg.h"
#include "math_mboxinset.h"
//#include "math_mboxinset.h"
#include "math_parser.h"
#include "math_scriptinset.h"
#include "math_spaceinset.h"
@ -712,7 +713,8 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
break;
cur.macroModeClose();
selClearOrDel(cur);
cur.plainInsert(MathAtom(new MathMBoxInset(cur.bv())));
//cur.plainInsert(MathAtom(new MathMBoxInset(cur.bv())));
cur.plainInsert(MathAtom(new MathBoxInset("mbox")));
cur.posLeft();
cur.pushLeft(*cur.nextInset());
#else