#include "Painter.h"
#include "font.h"
#include "support/lyxlib.h"
+#include "lyxrc.h"
+#include "math_defs.h"
+#include "math_inset.h"
+#include "math_parinset.h"
+#include "math_matrixinset.h"
+#include "math_rowst.h"
+#include "math_spaceinset.h"
+#include "math_deliminset.h"
+#include "support.h"
using std::ostream;
using std::istream;
using std::vector;
using std::max;
-//extern char * mathed_label;
+#if 0
+using std::strncmp;
+using std::strcmp;
+using std::abs;
+using std::isdigit;
+using std::isalpha;
+#endif
+
extern string mathed_label;
extern char const * latex_special_chars;
MathedCursor * InsetFormula::mathcursor = 0;
-
-int MathedInset::df_asc;
-int MathedInset::df_des;
-int MathedInset::df_width;
+void mathed_init_fonts();
static
LyXFont WhichFont(short type, int size)
{
- LyXFont f;
-
- if (!Math_Fonts)
- mathed_init_fonts();
-
- switch (type) {
- case LM_TC_SYMB:
- f = Math_Fonts[2];
- break;
- case LM_TC_BSYM:
- f = Math_Fonts[2];
- break;
- case LM_TC_VAR:
- case LM_TC_IT:
- f = Math_Fonts[0];
- break;
- case LM_TC_BF:
- f = Math_Fonts[3];
- break;
- case LM_TC_SF:
- f = Math_Fonts[7];
- break;
- case LM_TC_CAL:
- f = Math_Fonts[4];
- break;
- case LM_TC_TT:
- f = Math_Fonts[5];
- break;
- case LM_TC_SPECIAL: //f = Math_Fonts[0]; break;
- case LM_TC_TEXTRM:
- case LM_TC_RM:
- f = Math_Fonts[6];
- break;
- default:
- f = Math_Fonts[1];
- break;
- }
+ LyXFont f;
- f.setSize(lfont_size);
-
- switch (size) {
- case LM_ST_DISPLAY:
- if (type == LM_TC_BSYM) {
- f.incSize();
- f.incSize();
+ if (!Math_Fonts)
+ mathed_init_fonts();
+
+ switch (type) {
+ case LM_TC_SYMB:
+ f = Math_Fonts[2];
+ break;
+ case LM_TC_BSYM:
+ f = Math_Fonts[2];
+ break;
+ case LM_TC_VAR:
+ case LM_TC_IT:
+ f = Math_Fonts[0];
+ break;
+ case LM_TC_BF:
+ f = Math_Fonts[3];
+ break;
+ case LM_TC_SF:
+ f = Math_Fonts[7];
+ break;
+ case LM_TC_CAL:
+ f = Math_Fonts[4];
+ break;
+ case LM_TC_TT:
+ f = Math_Fonts[5];
+ break;
+ case LM_TC_SPECIAL: //f = Math_Fonts[0]; break;
+ case LM_TC_TEXTRM:
+ case LM_TC_RM:
+ f = Math_Fonts[6];
+ break;
+ default:
+ f = Math_Fonts[1];
+ break;
}
+
+ f.setSize(lfont_size);
+
+ switch (size) {
+ case LM_ST_DISPLAY:
+ if (type == LM_TC_BSYM) {
+ f.incSize();
+ f.incSize();
+ }
break;
- case LM_ST_TEXT:
- break;
- case LM_ST_SCRIPT:
- f.decSize();
- break;
- case LM_ST_SCRIPTSCRIPT:
- f.decSize();
- f.decSize();
- break;
- default:
- lyxerr << "Mathed Error: wrong font size: " << size << endl;
+ case LM_ST_TEXT:
+ break;
+ case LM_ST_SCRIPT:
+ f.decSize();
+ break;
+ case LM_ST_SCRIPTSCRIPT:
+ f.decSize();
+ f.decSize();
break;
- }
-
- if (type != LM_TC_TEXTRM)
- f.setColor(LColor::math);
- return f;
+ default:
+ lyxerr << "Mathed Error: wrong font size: " << size << endl;
+ break;
+ }
+
+ if (type != LM_TC_TEXTRM)
+ f.setColor(LColor::math);
+ return f;
}
}
-LyXFont mathed_get_font(short type, int size)
-{
- LyXFont f = WhichFont(type, size);
- if (type == LM_TC_TEX) {
- f.setLatex(LyXFont::ON);
- }
- return f;
-}
-
-
-int mathed_string_width(short type, int size, byte const * s, int ls)
-{
- LyXFont f = WhichFont(type, size);
-
- byte sx[80];
- if (MathIsBinary(type)) {
- byte * ps = &sx[0];
- for (int i = 0; i < ls && i < 75; ++i) {
- *(ps++) = ' ';
- *(ps++) = s[i];
- *(ps++) = ' ';
- }
- *(ps++) = '\0';
- ls *= 3;
- s = &sx[0];
- }
- return lyxfont::width(reinterpret_cast<char const *>(s), ls, f);
-}
-
-int mathed_string_width(short type, int size, string const & str)
-{
- return mathed_string_width(type, size, reinterpret_cast<unsigned char const *>(str.c_str()), str.length());
-}
-
-
-int mathed_char_width(short type, int size, byte c)
-{
- int t = (MathIsBinary(type)) ? mathed_string_width(type, size, &c, 1) :
- lyxfont::width(c, WhichFont(type, size));
- return t;
-}
-int mathed_string_height(short type, int size, byte const * s,
- int ls, int & asc, int & des)
-{
- LyXFont font = WhichFont(type, size);
- asc = des = 0;
- for (int i = 0; i < ls; ++i) {
- des = max(des, lyxfont::descent(s[i], font));
- asc = max(asc, lyxfont::ascent(s[i], font));
- }
- return asc + des;
-}
-int mathed_string_height(short type, int size, string const & str,
- int & asc, int & des)
-{
- return mathed_string_height(type, size,
- reinterpret_cast<unsigned char const *>(str.c_str()), str.length(),
- asc, des);
-}
-int mathed_char_height(short type, int size, byte c, int & asc, int & des)
-{
- LyXFont font = WhichFont(type, size);
- des = lyxfont::descent(c, font);
- asc = lyxfont::ascent(c, font);
- return asc + des;
-}
-// In a near future maybe we use a better fonts renderer
-void MathedInset::drawStr(Painter & pain, short type, int siz,
- int x, int y, byte const * s, int ls)
-{
- string st;
- if (MathIsBinary(type)) {
- for (int i = 0; i < ls; ++i) {
- st += string(" ") + char(s[i]) + ' ';
- }
- } else {
- st = string(reinterpret_cast<char const *>(s), ls);
- }
- LyXFont const mf = mathed_get_font(type, siz);
- pain.text(x, y, st, mf);
-}
InsetFormula::InsetFormula(bool display)
{
- par = new MathParInset; // this leaks
- // mathcursor = 0;
- disp_flag = display;
- //label = 0;
- if (disp_flag) {
- par->SetType(LM_OT_PAR);
- par->SetStyle(LM_ST_DISPLAY);
- }
+ par = new MathParInset; // this leaks
+ // mathcursor = 0;
+ disp_flag = display;
+ //label = 0;
+ if (disp_flag) {
+ par->SetType(LM_OT_PAR);
+ par->SetStyle(LM_ST_DISPLAY);
+ }
}
InsetFormula::InsetFormula(MathParInset * p)
{
- par = (p->GetType()>= LM_OT_MPAR) ?
+ if (is_matrix_type(p->GetType()))
+ lyxerr << "InsetFormula::InsetFormula: This shouldn't happen" << endl;
+ par = is_multiline(p->GetType()) ?
new MathMatrixInset(static_cast<MathMatrixInset*>(p)):
new MathParInset(p);
// mathcursor = 0;
}
-Inset * InsetFormula::Clone() const
+Inset * InsetFormula::Clone(Buffer const &) const
{
InsetFormula * f = new InsetFormula(par);
f->label = label;
// Check if uses AMS macros
void InsetFormula::Validate(LaTeXFeatures & features) const
{
- // Validation only necesary if not using an AMS Style
- if (!features.amsstyle)
- mathedValidate(features, par);
+ if (is_ams(par->GetType()))
+ features.amsstyle = true;
+
+ // Validation is necessary only if not using AMS math.
+ // To be safe, we will always run mathedValidate.
+ //if (!features.amsstyle)
+ mathedValidate(features, par);
}
}
-int InsetFormula::width(BufferView *, LyXFont const & f) const
+int InsetFormula::width(BufferView * bv, LyXFont const & f) const
{
+ MathedInset::workWidth = bv->workWidth();
lfont_size = f.size();
par->Metrics();
return par->Width(); //+2;
void InsetFormula::draw(BufferView * bv, LyXFont const & f,
int baseline, float & x, bool) const
{
+ MathedInset::workWidth = bv->workWidth();
Painter & pain = bv->painter();
// Seems commenting out solves a problem.
LyXFont font = mathed_get_font(LM_TC_TEXTRM, LM_ST_TEXT);
par->draw(pain, int(x), baseline);
}
x += float(width(bv, font));
-
- if (par->GetType() == LM_OT_PARN || par->GetType() == LM_OT_MPARN) {
+
+ if (is_numbered(par->GetType())) {
LyXFont wfont = WhichFont(LM_TC_BF, par->size);
wfont.setLatex(LyXFont::OFF);
- if (par->GetType() == LM_OT_PARN) {
+ if (is_singlely_numbered(par->GetType())) {
string str;
if (!label.empty())
str = string("(") + label + ")";
else
str = string("(#)");
pain.text(int(x + 20), baseline, str, wfont);
- } else if (par->GetType() == LM_OT_MPARN) {
+ } else {
MathMatrixInset * mt =
static_cast<MathMatrixInset*>(par);
int y;
}
-void InsetFormula::ShowInsetCursor(BufferView * bv)
+void InsetFormula::ShowInsetCursor(BufferView * bv, bool)
{
if (!cursor_visible) {
if (mathcursor) {
//int n;
//XPoint * p =
//mathcursor->SelGetArea(n);
-// XFillPolygon(fl_display, pm, LyXGetSelectionGC(), p, n, Nonconvex, CoordModeOrigin);
+// XFillPolygon(fl_get_display(), pm, LyXGetSelectionGC(), p, n, Nonconvex, CoordModeOrigin);
// x -= par->xo;
// y -= par->yo;
par->SetType(LM_OT_PAR);
par->SetStyle(LM_ST_DISPLAY);
} else {
- if (par->GetType() >= LM_OT_MPAR) {
+ if (is_multiline(par->GetType())) {
MathParInset * p = new MathParInset(par);
delete par;
par = p;
}
par->SetType(LM_OT_MIN);
par->SetStyle(LM_ST_TEXT);
- if (!label.empty() && par->GetType() != LM_OT_MPARN) {
+ if (!label.empty()) {
label.erase();
}
}
vector<string> label_list;
- if (par->GetType() == LM_OT_MPARN) {
+ if (is_multi_numbered(par->GetType())) {
MathMatrixInset * mt = static_cast<MathMatrixInset*>(par);
MathedRowSt const * crow = mt->getRowSt();
while (crow) {
{
if (disp_flag) {
short type = par->GetType();
- bool oldf = (type == LM_OT_PARN || type == LM_OT_MPARN);
+ bool oldf = is_numbered(type);
if (numbf && !oldf) ++type;
if (!numbf && oldf) --type;
par->SetType(type);
result = DISPATCHED_NOUPDATE;
break;
case LFUN_DELETE_LINE_FORWARD:
- //current_view->lockedInsetStoreUndo(Undo::INSERT);
- bv->lockedInsetStoreUndo(Undo::DELETE);
+ bv->lockedInsetStoreUndo(Undo::DELETE);
mathcursor->DelLine();
UpdateLocal(bv);
break;
case LFUN_BREAKLINE:
+ {
bv->lockedInsetStoreUndo(Undo::INSERT);
- mathcursor->Insert(' ', LM_TC_CR);
+ byte c = arg.empty() ? '1' : arg[0];
+ mathcursor->Insert(c, LM_TC_CR);
+ if (!label.empty()) {
+ mathcursor->setLabel(label);
+ label.erase();
+ }
par = mathcursor->GetPar();
UpdateLocal(bv);
break;
+ }
case LFUN_TAB:
bv->lockedInsetStoreUndo(Undo::INSERT);
mathcursor->Insert(0, LM_TC_TAB);
}
case LFUN_DELETE:
- //current_view->lockedInsetStoreUndo(Undo::INSERT);
- bv->lockedInsetStoreUndo(Undo::DELETE);
+ bv->lockedInsetStoreUndo(Undo::DELETE);
mathcursor->Delete();
bv->updateInset(this, true);
break;
}
// Math fonts
- case LFUN_BOLD: mathcursor->setLastCode(LM_TC_BF); break;
- case LFUN_SANS: mathcursor->setLastCode( LM_TC_SF); break;
- case LFUN_EMPH: mathcursor->setLastCode(LM_TC_CAL); break;
- case LFUN_ROMAN: mathcursor->setLastCode(LM_TC_RM); break;
- case LFUN_CODE: mathcursor->setLastCode(LM_TC_TT); break;
- case LFUN_DEFAULT: mathcursor->setLastCode(LM_TC_VAR ) ; break;
+ case LFUN_BOLD: mathcursor->toggleLastCode(LM_TC_BF); break;
+ case LFUN_SANS: mathcursor->toggleLastCode(LM_TC_SF); break;
+ case LFUN_EMPH: mathcursor->toggleLastCode(LM_TC_CAL); break;
+ case LFUN_ROMAN: mathcursor->toggleLastCode(LM_TC_RM); break;
+ case LFUN_CODE: mathcursor->toggleLastCode(LM_TC_TT); break;
+ case LFUN_DEFAULT: mathcursor->setLastCode(LM_TC_VAR); break;
case LFUN_TEX:
{
// varcode = LM_TC_TEX;
bv->lockedInsetStoreUndo(Undo::INSERT);
if (disp_flag) {
short type = par->GetType();
- bool oldf = (type == LM_OT_PARN || type == LM_OT_MPARN);
- if (oldf) {
+ if (is_numbered(type)) {
--type;
if (!label.empty()) {
label.erase();
case LFUN_MATH_NONUMBER:
{
- if (par->GetType() == LM_OT_MPARN) {
+ if (is_multi_numbered(par->GetType())) {
// MathMatrixInset *mt = (MathMatrixInset*)par;
//BUG
// mt->SetNumbered(!mt->IsNumbered());
-
+
+#warning This is a terrible hack! We should find a better solution.
+ while (mathcursor->getLabel() == MathedXIter::error_label) {
+ if (LocalDispatch(bv, LFUN_LEFT, string()) == FINISHED)
+ return DISPATCHED;
+ }
mathcursor->setNumbered();
- UpdateLocal(bv);
+ UpdateLocal(bv);
}
break;
}
if (arg.empty())
break;
- strncpy(arg2, arg.c_str(), 40); arg2[39]= '\0';
+ ::strncpy(arg2, arg.c_str(), 40); arg2[39]= '\0';
int n = sscanf(arg2, "%s %s", lf, rg);
lf[39] = '\0'; rg[39] = '\0';
if (lf[1]) {
l = in_word_set(lf, strlen(lf));
// Long words will cause l == 0; so check.
- if(l) ilf = l->id;
+ if (l) ilf = l->id;
} else
if (vdelim.find(lf[0]) != string::npos)
ilf = lf[0];
else
if (rg[1]) {
l = in_word_set(rg, strlen(rg));
- if(l) irg = l->id;
+ if (l) irg = l->id;
} else
if (vdelim.find(rg[0]) != string::npos)
irg = rg[0];
case LFUN_INSERT_LABEL:
{
bv->lockedInsetStoreUndo(Undo::INSERT);
- if (par->GetType() < LM_OT_PAR) break;
- string lb = arg;
- if (lb.empty()) {
- pair<bool, string>
- res = askForText(_("Enter new label to insert:"));
- if (res.first) {
- lb = res.second;
- }
+ if (par->GetType() < LM_OT_PAR)
+ break;
+
+ string old_label = is_multiline(par->GetType())
+ ? mathcursor->getLabel() : label;
+
+#warning This is a terrible hack! We should find a better solution.
+ /// This is needed becuase in some positions mathcursor->cursor->crow
+ /// is equal to 0, and therefore the label cannot be inserted.
+ /// So we move the cursor left until mathcursor->cursor->crow != 0.
+ while (old_label == MathedXIter::error_label) {
+ if (LocalDispatch(bv, LFUN_LEFT, string()) == FINISHED)
+ return DISPATCHED;
+ old_label = mathcursor->getLabel();
+ }
+
+ string new_label = arg;
+ if (new_label.empty()) {
+ string default_label = (lyxrc.label_init_length >= 0) ? "eq:" : "";
+ pair<bool, string> res = old_label.empty()
+ ? askForText(_("Enter new label to insert:"), default_label)
+ : askForText(_("Enter label:"), old_label);
+ if (!res.first)
+ break;
+ new_label = frontStrip(strip(res.second));
}
- if (!lb.empty() && lb[0] > ' ') {
+
+ if (new_label == old_label)
+ break; // Nothing to do
+
+ if (!new_label.empty())
SetNumber(true);
- if (par->GetType() == LM_OT_MPARN) {
- mathcursor->setLabel(lb);
-// MathMatrixInset *mt = (MathMatrixInset*)par;
-// mt->SetLabel(lb);
- } else {
- //if (label.notEmpty()) delete label;
- label = lb;
- }
- UpdateLocal(bv);
- } else
- label.erase();
+
+ if (!new_label.empty() && bv->ChangeRefsIfUnique(old_label, new_label))
+ bv->redraw();
+
+ if (is_multi_numbered(par->GetType()))
+ mathcursor->setLabel(new_label);
+// MathMatrixInset *mt = (MathMatrixInset*)par;
+// mt->SetLabel(new_label);
+ else
+ label = new_label;
+ UpdateLocal(bv);
break;
}
case LFUN_MATH_DISPLAY:
- //current_view->lockedInsetStoreUndo(Undo::INSERT);
- bv->lockedInsetStoreUndo(Undo::EDIT);
+ bv->lockedInsetStoreUndo(Undo::EDIT);
display(!disp_flag);
UpdateLocal(bv);
break;
//------- dummy actions
case LFUN_EXEC_COMMAND:
- bv->owner()->getMiniBuffer()->ExecCommand();
+ bv->owner()->getMiniBuffer()->PrepareForCommand();
break;
default:
result = FINISHED;
}
} else
- if (c == '\'') {
+ if (c == '\'' || c == '@') {
mathcursor->Insert (c, LM_TC_VAR);
} else
if (c == '\\') {
mathcursor->setLastCode(LM_TC_TEX);
}
UpdateLocal(bv);
+ } else if (action == LFUN_MATH_PANEL) {
+ result = UNDISPATCHED;
} else {
// lyxerr << "Closed by action " << action << endl;
result = FINISHED;
if (mathcursor->Selection() || was_selection)
ToggleInsetSelection(bv);
- if ((result == DISPATCHED) || (result == DISPATCHED_NOUPDATE))
+ if ((result == DISPATCHED) || (result == DISPATCHED_NOUPDATE) ||
+ (result == UNDISPATCHED))
ShowInsetCursor(bv);
else
bv->unlockInset(this);
}
-void
-MathFuncInset::draw(Painter & pain, int x, int y)
-{
- if (!name.empty() && name[0] > ' ') {
- LyXFont font = WhichFont(LM_TC_TEXTRM, size);
- font.setLatex(LyXFont::ON);
- x += (lyxfont::width('I', font) + 3) / 4;
- pain.text(x, y, name, font);
- }
-}
-
-
-void MathFuncInset::Metrics()
-{
- //ln = (name) ? strlen(name): 0;
- LyXFont font = WhichFont(LM_TC_TEXTRM, size);
- font.setLatex(LyXFont::ON);
- if (name.empty()) {
- width = df_width;
- descent = df_des;
- ascent = df_asc;
- } else {
- width = lyxfont::width(name, font)
- + lyxfont::width('I', font) / 2;
- mathed_string_height(LM_TC_TEXTRM, size, name, ascent, descent);
- }
-}
-
static
void mathedValidate(LaTeXFeatures & features, MathParInset * par)
while (it.OK() && !(features.binom && features.boldsymbol)) {
if (it.IsInset()) {
- if(it.IsActive()) {
+ if (it.IsActive()) {
MathParInset * p = it.GetActiveInset();
if (!features.binom && p->GetType() == LM_OT_MACRO &&
p->GetName() == "binom") {
projects / lyx.git / blobdiff