-#include <config.h>
+/**
+ * \file math_support.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
-#include <map>
+#include <config.h>
#include "math_support.h"
-#include "lyxfont.h"
-#include "math_cursor.h"
-#include "math_defs.h"
+#include "math_data.h"
#include "math_inset.h"
+#include "math_mathmlstream.h"
#include "math_parser.h"
+
+#include "debug.h"
+#include "LColor.h"
+
#include "frontends/Painter.h"
#include "frontends/font_metrics.h"
-#include "frontends/font_loader.h"
-#include "debug.h"
-#include "commandtags.h"
+#include "frontends/lyx_gui.h"
-using std::map;
-using std::endl;
+#include <map>
+#include <sstream>
+
+
+using std::string;
using std::max;
+using std::endl;
///
{"check", angle, 1 },
{"breve", parenth, 1 },
{"vec", arrow, 3 },
- {"not", slash, 0 },
{"mathring", ring, 0 },
// Dots
+ {"dots", hline3, 0 },
{"ldots", hline3, 0 },
{"cdots", hline3, 0 },
{"vdots", hline3, 1 },
};
-map<string, deco_struct> deco_list;
+std::map<string, deco_struct> deco_list;
// sort the table on startup
-struct init_deco_table {
+class init_deco_table {
+public:
init_deco_table() {
unsigned const n = sizeof(deco_table) / sizeof(deco_table[0]);
for (named_deco_struct * p = deco_table; p != deco_table + n; ++p) {
deco_struct const * search_deco(string const & name)
{
- map<string, deco_struct>::const_iterator p = deco_list.find(name);
+ std::map<string, deco_struct>::const_iterator p = deco_list.find(name);
return (p == deco_list.end()) ? 0 : &(p->second);
}
} // namespace anon
-void mathed_char_dim(LyXFont const & font,
- unsigned char c, int & asc, int & des, int & wid)
+void mathed_char_dim(LyXFont const & font, unsigned char c, Dimension & dim)
{
- des = font_metrics::descent(c, font);
- asc = font_metrics::ascent(c, font);
- wid = mathed_char_width(font, c);
+ dim.des = font_metrics::descent(c, font);
+ dim.asc = font_metrics::ascent(c, font);
+ dim.wid = mathed_char_width(font, c);
}
}
-void mathed_string_dim(LyXFont const & font,
- string const & s, int & asc, int & des, int & wid)
+void mathed_string_dim(LyXFont const & font, string const & s, Dimension & dim)
{
- asc = des = 0;
+#if 1
+ dim.asc = 0;
+ dim.des = 0;
for (string::const_iterator it = s.begin(); it != s.end(); ++it) {
- des = max(des, font_metrics::descent(*it, font));
- asc = max(asc, font_metrics::ascent(*it, font));
+ dim.asc = max(dim.asc, font_metrics::ascent(*it, font));
+ dim.des = max(dim.des, font_metrics::descent(*it, font));
}
- wid = font_metrics::width(s, font);
+#else
+ dim.asc = font_metrics::maxAscent(font);
+ dim.des = font_metrics::maxDescent(font);
+#endif
+ dim.wid = font_metrics::width(s, font);
}
}
-int mathed_string_ascent(LyXFont const & font, string const & s)
-{
- int asc = 0;
- for (string::const_iterator it = s.begin(); it != s.end(); ++it)
- asc = max(asc, font_metrics::ascent(*it, font));
- return asc;
-}
-
-
-int mathed_string_descent(LyXFont const & font, string const & s)
-{
- int des = 0;
- for (string::const_iterator it = s.begin(); it != s.end(); ++it)
- des = max(des, font_metrics::descent(*it, font));
- return des;
-}
-
-
-
-void mathed_draw_deco(MathPainterInfo & pi, int x, int y, int w, int h,
- const string & name)
+void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
+ string const & name)
{
if (name == ".") {
pi.pain.line(x + w/2, y, x + w/2, y + h,
- LColor::mathcursor, Painter::line_onoffdash);
+ LColor::cursor, Painter::line_onoffdash);
return;
}
deco_struct const * mds = search_deco(name);
if (!mds) {
- lyxerr << "Deco was not found. Programming error?\n";
- lyxerr << "name: '" << name << "'\n";
+ lyxerr << "Deco was not found. Programming error?" << endl;
+ lyxerr << "name: '" << name << "'" << endl;
return;
}
mt.transform(xx, yy);
mt.transform(x2, y2);
pi.pain.line(
- x + int(xx + 0.5), y + int(yy + 0.5),
- x + int(x2 + 0.5), y + int(y2 + 0.5),
+ int(x + xx + 0.5), int(y + yy + 0.5),
+ int(x + x2 + 0.5), int(y + y2 + 0.5),
LColor::math);
- } else {
+ } else {
int xp[32];
int yp[32];
int const n = int(d[i++]);
for (int j = 0; j < n; ++j) {
double xx = d[i++];
double yy = d[i++];
-// lyxerr << " " << xx << " " << yy << " ";
+// lyxerr << ' ' << xx << ' ' << yy << ' ';
if (code == 4)
sqmt.transform(xx, yy);
else
mt.transform(xx, yy);
- xp[j] = x + int(xx + 0.5);
- yp[j] = y + int(yy + 0.5);
- // lyxerr << "P[" << j " " << xx << " " << yy << " " << x << " " << y << "]";
+ xp[j] = int(x + xx + 0.5);
+ yp[j] = int(y + yy + 0.5);
+ // lyxerr << "P[" << j ' ' << xx << ' ' << yy << ' ' << x << ' ' << y << ']';
}
pi.pain.lines(xp, yp, n, LColor::math);
}
}
-void mathed_draw_framebox(MathPainterInfo & pi, int x, int y, MathInset const * p)
-{
- if (mathcursor && mathcursor->isInside(p))
- pi.pain.rectangle(x, y - p->ascent(), p->width(), p->height(),
- LColor::mathframe);
-}
-
-
-// In the future maybe we use a better fonts renderer
-void drawStr(MathPainterInfo & pi, LyXFont const & font,
- int x, int y, string const & str)
-{
- pi.pain.text(x, y, str, font);
-}
-
-
-void drawStrRed(MathPainterInfo & pi, int x, int y, string const & str)
+void drawStrRed(PainterInfo & pi, int x, int y, string const & str)
{
LyXFont f = pi.base.font;
f.setColor(LColor::latex);
}
-void drawStrBlack(MathPainterInfo & pi, int x, int y, string const & str)
+void drawStrBlack(PainterInfo & pi, int x, int y, string const & str)
{
LyXFont f = pi.base.font;
- f.setColor(LColor::black);
+ f.setColor(LColor::foreground);
pi.pain.text(x, y, str, f);
}
-void drawChar(MathPainterInfo & pi, LyXFont const & font, int x, int y, char c)
-{
- pi.pain.text(x, y, c, font);
-}
-
-
void math_font_max_dim(LyXFont const & font, int & asc, int & des)
{
asc = font_metrics::maxAscent(font);
LyXFont::FONT_FAMILY const inh_family = LyXFont::INHERIT_FAMILY;
LyXFont::FONT_SERIES const inh_series = LyXFont::INHERIT_SERIES;
-LyXFont::FONT_SHAPE const inh_shape = LyXFont::INHERIT_SHAPE;
-
+LyXFont::FONT_SHAPE const inh_shape = LyXFont::INHERIT_SHAPE;
+// mathnormal should be the first, otherwise the fallback further down
+// does not work
fontinfo fontinfos[] = {
- {"cmex", LyXFont::CMEX_FAMILY, inh_series, inh_shape, LColor::math},
- {"cmm", LyXFont::CMM_FAMILY, inh_series, inh_shape, LColor::math},
- {"cmr", LyXFont::CMR_FAMILY, inh_series, inh_shape, LColor::math},
- {"cmsy", LyXFont::CMSY_FAMILY, inh_series, inh_shape, LColor::math},
- {"eufrak", LyXFont::EUFRAK_FAMILY, inh_series, inh_shape, LColor::math},
- {"mathbf", inh_family, LyXFont::BOLD_SERIES, inh_shape, LColor::math},
- {"mathcal",LyXFont::CMSY_FAMILY, inh_series, inh_shape, LColor::math},
- {"mathfrak", LyXFont::EUFRAK_FAMILY, inh_series, inh_shape, LColor::math},
- {"mathnormal", inh_family,inh_series, LyXFont::UP_SHAPE, LColor::math},
- {"mathrm", LyXFont::ROMAN_FAMILY, inh_series, inh_shape, LColor::math},
- {"mathsf", LyXFont::SANS_FAMILY, inh_series, inh_shape, LColor::math},
- {"msa", LyXFont::MSA_FAMILY, inh_series, inh_shape, LColor::math},
- {"msb", LyXFont::MSB_FAMILY, inh_series, inh_shape, LColor::math},
- {"textbf", inh_family, LyXFont::BOLD_SERIES, inh_shape, LColor::black},
- {"textit", inh_family, inh_series, LyXFont::ITALIC_SHAPE, LColor::black},
- {"textmd", inh_family, LyXFont::MEDIUM_SERIES, inh_shape, LColor::black},
- {"textnormal", inh_family, inh_series, LyXFont::UP_SHAPE, LColor::black},
- {"textrm", LyXFont::ROMAN_FAMILY, inh_series,LyXFont::UP_SHAPE,LColor::black},
- {"textsc", inh_family, inh_series, LyXFont::SMALLCAPS_SHAPE, LColor::black},
- {"textsf", LyXFont::SANS_FAMILY, inh_series, inh_shape, LColor::black},
- {"textsl", inh_family, inh_series, LyXFont::SLANTED_SHAPE, LColor::black},
- {"texttt", LyXFont::TYPEWRITER_FAMILY, inh_series, inh_shape, LColor::black},
- {"textup", inh_family, inh_series, LyXFont::UP_SHAPE, LColor::black},
-
- {"lyxtex", inh_family, inh_series, inh_shape, LColor::latex},
- {"lyxsymbol", LyXFont::SYMBOL_FAMILY, inh_series, inh_shape, LColor::math},
- {"lyxboldsymbol",
- LyXFont::SYMBOL_FAMILY, LyXFont::BOLD_SERIES, inh_shape, LColor::math},
- {"lyxitsymbol", LyXFont::SYMBOL_FAMILY,
- inh_series, LyXFont::ITALIC_SHAPE, LColor::math},
- {"lyxblacktext", LyXFont::ROMAN_FAMILY,
- LyXFont::MEDIUM_SERIES, LyXFont::UP_SHAPE, LColor::black},
- {"lyxnochange", inh_family, inh_series, inh_shape, LColor::black},
-
- {"lyxfakebb", LyXFont::TYPEWRITER_FAMILY, LyXFont::BOLD_SERIES,
- LyXFont::UP_SHAPE, LColor::math},
- {"lyxfakecal", LyXFont::SANS_FAMILY, LyXFont::MEDIUM_SERIES,
- LyXFont::ITALIC_SHAPE, LColor::math},
- {"lyxfakefrak", LyXFont::ROMAN_FAMILY, LyXFont::BOLD_SERIES,
- LyXFont::ITALIC_SHAPE, LColor::math}
+ // math fonts
+ {"mathnormal", LyXFont::ROMAN_FAMILY, LyXFont::MEDIUM_SERIES,
+ LyXFont::ITALIC_SHAPE, LColor::math},
+ {"mathbf", inh_family, LyXFont::BOLD_SERIES,
+ inh_shape, LColor::math},
+ {"mathcal", LyXFont::CMSY_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"mathfrak", LyXFont::EUFRAK_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"mathrm", LyXFont::ROMAN_FAMILY, inh_series,
+ LyXFont::UP_SHAPE, LColor::math},
+ {"mathsf", LyXFont::SANS_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"mathbb", LyXFont::MSB_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"mathtt", LyXFont::TYPEWRITER_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"mathit", inh_family, inh_series,
+ LyXFont::ITALIC_SHAPE, LColor::math},
+ {"cmex", LyXFont::CMEX_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"cmm", LyXFont::CMM_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"cmr", LyXFont::CMR_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"cmsy", LyXFont::CMSY_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"eufrak", LyXFont::EUFRAK_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"msa", LyXFont::MSA_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"msb", LyXFont::MSB_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"wasy", LyXFont::WASY_FAMILY, inh_series,
+ inh_shape, LColor::none},
+
+ // Text fonts
+ {"text", inh_family, inh_series,
+ inh_shape, LColor::foreground},
+ {"textbf", inh_family, LyXFont::BOLD_SERIES,
+ inh_shape, LColor::foreground},
+ {"textit", inh_family, inh_series,
+ LyXFont::ITALIC_SHAPE, LColor::foreground},
+ {"textmd", inh_family, LyXFont::MEDIUM_SERIES,
+ inh_shape, LColor::foreground},
+ {"textnormal", inh_family, inh_series,
+ LyXFont::UP_SHAPE, LColor::foreground},
+ {"textrm", LyXFont::ROMAN_FAMILY,
+ inh_series, LyXFont::UP_SHAPE,LColor::foreground},
+ {"textsc", inh_family, inh_series,
+ LyXFont::SMALLCAPS_SHAPE, LColor::foreground},
+ {"textsf", LyXFont::SANS_FAMILY, inh_series,
+ inh_shape, LColor::foreground},
+ {"textsl", inh_family, inh_series,
+ LyXFont::SLANTED_SHAPE, LColor::foreground},
+ {"texttt", LyXFont::TYPEWRITER_FAMILY, inh_series,
+ inh_shape, LColor::foreground},
+ {"textup", inh_family, inh_series,
+ LyXFont::UP_SHAPE, LColor::foreground},
+
+ // TIPA support
+ {"textipa", inh_family, inh_series,
+ inh_shape, LColor::foreground},
+
+ // LyX internal usage
+ {"lyxtex", inh_family, inh_series,
+ LyXFont::UP_SHAPE, LColor::latex},
+ {"lyxsymbol", LyXFont::SYMBOL_FAMILY, inh_series,
+ inh_shape, LColor::math},
+ {"lyxboldsymbol", LyXFont::SYMBOL_FAMILY, LyXFont::BOLD_SERIES,
+ inh_shape, LColor::math},
+ {"lyxblacktext", LyXFont::ROMAN_FAMILY, LyXFont::MEDIUM_SERIES,
+ LyXFont::UP_SHAPE, LColor::foreground},
+ {"lyxnochange", inh_family, inh_series,
+ inh_shape, LColor::foreground},
+ {"lyxfakebb", LyXFont::TYPEWRITER_FAMILY, LyXFont::BOLD_SERIES,
+ LyXFont::UP_SHAPE, LColor::math},
+ {"lyxfakecal", LyXFont::SANS_FAMILY, LyXFont::MEDIUM_SERIES,
+ LyXFont::ITALIC_SHAPE, LColor::math},
+ {"lyxfakefrak", LyXFont::ROMAN_FAMILY, LyXFont::BOLD_SERIES,
+ LyXFont::ITALIC_SHAPE, LColor::math}
};
-fontinfo * searchFont(string const & name)
+fontinfo * lookupFont(string const & name)
{
+ //lyxerr << "searching font '" << name << "'" << endl;
int const n = sizeof(fontinfos) / sizeof(fontinfo);
- //lyxerr << "searching font '" << name << "'\n";
for (int i = 0; i < n; ++i)
if (fontinfos[i].cmd_ == name) {
- //lyxerr << "found '" << i << "'\n";
+ //lyxerr << "found '" << i << "'" << endl;
return fontinfos + i;
}
- return searchFont("mathnormal");
+ return 0;
+}
+
+
+fontinfo * searchFont(string const & name)
+{
+ fontinfo * f = lookupFont(name);
+ return f ? f : fontinfos;
+ // this should be mathnormal
+ //return searchFont("mathnormal");
+}
+
+
+bool isFontName(string const & name)
+{
+ return lookupFont(name);
}
forig->shape_ = ffake->shape_;
forig->color_ = ffake->color_;
} else {
- lyxerr << "Can't fake font '" << orig << "' with '" << fake << "'\n";
+ lyxerr << "Can't fake font '" << orig << "' with '"
+ << fake << "'" << endl;
}
}
+
void augmentFont(LyXFont & font, string const & name)
{
static bool initialized = false;
if (!initialized) {
initialized = true;
-
// fake fonts if necessary
- if (!fontloader.available(getFont("mathfrak")))
+ if (!lyx_gui::font_available(getFont("mathfrak")))
fakeFont("mathfrak", "lyxfakefrak");
- if (!fontloader.available(getFont("mathcal")))
+ if (!lyx_gui::font_available(getFont("mathcal")))
fakeFont("mathcal", "lyxfakecal");
}
fontinfo * info = searchFont(name);
if (info->color_ != LColor::none)
font.setColor(info->color_);
}
+
+
+string asString(MathArray const & ar)
+{
+ std::ostringstream os;
+ WriteStream ws(os);
+ ws << ar;
+ return os.str();
+}
+
+
+void asArray(string const & str, MathArray & ar)
+{
+ mathed_parse_cell(ar, str);
+}
+
+
+string asString(MathInset const & inset)
+{
+ std::ostringstream os;
+ WriteStream ws(os);
+ inset.write(ws);
+ return os.str();
+}
+
+
+string asString(MathAtom const & at)
+{
+ std::ostringstream os;
+ WriteStream ws(os);
+ at->write(ws);
+ return os.str();
+}
projects / lyx.git / blobdiff