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

move width_/ascent_/descent_ cache into seperate ABC.

Browse Source 
sizeof(MathInset) == 24 on IA32


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2414 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2001-08-03 17:55:10 +00:00
parent 51e0c8bd1f
commit 244d75e942
16 changed files with 103 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mathed/ChangeLog
View File

@ -8,6 +8,14 @@
* formula*.[Ch]: seperation of the "pimpl" MathInset * into * formula*.[Ch]: seperation of the "pimpl" MathInset * into
MathMatrixInset * and MathMacroTemplate * to save a few casts MathMatrixInset * and MathMacroTemplate * to save a few casts
* all over the place: everything is an inset now
* math_nestinset.[Ch]: new abstract base class for insets containing
other insets.
* math_diminset.[Ch]: new abstract base class for insets that need
the width_/ascent_/descent_ cache
2001-07-25 André Pönitz <poenitz@gmx.net> 2001-07-25 André Pönitz <poenitz@gmx.net>
* formulabase.C: re-enable 'space enlargement' feature * formulabase.C: re-enable 'space enlargement' feature

2
src/mathed/Makefile.am
View File

@ -29,6 +29,8 @@ libmathed_la_SOURCES = \
math_defs.h \ math_defs.h \
math_deliminset.C \ math_deliminset.C \
math_deliminset.h \ math_deliminset.h \
math_diminset.C \
math_diminset.h \
math_dotsinset.C \ math_dotsinset.C \
math_dotsinset.h \ math_dotsinset.h \
math_fracinset.C \ math_fracinset.C \

2
src/mathed/formulabase.C
View File

@ -121,7 +121,7 @@ InsetFormulaBase::InsetFormulaBase()
#warning This is needed as long the math parser is not re-entrant #warning This is needed as long the math parser is not re-entrant
#endif #endif
MathMacroTable::builtinMacros(); MathMacroTable::builtinMacros();
//lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n"; lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n";
} }

4
src/mathed/math_dotsinset.h
View File

@ -2,7 +2,7 @@
#ifndef MATH_DOTSINSET_H #ifndef MATH_DOTSINSET_H
#define MATH_DOTSINSET_H #define MATH_DOTSINSET_H
#include "math_inset.h" #include "math_diminset.h"
#include "math_defs.h" #include "math_defs.h"
#ifdef __GNUG__ #ifdef __GNUG__
@ -12,7 +12,7 @@
struct latexkeys; struct latexkeys;
/// The different kinds of ellipsis /// The different kinds of ellipsis
class MathDotsInset : public MathInset { class MathDotsInset : public MathDimInset {
public: public:
/// ///
explicit MathDotsInset(latexkeys const *); explicit MathDotsInset(latexkeys const *);

5
src/mathed/math_funcinset.C
View File

@ -15,8 +15,9 @@ extern LyXFont WhichFont(short type, int size);
MathFuncInset::MathFuncInset(string const & nm) MathFuncInset::MathFuncInset(string const & nm)
: MathInset(nm) {
{} name_ = nm;
}
MathInset * MathFuncInset::clone() const MathInset * MathFuncInset::clone() const

10
src/mathed/math_funcinset.h
View File

@ -2,7 +2,7 @@
#ifndef MATH_FUNCINSET_H #ifndef MATH_FUNCINSET_H
#define MATH_FUNCINSET_H #define MATH_FUNCINSET_H
#include "math_inset.h" #include "math_diminset.h"
#include "math_defs.h" #include "math_defs.h"
#ifdef __GNUG__ #ifdef __GNUG__
@ -12,19 +12,19 @@
/** /**
Functions or LaTeX names for objects that I don't know how to draw. Functions or LaTeX names for objects that I don't know how to draw.
*/ */
class MathFuncInset : public MathInset { class MathFuncInset : public MathDimInset {
public: public:
/// ///
explicit MathFuncInset(string const & nm); explicit MathFuncInset(string const & nm);
/// ///
virtual MathInset * clone() const; MathInset * clone() const;
///
void MathFuncInset::metrics(MathStyles st);
/// ///
void draw(Painter &, int, int); void draw(Painter &, int, int);
/// ///
void write(std::ostream &, bool fragile) const; void write(std::ostream &, bool fragile) const;
/// ///
void writeNormal(std::ostream &) const; void writeNormal(std::ostream &) const;
///
void metrics(MathStyles st);
}; };
#endif #endif

37
src/mathed/math_inset.C
View File

@ -27,32 +27,13 @@ int MathInset::workwidth;
MathInset::MathInset(string const & name) MathInset::MathInset(string const & name)
: name_(name), width_(0), ascent_(0), descent_(0), : name_(name), size_(LM_ST_DISPLAY), code_(LM_TC_MIN), xo_(0), yo_(0)
size_(LM_ST_DISPLAY), code_(LM_TC_MIN), xo_(0), yo_(0)
{} {}
int MathInset::ascent() const
{
return ascent_;
}
int MathInset::descent() const
{
return descent_;
}
int MathInset::width() const
{
return width_;
}
int MathInset::height() const int MathInset::height() const
{ {
return ascent_ + descent_; return ascent() + descent();
} }
@ -285,7 +266,7 @@ void MathInset::push_back(unsigned char, MathTextCodes)
} }
void MathInset::push_back(MathInset * p) void MathInset::push_back(MathInset *)
{ {
lyxerr << "can't push without a cell\n"; lyxerr << "can't push without a cell\n";
} }
@ -295,9 +276,9 @@ bool MathInset::covers(int x, int y) const
{ {
return return
x >= xo_ && x >= xo_ &&
x <= xo_ + width_ && x <= xo_ + width() &&
y >= yo_ - ascent_ && y >= yo_ - ascent() &&
y <= yo_ + descent_; y <= yo_ + descent();
} }
@ -324,3 +305,9 @@ void MathInset::code(MathTextCodes t)
{ {
code_ = t; code_ = t;
} }
void MathInset::metrics(MathStyles st)
{
size_ = st;
}

