-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include <config.h>
#include "math_support.h"
#include "lyxfont.h"
-#include "math_cursor.h"
#include "math_inset.h"
#include "math_parser.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
+#include "math_data.h"
#include "frontends/Painter.h"
#include "frontends/font_metrics.h"
#include "frontends/lyx_gui.h"
#include "debug.h"
-#include "commandtags.h"
+#include "lfuns.h"
#include "dimension.h"
+#include "Lsstream.h"
+#include "math_mathmlstream.h"
#include <map>
using std::max;
+using std::endl;
///
void mathed_char_dim(LyXFont const & font, unsigned char c, Dimension & dim)
{
- dim.d = font_metrics::descent(c, font);
- dim.a = font_metrics::ascent(c, font);
- dim.w = 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, Dimension & dim)
{
#if 1
- dim.a = 0;
- dim.d = 0;
+ dim.asc = 0;
+ dim.des = 0;
for (string::const_iterator it = s.begin(); it != s.end(); ++it) {
- dim.a = max(dim.a, font_metrics::ascent(*it, font));
- dim.d = max(dim.d, font_metrics::descent(*it, font));
+ dim.asc = max(dim.asc, font_metrics::ascent(*it, font));
+ dim.des = max(dim.des, font_metrics::descent(*it, font));
}
#else
- dim.a = font_metrics::maxAscent(font);
- dim.d = font_metrics::maxDescent(font);
+ dim.asc = font_metrics::maxAscent(font);
+ dim.des = font_metrics::maxDescent(font);
#endif
- dim.w = font_metrics::width(s, font);
+ dim.wid = font_metrics::width(s, font);
}
}
-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;
}
}
-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,
+void drawStr(PainterInfo & 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)
+void drawChar(PainterInfo & pi, LyXFont const & font, int x, int y, char c)
{
pi.pain.text(x, y, c, font);
}
// mathnormal should be the first, otherwise the fallback further down
// does not work
fontinfo fontinfos[] = {
- {"mathnormal",
- inh_family, LyXFont::MEDIUM_SERIES, LyXFont::UP_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, inh_shape, LColor::math},
- {"mathsf", LyXFont::SANS_FAMILY, inh_series, inh_shape, LColor::math},
- {"mathbb", LyXFont::MSB_FAMILY, inh_series, inh_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::math},
- {"text", inh_family, inh_series, inh_shape, LColor::black},
- {"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},
+ // math fonts
+ {"mathnormal", inh_family, LyXFont::MEDIUM_SERIES,
+ LyXFont::UP_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,
+ inh_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},
+ {"cmex", LyXFont::CMEX_FAMILY, inh_series,
+ inh_shape, LColor::none},
+ {"cmm", LyXFont::CMM_FAMILY, inh_series,
+ inh_shape, LColor::none},
+ {"cmr", LyXFont::CMR_FAMILY, inh_series,
+ inh_shape, LColor::none},
+ {"cmsy", LyXFont::CMSY_FAMILY, inh_series,
+ inh_shape, LColor::none},
+ {"eufrak", LyXFont::EUFRAK_FAMILY, inh_series,
+ inh_shape, LColor::none},
+ {"msa", LyXFont::MSA_FAMILY, inh_series,
+ inh_shape, LColor::none},
+ {"msb", LyXFont::MSB_FAMILY, inh_series,
+ inh_shape, LColor::none},
+ {"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::black},
-
- {"lyxtex", inh_family, inh_series, inh_shape, LColor::latex},
- {"lyxert", LyXFont::TYPEWRITER_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}
+ {"textipa", inh_family, inh_series,
+ inh_shape, LColor::foreground},
+
+ // LyX internal usage
+ {"lyxtex", inh_family, inh_series,
+ inh_shape, LColor::latex},
+ {"lyxert", LyXFont::TYPEWRITER_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::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 * lookupFont(string const & name)
{
- //lyxerr << "searching font '" << name << "'\n";
+ //lyxerr << "searching font '" << name << "'" << endl;
int const n = sizeof(fontinfos) / sizeof(fontinfo);
for (int i = 0; i < n; ++i)
if (fontinfos[i].cmd_ == name) {
- //lyxerr << "found '" << i << "'\n";
+ //lyxerr << "found '" << i << "'" << endl;
return fontinfos + i;
}
return 0;
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;
}
}
if (info->color_ != LColor::none)
font.setColor(info->color_);
}
+
+
+string asString(MathArray const & ar)
+{
+ std::ostringstream os;
+ WriteStream ws(os);
+ ws << ar;
+ return STRCONV(os.str());
+}
+
+
+void asArray(string const & str, MathArray & ar)
+{
+ mathed_parse_cell(ar, str);
+}