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

mathed55.diff

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1744 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-03-12 13:58:11 +00:00
parent ddd106559c
commit b36f0c6aad
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mathed/ChangeLog
View File

@ -1,4 +1,8 @@
2001-03-12 André Pönitz <poenitz@htwm.de>
* math_rowst.h: replace MathedRowSt with MathedRowSt,
more robust MathedRowSt::[gs]etTab (to get rid of the constructor arg)
2001-03-10 André Pönitz <poenitz@htwm.de> 2001-03-10 André Pönitz <poenitz@htwm.de>
* math_xiter.[Ch]: * math_xiter.[Ch]:
math_matrixinset.C: move adjustVerticalSt to the only place where math_matrixinset.C: move adjustVerticalSt to the only place where

19
src/mathed/math_rowst.h
View File

@ -39,13 +39,13 @@ public:
/// ///
void descent(int d); void descent(int d);
/// ///
int getTab(int i) const; int getTab(unsigned int i) const;
/// ///
void setLabel(string const & l); void setLabel(string const & l);
/// ///
void setNumbered(bool nf); void setNumbered(bool nf);
/// ///
void setTab(int i, int t); void setTab(unsigned int i, int t);
/// ///
friend class MathedRowSt; friend class MathedRowSt;
protected: protected:
@ -72,6 +72,9 @@ public:
explicit MathedRowSt(int n) explicit MathedRowSt(int n)
: MathedRowStruct(n), next_(0) : MathedRowStruct(n), next_(0)
{} {}
explicit MathedRowSt(MathedRowStruct const & t)
: MathedRowStruct(t), next_(0)
{}
//private: //private:
/// ///
MathedRowSt * next_; MathedRowSt * next_;
@ -150,7 +153,7 @@ struct MathedRowContainer {
bool empty() const { return data_ == 0; } bool empty() const { return data_ == 0; }
/// insert 'item' before 'iterator' /// insert 'item' before 'iterator'
void insert(iterator const & it, MathedRowSt const & item) { void insert(iterator const & it, MathedRowStruct const & item) {
MathedRowSt * r = new MathedRowSt(item); MathedRowSt * r = new MathedRowSt(item);
if (data_ == it.st_) if (data_ == it.st_)
data_ = r; data_ = r;
@ -163,7 +166,7 @@ struct MathedRowContainer {
} }
/// insert 'item' after 'iterator' /// insert 'item' after 'iterator'
void insert_after(iterator & it, MathedRowSt const & item) { void insert_after(iterator & it, MathedRowStruct const & item) {
MathedRowSt * r = new MathedRowSt(item); MathedRowSt * r = new MathedRowSt(item);
if (it) { if (it) {
r->next_ = it.st_->next_; r->next_ = it.st_->next_;
@ -251,9 +254,9 @@ void MathedRowStruct::descent(int d)
inline inline
int MathedRowStruct::getTab(int i) const int MathedRowStruct::getTab(unsigned int i) const
{ {
return widths_[i]; return i < widths_.size() ? widths_[i] : 0;
} }
@ -272,8 +275,10 @@ void MathedRowStruct::setNumbered(bool nf)
inline inline
void MathedRowStruct::setTab(int i, int t) void MathedRowStruct::setTab(unsigned int i, int t)
{ {
if (i >= widths_.size())
widths_.resize(i + 2);
widths_[i] = t; widths_[i] = t;
} }
#endif #endif