14
src/mathed/math_inset.h
View File

@ -60,13 +60,13 @@ public:
/// appends itself with macro arguments substituted /// appends itself with macro arguments substituted
virtual void substitute(MathArray & array, MathMacro const & macro) const; virtual void substitute(MathArray & array, MathMacro const & macro) const;
/// compute the size of the object, sets ascend_, descend_ and width_ /// compute the size of the object, sets ascend_, descend_ and width_
virtual void metrics(MathStyles st) = 0; virtual void metrics(MathStyles st);
/// ///
virtual int ascent() const; virtual int ascent() const = 0;
/// ///
virtual int descent() const; virtual int descent() const = 0;
/// ///
virtual int width() const; virtual int width() const = 0;
/// ///
virtual int height() const; virtual int height() const;
/// ///
@ -203,12 +203,6 @@ public:
protected: protected:
/// usually the LaTeX name of the thingy /// usually the LaTeX name of the thingy
string name_; string name_;
/// the width of this inset as computed by metrics()
int width_;
///
int ascent_;
///
int descent_;
/// ///
void size(MathStyles s); void size(MathStyles s);
/// the used font size /// the used font size

26
src/mathed/math_macroarg.C
View File

@ -17,6 +17,9 @@ MathMacroArgument::MathMacroArgument(int n)
lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: " lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
<< n << std::endl; << n << std::endl;
} }
str_[0] = '#';
str_[1] = '0' + n;
str_[2] = '\0';
} }
@ -28,18 +31,25 @@ MathInset * MathMacroArgument::clone() const
void MathMacroArgument::draw(Painter & pain, int x, int y) void MathMacroArgument::draw(Painter & pain, int x, int y)
{ {
char str[] = "#0"; drawStr(pain, LM_TC_TEX, size(), x, y, str_);
str[1] += number_;
drawStr(pain, LM_TC_TEX, size(), x, y, str);
} }
void MathMacroArgument::metrics(MathStyles st) int MathMacroArgument::ascent() const
{ {
char str[] = "#0"; return mathed_char_ascent(LM_TC_TEX, size(), 'I');
str[1] += number_; }
size_ = st;
mathed_string_dim(LM_TC_TEX, size(), str, ascent_, descent_, width_);
int MathMacroArgument::descent() const
{
return mathed_char_descent(LM_TC_TEX, size(), 'I');
}
int MathMacroArgument::width() const
{
return mathed_string_width(LM_TC_TEX, size(), str_);
} }

10
src/mathed/math_macroarg.h
View File

@ -18,7 +18,7 @@ public:
/// ///
MathInset * clone() const; MathInset * clone() const;
/// ///
void metrics(MathStyles st); //void metrics(MathStyles st);
/// ///
void draw(Painter &, int x, int baseline); void draw(Painter &, int x, int baseline);
/// ///
@ -27,10 +27,18 @@ public:
void writeNormal(std::ostream &) const; void writeNormal(std::ostream &) const;
/// ///
void substitute(MathArray & array, MathMacro const & macro) const; void substitute(MathArray & array, MathMacro const & macro) const;
///
int ascent() const;
///
int descent() const;
///
int width() const;
private: private:
/// A number between 1 and 9 /// A number between 1 and 9
int number_; int number_;
///
char str_[3];
}; };
#endif #endif

6
src/mathed/math_nestinset.C
View File

@ -7,8 +7,10 @@
MathNestInset::MathNestInset(int nargs, string const & name) MathNestInset::MathNestInset(int nargs, string const & name)
: MathInset(name), cells_(nargs) : MathDimInset(), cells_(nargs)
{} {
name_ = name;
}
int MathNestInset::nargs() const int MathNestInset::nargs() const

4
src/mathed/math_nestinset.h
View File

