MathParInset::MathParInset(short st, string const & nm, short ot)
: MathedInset(nm, ot, st)
{
- array = 0;
ascent = 8;
width = 4;
descent = 0;
}
-MathParInset::MathParInset(MathParInset * p)
- : MathedInset(p)
-{
- flag = p->flag;
- p->setArgumentIdx(0);
- MathedIter it(p->GetData());
- SetData(it.Copy());
-}
-
-
MathParInset::~MathParInset()
{
- if (array) {
- MathedIter it(array);
- it.Clear();
- delete array;
- }
}
MathedInset * MathParInset::Clone()
{
- return new MathParInset(this);
+ return new MathParInset(*this);
}
-void MathParInset::SetData(MathedArray * a)
+void MathParInset::setData(MathedArray * a)
{
- array = a;
+ if (!a) {
+ lyxerr << "can't set Data from NULL pointer" << endl;
+ array = MathedArray();
+ return;
+ }
+
+ array = *a;
// A standard paragraph shouldn't have any tabs nor CRs.
- if (array) {
- MathedIter it(array);
- while (it.OK()) {
- char c = it.GetChar();
- if (c == LM_TC_TAB || c == LM_TC_CR)
- it.Delete();
- else
- it.Next();
- }
+ MathedIter it(&array);
+ while (it.OK()) {
+ char c = it.GetChar();
+ if (c == LM_TC_TAB || c == LM_TC_CR)
+ it.Delete();
+ else
+ it.Next();
}
}
{
byte cxp = 0;
int xp = 0;
- int asc = df_asc, des = 0;
+ int asc = df_asc;
+ int des = 0;
bool limits = false;
- xo = x; yo = y;
- if (!array || array->empty()) {
- if (array) {
- MathedXIter data(this);
- data.GetPos(x, y);
- }
+ xo_ = x;
+ yo_ = y;
+ if (array.empty()) {
+ MathedXIter data(this);
+ data.GetPos(x, y);
pain.rectangle(x, y - df_asc, df_width, df_asc, LColor::mathline);
return;
}
byte cx = data.GetChar();
if (cx >= ' ') {
string s = data.GetString();
- drawStr(pain, data.FCode(), size, x, y, s);
- mathed_char_height(LM_TC_CONST, size, 'y', asc, des);
+ drawStr(pain, data.fcode(), size(), x, y, s);
+ mathed_char_height(LM_TC_CONST, size(), 'y', asc, des);
limits = false;
}
else {
ascent = df_asc;//mathed_char_height(LM_TC_VAR, size, 'I', asc, des);
width = df_width;
descent = 0;
- if (!array) return;
- if (array->empty()) return;
+ if (array.empty()) return;
ascent = 0;
MathedXIter data(this);
cx = data.GetChar();
if (cx >= ' ') {
string s = data.GetString();
- mathed_string_height(data.FCode(), size, s, asc, des);
+ mathed_string_height(data.fcode(),
+ size(), s, asc, des);
if (asc > ascent) ascent = asc;
if (des > descent) descent = des;
limits = false;
- mathed_char_height(LM_TC_CONST, size, 'y', asc, des);
+ mathed_char_height(LM_TC_CONST, size(), 'y', asc, des);
} else
if (MathIsInset(cx)) {
MathedInset * p = data.GetInset();
- p->SetStyle(size);
+ p->SetStyle(size());
p->Metrics();
if (cx == LM_TC_UP) {
asc += (limits) ? p->Height() + 4: p->Ascent() +
void MathParInset::Write(ostream & os, bool fragile)
{
- if (!array) return;
+ if (array.empty()) return;
int brace = 0;
- latexkeys * l;
- MathedIter data(array);
+ latexkeys const * l;
+ MathedIter data(&array);
// hack
MathedRowSt const * crow = getRowSt();
data.Reset();
if (!Permit(LMPF_FIXED_SIZE)) {
- l = lm_get_key_by_id(size, LM_TK_STY);
+ l = lm_get_key_by_id(size(), LM_TK_STY);
if (l) {
os << '\\' << l->name << ' ';
}
if (cx >= ' ') {
string str = data.GetString();
- if (data.FCode() >= LM_TC_RM && data.FCode() <= LM_TC_TEXTRM) {
- os << '\\' << math_font_name[data.FCode()-LM_TC_RM] << '{';
+ if (data.fcode() >= LM_TC_RM && data.fcode() <= LM_TC_TEXTRM) {
+ os << '\\' << math_font_name[data.fcode()-LM_TC_RM] << '{';
}
for (string::const_iterator s = str.begin();
s != str.end(); ++s) {
byte c = *s;
- if (MathIsSymbol(data.FCode())) {
- l = lm_get_key_by_id(c, (data.FCode() == LM_TC_BSYM) ?
+ if (MathIsSymbol(data.fcode())) {
+ l = lm_get_key_by_id(c, (data.fcode() == LM_TC_BSYM) ?
LM_TK_BIGSYM : LM_TK_SYM);
if (l) {
os << '\\' << l->name << ' ';
} else {
#warning this does not compile on gcc 2.97
//lyxerr << "Illegal symbol code[" << c
- // << " " << str.end() - s << " " << data.FCode() << "]";
+ // << " " << str.end() - s << " " << data.fcode() << "]";
}
} else {
// Is there a standard logical XOR?
- if ((data.FCode() == LM_TC_TEX && c != '{' && c != '}') ||
- (data.FCode() == LM_TC_SPECIAL))
+ if ((data.fcode() == LM_TC_TEX && c != '{' && c != '}') ||
+ (data.fcode() == LM_TC_SPECIAL))
os << '\\';
else {
if (c == '{') ++brace;
if (c == '}') --brace;
}
- if (c == '}' && data.FCode() == LM_TC_TEX && brace < 0)
+ if (c == '}' && data.fcode() == LM_TC_TEX && brace < 0)
lyxerr <<"Math warning: Unexpected closing brace."
<< endl;
else
os << char(c);
}
}
- if (data.FCode()>= LM_TC_RM && data.FCode()<= LM_TC_TEXTRM)
+ if (data.fcode()>= LM_TC_RM && data.fcode()<= LM_TC_TEXTRM)
os << '}';
} else
if (MathIsInset(cx)) {
}
+void MathParInset::clear()
+{
+ array.clear();
+}
+
bool MathParInset::Inside(int x, int y)
{
- return (x >= xo && x <= xo + width
- && y <= yo + descent && y >= yo - ascent);
+ return (x >= xo() && x <= xo() + width
+ && y <= yo() + descent && y >= yo() - ascent);
}
void MathParInset::GetXY(int & x, int & y) const
{
- x = xo;
- y = yo;
+ x = xo();
+ y = yo();
}
void MathParInset::UserSetSize(short sz)
{
if (sz >= 0) {
- size = sz;
+ size(sz);
flag = flag & ~LMPF_FIXED_SIZE;
}
}
}
-void MathParInset::setFlag(MathedParFlag f)
-{
- flag |= f;
-}
-
-
bool MathParInset::Permit(short f) const
{
return bool(f & flag);
MathedArray * MathParInset::GetData()
{
- return array;
+ return &array;
}
void MathParInset::setXY(int x, int y)
{
- xo = x;
- yo = y;
+ xo_ = x;
+ yo_ = y;
}