anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #860

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6034 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-02-05 11:44:14 +00:00
parent 0518f315b6
commit 74078920a3
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mathed/math_parser.C
View File

@ -959,6 +959,12 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
} }
} }
else if (t.cs() == "xrightarrow" || t.cs() == "xleftarrow") {
cell->push_back(createMathInset(t.cs()));
parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);
parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
}
else if (t.cs() == "ref") { else if (t.cs() == "ref") {
cell->push_back(MathAtom(new RefInset)); cell->push_back(MathAtom(new RefInset));
parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode); parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);

25
src/mathed/math_xarrowinset.C
View File

@ -12,7 +12,7 @@
MathXArrowInset::MathXArrowInset(string const & name) MathXArrowInset::MathXArrowInset(string const & name)
: MathNestInset(1), name_(name) : MathFracbaseInset(), name_(name)
{} {}
@ -24,29 +24,34 @@ MathInset * MathXArrowInset::clone() const
void MathXArrowInset::metrics(MathMetricsInfo & mi) const void MathXArrowInset::metrics(MathMetricsInfo & mi) const
{ {
//MathMetricsInfo mi = st; MathScriptChanger dummy(mi.base);
//smallerStyleScript(mi);
cell(0).metrics(mi); cell(0).metrics(mi);
dim_.w = cell(0).width() + 10; cell(1).metrics(mi);
dim_.w = std::max(cell(0).width(), cell(1).width()) + 10;
dim_.a = cell(0).height() + 10; dim_.a = cell(0).height() + 10;
dim_.d = 0; dim_.d = cell(1).height();
} }
void MathXArrowInset::draw(MathPainterInfo & pain, int x, int y) const void MathXArrowInset::draw(MathPainterInfo & pi, int x, int y) const
{ {
cell(0).draw(pain, x + 5, y - 10); MathScriptChanger dummy(pi.base);
mathed_draw_deco(pain, x + 1, y - 7, width() - 2, 5, name_); cell(0).draw(pi, x + 5, y - 10);
cell(1).draw(pi, x + 5, y + cell(1).height());
mathed_draw_deco(pi, x + 1, y - 7, width() - 2, 5, name_);
} }
void MathXArrowInset::write(WriteStream & os) const void MathXArrowInset::write(WriteStream & os) const
{ {
os << '\\' << name_ << '{' << cell(0) << '}'; os << '\\' << name_;
if (cell(1).size())
os << '[' << cell(1) << ']';
os << '{' << cell(0) << '}';
} }
void MathXArrowInset::normalize(NormalStream & os) const void MathXArrowInset::normalize(NormalStream & os) const
{ {
os << "[xarrow " << name_ << ' ' << cell(0) << ']'; os << "[xarrow " << name_ << ' ' << cell(0) << ' ' << cell(1) << ']';
} }

8
src/mathed/math_xarrowinset.h
View File

@ -2,7 +2,7 @@
#ifndef MATH_XARROWINSET_H #ifndef MATH_XARROWINSET_H
#define MATH_XARROWINSET_H #define MATH_XARROWINSET_H
#include "math_nestinset.h" #include "math_fracbase.h"
#include "LString.h" #include "LString.h"
#ifdef __GNUG__ #ifdef __GNUG__
@ -15,18 +15,18 @@
* Full author contact details are available in file CREDITS * Full author contact details are available in file CREDITS
*/ */
class MathXArrowInset : public MathNestInset { class MathXArrowInset : public MathFracbaseInset {
public: public:
/// ///
explicit MathXArrowInset(string const & name); explicit MathXArrowInset(string const & name);
/// ///
MathInset * clone() const; MathInset * clone() const;
/// ///
void draw(MathPainterInfo &, int x, int y) const; void draw(MathPainterInfo & pi, int x, int y) const;
/// ///
void write(WriteStream & os) const; void write(WriteStream & os) const;
/// ///
void metrics(MathMetricsInfo & st) const; void metrics(MathMetricsInfo & mi) const;
/// ///
void normalize(NormalStream & os) const; void normalize(NormalStream & os) const;