@ -5,7 +5,7 @@
#pragma interface #pragma interface
#endif #endif
#include "math_inset.h" #include "math_diminset.h"
/** Abstract base class for all math objects that conatin nested items. /** Abstract base class for all math objects that conatin nested items.
*/ */
@ -13,7 +13,7 @@
class LaTeXFeatures; class LaTeXFeatures;
class MathNestInset : public MathInset { class MathNestInset : public MathDimInset {
public: public:
/// ///
explicit MathNestInset(int na = 0, string const & nm = string()); explicit MathNestInset(int na = 0, string const & nm = string());

4
src/mathed/math_spaceinset.h
View File

@ -2,7 +2,7 @@
#ifndef MATH_SPACEINSET_H #ifndef MATH_SPACEINSET_H
#define MATH_SPACEINSET_H #define MATH_SPACEINSET_H
#include "math_inset.h" #include "math_diminset.h"
#include "math_defs.h" #include "math_defs.h"
#ifdef __GNUG__ #ifdef __GNUG__
@ -10,7 +10,7 @@
#endif #endif
/// Smart spaces /// Smart spaces
class MathSpaceInset : public MathInset { class MathSpaceInset : public MathDimInset {
public: public:
/// ///
explicit MathSpaceInset(int sp); explicit MathSpaceInset(int sp);

5
src/mathed/math_symbolinset.h
View File

@ -2,12 +2,12 @@
#ifndef MATH_SYMBOLINSET_H #ifndef MATH_SYMBOLINSET_H
#define MATH_SYMBOLINSET_H #define MATH_SYMBOLINSET_H
#include "math_inset.h" #include "math_diminset.h"
struct latexkeys; struct latexkeys;
/// big operators /// big operators
class MathSymbolInset : public MathInset { class MathSymbolInset : public MathDimInset {
public: public:
/// ///
explicit MathSymbolInset(latexkeys const *); explicit MathSymbolInset(latexkeys const *);
@ -23,6 +23,7 @@ public:
void draw(Painter &, int, int); void draw(Painter &, int, int);
/// ///
bool isScriptable() const { return true; } bool isScriptable() const { return true; }
private: private:
/// ///
latexkeys const * sym_; latexkeys const * sym_;

23
src/mathed/support.C
View File

@ -513,7 +513,7 @@ static init_deco_table idt;
} // namespace anon } // namespace anon
void mathed_char_dim (MathTextCodes type, MathStyles size, unsigned char c, void mathed_char_dim(MathTextCodes type, MathStyles size, unsigned char c,
int & asc, int & des, int & wid) int & asc, int & des, int & wid)
{ {
LyXFont const font = WhichFont(type, size); LyXFont const font = WhichFont(type, size);
@ -532,6 +532,27 @@ int mathed_char_height(MathTextCodes type, MathStyles size, unsigned char c,
} }
int mathed_char_height(MathTextCodes type, MathStyles size, unsigned char c)
{
int asc;
int des;
return mathed_char_height(type, size, c, asc, des);
}
int mathed_char_ascent(MathTextCodes type, MathStyles size, unsigned char c)
{
LyXFont const font = WhichFont(type, size);
return lyxfont::ascent(c, font);
}
int mathed_char_descent(MathTextCodes type, MathStyles size, unsigned char c)
{
LyXFont const font = WhichFont(type, size);
return lyxfont::descent(c, font);
}
int mathed_char_width(MathTextCodes type, MathStyles size, unsigned char c) int mathed_char_width(MathTextCodes type, MathStyles size, unsigned char c)
{ {
if (MathIsBinary(type)) { if (MathIsBinary(type)) {

7
src/mathed/support.h
View File

@ -15,9 +15,11 @@ extern char const * latex_mathspace[];
int mathed_char_height(MathTextCodes type, MathStyles size, unsigned char c, int mathed_char_height(MathTextCodes type, MathStyles size, unsigned char c,
int & asc, int & des); int & asc, int & des);
int mathed_char_width(MathTextCodes type, MathStyles size, unsigned char c);
void mathed_char_dim(MathTextCodes type, MathStyles size, unsigned char c, void mathed_char_dim(MathTextCodes type, MathStyles size, unsigned char c,
int & asc, int & des, int & wid); int & asc, int & des, int & wid);
int mathed_char_width(MathTextCodes type, MathStyles size, unsigned char c);
int mathed_char_ascent(MathTextCodes type, MathStyles size, unsigned char c);
int mathed_char_descent(MathTextCodes type, MathStyles size, unsigned char c);
void mathed_draw_deco(Painter & pain, int x, int y, int w, int h, int code); void mathed_draw_deco(Painter & pain, int x, int y, int w, int h, int code);
@ -25,7 +27,10 @@ void mathed_string_dim(MathTextCodes type, MathStyles size, string const & s,
int & asc, int & des, int & wid); int & asc, int & des, int & wid);
int mathed_string_height(MathTextCodes type, MathStyles size, string const & s, int mathed_string_height(MathTextCodes type, MathStyles size, string const & s,
int & asc, int & des); int & asc, int & des);
int mathed_string_width(MathTextCodes type, MathStyles size, string const & s); int mathed_string_width(MathTextCodes type, MathStyles size, string const & s);
int mathed_string_ascent(MathTextCodes type, MathStyles size, string const & s);
int mathed_string_descent(MathTextCodes type, MathStyles size, string const & s);
bool MathIsInset(MathTextCodes x); bool MathIsInset(MathTextCodes x);
bool MathIsAlphaFont(MathTextCodes x); bool MathIsAlphaFont(MathTextCodes x);