2003-08-19 13:00:56 +00:00
|
|
|
|
/**
|
2007-04-25 03:01:35 +00:00
|
|
|
|
* \file MathSupport.cpp
|
2003-08-19 13:00:56 +00:00
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
|
*
|
|
|
|
|
* \author Alejandro Aguilar Sierra
|
2008-11-14 15:58:50 +00:00
|
|
|
|
* \author André Pönitz
|
2003-08-19 13:00:56 +00:00
|
|
|
|
*
|
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
|
*/
|
|
|
|
|
|
2002-09-11 09:14:57 +00:00
|
|
|
|
#include <config.h>
|
2001-02-13 13:28:32 +00:00
|
|
|
|
|
2007-11-05 23:46:17 +00:00
|
|
|
|
#include "MathSupport.h"
|
|
|
|
|
|
2013-02-17 10:08:58 +00:00
|
|
|
|
#include "InsetMathFont.h"
|
|
|
|
|
#include "InsetMathSymbol.h"
|
2016-11-20 22:41:36 +00:00
|
|
|
|
#include "Length.h"
|
2007-10-25 12:41:02 +00:00
|
|
|
|
#include "MathData.h"
|
2016-12-19 23:15:59 +00:00
|
|
|
|
#include "MathFactory.h"
|
2006-09-17 09:14:18 +00:00
|
|
|
|
#include "MathParser.h"
|
2007-10-25 12:41:02 +00:00
|
|
|
|
#include "MathStream.h"
|
2003-09-08 00:33:41 +00:00
|
|
|
|
|
2016-12-19 23:15:59 +00:00
|
|
|
|
#include "LaTeXFeatures.h"
|
2016-06-04 08:41:13 +00:00
|
|
|
|
#include "MetricsInfo.h"
|
|
|
|
|
|
2006-10-03 16:17:32 +00:00
|
|
|
|
#include "frontends/FontLoader.h"
|
2006-10-07 16:15:06 +00:00
|
|
|
|
#include "frontends/FontMetrics.h"
|
|
|
|
|
#include "frontends/Painter.h"
|
2003-09-08 00:33:41 +00:00
|
|
|
|
|
2008-02-18 07:14:42 +00:00
|
|
|
|
#include "support/debug.h"
|
|
|
|
|
#include "support/docstream.h"
|
2016-05-25 12:16:51 +00:00
|
|
|
|
#include "support/lassert.h"
|
2016-05-24 10:08:24 +00:00
|
|
|
|
#include "support/lyxlib.h"
|
2008-02-18 07:14:42 +00:00
|
|
|
|
|
2002-09-11 09:14:57 +00:00
|
|
|
|
#include <map>
|
2014-06-07 06:17:20 +00:00
|
|
|
|
#include <algorithm>
|
2002-09-11 09:14:57 +00:00
|
|
|
|
|
2007-12-12 10:16:00 +00:00
|
|
|
|
using namespace std;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
|
|
|
|
|
using frontend::Painter;
|
2003-10-06 15:43:21 +00:00
|
|
|
|
|
2001-07-13 11:32:22 +00:00
|
|
|
|
|
2001-07-13 09:10:59 +00:00
|
|
|
|
///
|
|
|
|
|
class Matrix {
|
|
|
|
|
public:
|
|
|
|
|
///
|
2001-09-12 16:13:31 +00:00
|
|
|
|
Matrix(int, double, double);
|
2001-07-13 09:10:59 +00:00
|
|
|
|
///
|
2001-09-12 16:13:31 +00:00
|
|
|
|
void transform(double &, double &);
|
2001-07-13 09:10:59 +00:00
|
|
|
|
private:
|
|
|
|
|
///
|
2001-09-12 16:13:31 +00:00
|
|
|
|
double m_[2][2];
|
2001-07-13 09:10:59 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 16:13:31 +00:00
|
|
|
|
Matrix::Matrix(int code, double x, double y)
|
2001-07-13 09:10:59 +00:00
|
|
|
|
{
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const cs = (code & 1) ? 0 : (1 - code);
|
|
|
|
|
double const sn = (code & 1) ? (2 - code) : 0;
|
2001-09-12 16:13:31 +00:00
|
|
|
|
m_[0][0] = cs * x;
|
|
|
|
|
m_[0][1] = sn * x;
|
|
|
|
|
m_[1][0] = -sn * y;
|
|
|
|
|
m_[1][1] = cs * y;
|
2001-07-13 09:10:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 16:13:31 +00:00
|
|
|
|
void Matrix::transform(double & x, double & y)
|
2001-07-13 09:10:59 +00:00
|
|
|
|
{
|
2001-09-12 16:13:31 +00:00
|
|
|
|
double xx = m_[0][0] * x + m_[0][1] * y;
|
|
|
|
|
double yy = m_[1][0] * x + m_[1][1] * y;
|
|
|
|
|
x = xx;
|
|
|
|
|
y = yy;
|
2001-07-13 09:10:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2001-02-13 13:28:32 +00:00
|
|
|
|
|
2001-03-20 01:22:46 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
2001-09-12 16:24:36 +00:00
|
|
|
|
/*
|
2001-02-13 13:28:32 +00:00
|
|
|
|
* Internal struct of a drawing: code n x1 y1 ... xn yn, where code is:
|
2002-06-18 15:44:30 +00:00
|
|
|
|
* 0 = end, 1 = line, 2 = polyline, 3 = square line, 4 = square polyline
|
2001-02-13 13:28:32 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const parenthHigh[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 13,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.9840, 0.0014, 0.7143, 0.0323, 0.4603, 0.0772,
|
|
|
|
|
0.2540, 0.1278, 0.1746, 0.1966, 0.0952, 0.3300,
|
|
|
|
|
0.0950, 0.5000, 0.0952, 0.6700, 0.1746, 0.8034,
|
|
|
|
|
0.2540, 0.8722, 0.4603, 0.9228, 0.7143, 0.9677,
|
|
|
|
|
0.9840, 0.9986,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const parenth[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 13,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.9930, 0.0071, 0.7324, 0.0578, 0.5141, 0.1126,
|
|
|
|
|
0.3380, 0.1714, 0.2183, 0.2333, 0.0634, 0.3621,
|
|
|
|
|
0.0141, 0.5000, 0.0563, 0.6369, 0.2113, 0.7647,
|
|
|
|
|
0.3310, 0.8276, 0.5070, 0.8864, 0.7254, 0.9412,
|
|
|
|
|
0.9930, 0.9919,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const brace[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 21,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.9492, 0.0020, 0.9379, 0.0020, 0.7458, 0.0243,
|
|
|
|
|
0.5819, 0.0527, 0.4859, 0.0892, 0.4463, 0.1278,
|
|
|
|
|
0.4463, 0.3732, 0.4011, 0.4199, 0.2712, 0.4615,
|
|
|
|
|
0.0734, 0.4919, 0.0113, 0.5000, 0.0734, 0.5081,
|
|
|
|
|
0.2712, 0.5385, 0.4011, 0.5801, 0.4463, 0.6268,
|
|
|
|
|
0.4463, 0.8722, 0.4859, 0.9108, 0.5819, 0.9473,
|
|
|
|
|
0.7458, 0.9757, 0.9379, 0.9980, 0.9492, 0.9980,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2014-08-24 22:44:09 +00:00
|
|
|
|
double const mapsto[] = {
|
|
|
|
|
2, 3,
|
|
|
|
|
0.75, 0.015, 0.95, 0.5, 0.75, 0.985,
|
|
|
|
|
1, 0.015, 0.475, 0.945, 0.475,
|
|
|
|
|
1, 0.015, 0.015, 0.015, 0.985,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double const lhook[] = {
|
|
|
|
|
2, 3,
|
|
|
|
|
0.25, 0.015, 0.05, 0.5, 0.25, 0.985,
|
|
|
|
|
1, 0.015, 0.475, 0.7, 0.475,
|
|
|
|
|
2, 5,
|
|
|
|
|
0.7, 0.015, 0.825, 0.15, 0.985, 0.25,
|
|
|
|
|
0.825, 0.35, 0.7, 0.475,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double const rhook[] = {
|
|
|
|
|
2, 3,
|
|
|
|
|
0.75, 0.015, 0.95, 0.5, 0.75, 0.985,
|
|
|
|
|
1, 0.3, 0.475, 0.985, 0.475,
|
|
|
|
|
2, 5,
|
|
|
|
|
0.3, 0.015, 0.175, 0.15, 0.05, 0.25,
|
|
|
|
|
0.175, 0.35, 0.3, 0.475,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double const LRArrow[] = {
|
|
|
|
|
2, 3,
|
|
|
|
|
0.25, 0.015, 0.05, 0.5, 0.25, 0.985,
|
|
|
|
|
2, 3,
|
|
|
|
|
0.75, 0.015, 0.95, 0.5, 0.75, 0.985,
|
|
|
|
|
1, 0.2, 0.8, 0.8, 0.8,
|
|
|
|
|
1, 0.2, 0.2, 0.8, 0.2,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double const LArrow[] = {
|
|
|
|
|
2, 3,
|
|
|
|
|
0.25, 0.015, 0.05, 0.5, 0.25, 0.985,
|
|
|
|
|
1, 0.2, 0.8, 0.985, 0.8,
|
|
|
|
|
1, 0.2, 0.2, 0.985, 0.2,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double const lharpoondown[] = {
|
|
|
|
|
2, 2,
|
|
|
|
|
0.015, 0.5, 0.25, 0.985,
|
|
|
|
|
1, 0.02, 0.475, 0.985, 0.475,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double const lharpoonup[] = {
|
|
|
|
|
2, 2,
|
|
|
|
|
0.25, 0.015, 0.015, 0.5,
|
|
|
|
|
1, 0.02, 0.525, 0.985, 0.525,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double const lrharpoons[] = {
|
|
|
|
|
2, 2,
|
|
|
|
|
0.25, 0.015, 0.015, 0.225,
|
|
|
|
|
1, 0.02, 0.23, 0.985, 0.23,
|
|
|
|
|
2, 2,
|
|
|
|
|
0.75, 0.985, 0.985, 0.775,
|
|
|
|
|
1, 0.02, 0.7, 0.980, 0.7,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double const rlharpoons[] = {
|
|
|
|
|
2, 2,
|
|
|
|
|
0.75, 0.015, 0.985, 0.225,
|
|
|
|
|
1, 0.02, 0.23, 0.985, 0.23,
|
|
|
|
|
2, 2,
|
|
|
|
|
0.25, 0.985, 0.015, 0.775,
|
|
|
|
|
1, 0.02, 0.7, 0.980, 0.7,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const arrow[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
4, 7,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.0150, 0.7500, 0.2000, 0.6000, 0.3500, 0.3500,
|
|
|
|
|
0.5000, 0.0500, 0.6500, 0.3500, 0.8000, 0.6000,
|
|
|
|
|
0.9500, 0.7500,
|
2003-02-14 16:02:24 +00:00
|
|
|
|
3, 0.5000, 0.1500, 0.5000, 0.9500,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const Arrow[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
4, 7,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.0150, 0.7500, 0.2000, 0.6000, 0.3500, 0.3500,
|
|
|
|
|
0.5000, 0.0500, 0.6500, 0.3500, 0.8000, 0.6000,
|
|
|
|
|
0.9500, 0.7500,
|
2003-02-14 16:02:24 +00:00
|
|
|
|
3, 0.3500, 0.5000, 0.3500, 0.9500,
|
|
|
|
|
3, 0.6500, 0.5000, 0.6500, 0.9500,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const udarrow[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 3,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.015, 0.25, 0.5, 0.05, 0.95, 0.25,
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 3,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0.015, 0.75, 0.5, 0.95, 0.95, 0.75,
|
2014-02-17 00:19:31 +00:00
|
|
|
|
1, 0.5, 0.1, 0.5, 0.9,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const Udarrow[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 3,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.015, 0.25, 0.5, 0.05, 0.95, 0.25,
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 3,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0.015, 0.75, 0.5, 0.95, 0.95, 0.75,
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.35, 0.2, 0.35, 0.8,
|
|
|
|
|
1, 0.65, 0.2, 0.65, 0.8,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const brack[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 4,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.95, 0.05, 0.05, 0.05, 0.05, 0.95, 0.95, 0.95,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2012-12-16 14:49:42 +00:00
|
|
|
|
double const dbrack[] = {
|
|
|
|
|
2, 4,
|
|
|
|
|
0.95, 0.05, 0.05, 0.05, 0.05, 0.95, 0.95, 0.95,
|
|
|
|
|
2, 2,
|
|
|
|
|
0.50, 0.05, 0.50, 0.95,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const corner[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 3,
|
2001-02-16 09:25:43 +00:00
|
|
|
|
0.95, 0.05, 0.05, 0.05, 0.05, 0.95,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const angle[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 3,
|
|
|
|
|
1, 0, 0.05, 0.5, 1, 1,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const slash[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.95, 0.05, 0.05, 0.95,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const hline[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.00, 0.5, 1.0, 0.5,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2002-02-08 09:42:59 +00:00
|
|
|
|
double const ddot[] = {
|
2010-08-29 22:59:24 +00:00
|
|
|
|
1, 0.2, 0.5, 0.3, 0.5,
|
|
|
|
|
1, 0.7, 0.5, 0.8, 0.5,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
|
|
|
|
};
|
2001-02-13 13:28:32 +00:00
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2002-02-08 09:42:59 +00:00
|
|
|
|
double const dddot[] = {
|
2010-08-29 22:59:24 +00:00
|
|
|
|
1, 0.1, 0.5, 0.2, 0.5,
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.45, 0.5, 0.55, 0.5,
|
2010-08-29 22:59:24 +00:00
|
|
|
|
1, 0.8, 0.5, 0.9, 0.5,
|
2002-02-08 09:42:59 +00:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2009-06-18 20:04:27 +00:00
|
|
|
|
double const ddddot[] = {
|
2010-08-29 22:59:24 +00:00
|
|
|
|
1, 0.1, 0.5, 0.2, 0.5,
|
|
|
|
|
1, 0.45, 0.5, 0.55, 0.5,
|
|
|
|
|
1, 0.8, 0.5, 0.9, 0.5,
|
|
|
|
|
1, 1.15, 0.5, 1.25, 0.5,
|
2009-06-18 20:04:27 +00:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const hline3[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.1, 0, 0.15, 0,
|
|
|
|
|
1, 0.475, 0, 0.525, 0,
|
|
|
|
|
1, 0.85, 0, 0.9, 0,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const dline3[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.1, 0.1, 0.15, 0.15,
|
|
|
|
|
1, 0.475, 0.475, 0.525, 0.525,
|
|
|
|
|
1, 0.85, 0.85, 0.9, 0.9,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
|
|
|
|
};
|
2001-02-13 13:28:32 +00:00
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const hlinesmall[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.4, 0.5, 0.6, 0.5,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2002-05-30 07:09:54 +00:00
|
|
|
|
double const ring[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 5,
|
2002-05-30 07:09:54 +00:00
|
|
|
|
0.5, 0.8, 0.8, 0.5, 0.5, 0.2, 0.2, 0.5, 0.5, 0.8,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const vert[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.5, 0.05, 0.5, 0.95,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const Vert[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
1, 0.3, 0.05, 0.3, 0.95,
|
|
|
|
|
1, 0.7, 0.05, 0.7, 0.95,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const tilde[] = {
|
2003-02-14 16:02:24 +00:00
|
|
|
|
2, 4,
|
2002-06-24 15:37:14 +00:00
|
|
|
|
0.00, 0.8, 0.25, 0.2, 0.75, 0.8, 1.00, 0.2,
|
2001-09-12 16:24:36 +00:00
|
|
|
|
0
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2001-08-15 05:50:39 +00:00
|
|
|
|
struct deco_struct {
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const * data;
|
2001-07-13 09:10:59 +00:00
|
|
|
|
int angle;
|
|
|
|
|
};
|
|
|
|
|
|
2001-09-03 15:22:55 +00:00
|
|
|
|
struct named_deco_struct {
|
|
|
|
|
char const * name;
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const * data;
|
2001-09-03 15:22:55 +00:00
|
|
|
|
int angle;
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-09-12 16:24:36 +00:00
|
|
|
|
named_deco_struct deco_table[] = {
|
2001-09-03 15:22:55 +00:00
|
|
|
|
// Decorations
|
2014-08-24 22:44:09 +00:00
|
|
|
|
{"widehat", angle, 3 },
|
|
|
|
|
{"widetilde", tilde, 0 },
|
|
|
|
|
{"underbar", hline, 0 },
|
|
|
|
|
{"underline", hline, 0 },
|
|
|
|
|
{"overline", hline, 0 },
|
|
|
|
|
{"underbrace", brace, 1 },
|
|
|
|
|
{"overbrace", brace, 3 },
|
|
|
|
|
{"overleftarrow", arrow, 1 },
|
|
|
|
|
{"overrightarrow", arrow, 3 },
|
|
|
|
|
{"overleftrightarrow", udarrow, 1 },
|
|
|
|
|
{"xhookleftarrow", lhook, 0 },
|
|
|
|
|
{"xhookrightarrow", rhook, 0 },
|
|
|
|
|
{"xleftarrow", arrow, 1 },
|
|
|
|
|
{"xLeftarrow", LArrow, 0 },
|
|
|
|
|
{"xleftharpoondown", lharpoondown, 0 },
|
|
|
|
|
{"xleftharpoonup", lharpoonup, 0 },
|
|
|
|
|
{"xleftrightharpoons", lrharpoons, 0 },
|
|
|
|
|
{"xleftrightarrow", udarrow, 1 },
|
|
|
|
|
{"xLeftrightarrow", LRArrow, 0 },
|
|
|
|
|
{"xmapsto", mapsto, 0 },
|
|
|
|
|
{"xrightarrow", arrow, 3 },
|
|
|
|
|
{"xRightarrow", LArrow, 2 },
|
|
|
|
|
{"xrightharpoondown", lharpoonup, 2 },
|
|
|
|
|
{"xrightharpoonup", lharpoondown, 2 },
|
|
|
|
|
{"xrightleftharpoons", rlharpoons, 0 },
|
|
|
|
|
{"underleftarrow", arrow, 1 },
|
|
|
|
|
{"underrightarrow", arrow, 3 },
|
|
|
|
|
{"underleftrightarrow", udarrow, 1 },
|
|
|
|
|
{"undertilde", tilde, 0 },
|
|
|
|
|
{"utilde", tilde, 0 },
|
2002-02-08 08:08:11 +00:00
|
|
|
|
|
2001-09-12 16:24:36 +00:00
|
|
|
|
// Delimiters
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"(", parenth, 0 },
|
|
|
|
|
{")", parenth, 2 },
|
|
|
|
|
{"{", brace, 0 },
|
|
|
|
|
{"}", brace, 2 },
|
2006-04-20 09:55:45 +00:00
|
|
|
|
{"lbrace", brace, 0 },
|
|
|
|
|
{"rbrace", brace, 2 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"[", brack, 0 },
|
|
|
|
|
{"]", brack, 2 },
|
2012-12-16 14:49:42 +00:00
|
|
|
|
{"llbracket", dbrack, 0 },
|
|
|
|
|
{"rrbracket", dbrack, 2 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"|", vert, 0 },
|
|
|
|
|
{"/", slash, 0 },
|
2007-04-11 00:27:35 +00:00
|
|
|
|
{"slash", slash, 0 },
|
2002-04-04 14:48:39 +00:00
|
|
|
|
{"vert", vert, 0 },
|
2014-02-26 20:18:31 +00:00
|
|
|
|
{"lvert", vert, 0 },
|
|
|
|
|
{"rvert", vert, 0 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"Vert", Vert, 0 },
|
2014-02-26 20:18:31 +00:00
|
|
|
|
{"lVert", Vert, 0 },
|
|
|
|
|
{"rVert", Vert, 0 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"'", slash, 1 },
|
2010-06-06 18:11:15 +00:00
|
|
|
|
{"<", angle, 0 },
|
|
|
|
|
{">", angle, 2 },
|
2007-04-07 02:07:15 +00:00
|
|
|
|
{"\\", slash, 1 },
|
2001-09-12 12:51:55 +00:00
|
|
|
|
{"backslash", slash, 1 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"langle", angle, 0 },
|
2001-09-12 16:24:36 +00:00
|
|
|
|
{"lceil", corner, 0 },
|
|
|
|
|
{"lfloor", corner, 1 },
|
|
|
|
|
{"rangle", angle, 2 },
|
|
|
|
|
{"rceil", corner, 3 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"rfloor", corner, 2 },
|
|
|
|
|
{"downarrow", arrow, 2 },
|
2001-09-12 16:24:36 +00:00
|
|
|
|
{"Downarrow", Arrow, 2 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"uparrow", arrow, 0 },
|
|
|
|
|
{"Uparrow", Arrow, 0 },
|
|
|
|
|
{"updownarrow", udarrow, 0 },
|
2002-03-21 17:42:56 +00:00
|
|
|
|
{"Updownarrow", Udarrow, 0 },
|
|
|
|
|
|
2001-09-12 16:24:36 +00:00
|
|
|
|
// Accents
|
2002-02-08 09:42:59 +00:00
|
|
|
|
{"ddot", ddot, 0 },
|
|
|
|
|
{"dddot", dddot, 0 },
|
2009-06-18 20:04:27 +00:00
|
|
|
|
{"ddddot", ddddot, 0 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"hat", angle, 3 },
|
|
|
|
|
{"grave", slash, 1 },
|
|
|
|
|
{"acute", slash, 0 },
|
|
|
|
|
{"tilde", tilde, 0 },
|
|
|
|
|
{"bar", hline, 0 },
|
|
|
|
|
{"dot", hlinesmall, 0 },
|
|
|
|
|
{"check", angle, 1 },
|
|
|
|
|
{"breve", parenth, 1 },
|
|
|
|
|
{"vec", arrow, 3 },
|
2002-04-03 10:45:32 +00:00
|
|
|
|
{"mathring", ring, 0 },
|
2002-03-21 17:42:56 +00:00
|
|
|
|
|
2001-09-12 16:24:36 +00:00
|
|
|
|
// Dots
|
2002-12-09 09:52:43 +00:00
|
|
|
|
{"dots", hline3, 0 },
|
2001-09-12 16:24:36 +00:00
|
|
|
|
{"ldots", hline3, 0 },
|
2001-09-04 07:01:31 +00:00
|
|
|
|
{"cdots", hline3, 0 },
|
|
|
|
|
{"vdots", hline3, 1 },
|
2002-05-29 15:58:26 +00:00
|
|
|
|
{"ddots", dline3, 0 },
|
2009-06-18 20:04:27 +00:00
|
|
|
|
{"adots", dline3, 1 },
|
|
|
|
|
{"iddots", dline3, 1 },
|
2002-05-29 15:58:26 +00:00
|
|
|
|
{"dotsb", hline3, 0 },
|
|
|
|
|
{"dotsc", hline3, 0 },
|
|
|
|
|
{"dotsi", hline3, 0 },
|
|
|
|
|
{"dotsm", hline3, 0 },
|
|
|
|
|
{"dotso", hline3, 0 }
|
2001-02-13 13:28:32 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2007-12-12 19:28:07 +00:00
|
|
|
|
map<docstring, deco_struct> deco_list;
|
2001-02-13 13:28:32 +00:00
|
|
|
|
|
2001-08-14 09:35:44 +00:00
|
|
|
|
// sort the table on startup
|
2005-01-19 15:03:31 +00:00
|
|
|
|
class init_deco_table {
|
|
|
|
|
public:
|
2001-02-13 13:28:32 +00:00
|
|
|
|
init_deco_table() {
|
2001-09-03 15:22:55 +00:00
|
|
|
|
unsigned const n = sizeof(deco_table) / sizeof(deco_table[0]);
|
|
|
|
|
for (named_deco_struct * p = deco_table; p != deco_table + n; ++p) {
|
|
|
|
|
deco_struct d;
|
|
|
|
|
d.data = p->data;
|
|
|
|
|
d.angle = p->angle;
|
2006-10-22 10:15:23 +00:00
|
|
|
|
deco_list[from_ascii(p->name)] = d;
|
2001-09-03 15:22:55 +00:00
|
|
|
|
}
|
2001-02-13 13:28:32 +00:00
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2001-08-14 09:35:44 +00:00
|
|
|
|
static init_deco_table dummy;
|
|
|
|
|
|
|
|
|
|
|
2006-10-22 10:15:23 +00:00
|
|
|
|
deco_struct const * search_deco(docstring const & name)
|
2001-08-14 09:35:44 +00:00
|
|
|
|
{
|
2007-12-12 19:28:07 +00:00
|
|
|
|
map<docstring, deco_struct>::const_iterator p = deco_list.find(name);
|
2006-10-22 10:15:23 +00:00
|
|
|
|
return p == deco_list.end() ? 0 : &(p->second);
|
2001-08-14 09:35:44 +00:00
|
|
|
|
}
|
2001-02-16 09:25:43 +00:00
|
|
|
|
|
2001-02-13 13:28:32 +00:00
|
|
|
|
|
2001-03-20 01:22:46 +00:00
|
|
|
|
} // namespace anon
|
|
|
|
|
|
2001-08-10 13:26:33 +00:00
|
|
|
|
|
2015-03-26 15:55:19 +00:00
|
|
|
|
int mathed_font_em(FontInfo const & font)
|
|
|
|
|
{
|
|
|
|
|
return theFontMetrics(font).em();
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-24 10:08:24 +00:00
|
|
|
|
/* The math units. Quoting TeX by Topic, p.205:
|
|
|
|
|
*
|
|
|
|
|
* Spacing around mathematical objects is measured in mu units. A mu
|
|
|
|
|
* is 1/18th part of \fontdimen6 of the font in family 2 in the
|
|
|
|
|
* current style, the ‘quad’ value of the symbol font.
|
|
|
|
|
*
|
|
|
|
|
* A \thickmuskip (default value in plain TeX: 5mu plus 5mu) is
|
|
|
|
|
* inserted around (binary) relations, except where these are preceded
|
|
|
|
|
* or followed by other relations or punctuation, and except if they
|
|
|
|
|
* follow an open, or precede a close symbol.
|
|
|
|
|
*
|
|
|
|
|
* A \medmuskip (default value in plain TeX: 4mu plus 2mu minus 4mu)
|
|
|
|
|
* is put around binary operators.
|
|
|
|
|
*
|
|
|
|
|
* A \thinmuskip (default value in plain TeX: 3mu) follows after
|
|
|
|
|
* punctuation, and is put around inner objects, except where these
|
|
|
|
|
* are followed by a close or preceded by an open symbol, and except
|
|
|
|
|
* if the other object is a large operator or a binary relation.
|
2016-08-22 12:15:28 +00:00
|
|
|
|
*
|
|
|
|
|
* See the file MathClass.cpp for a formal implementation of the rules
|
|
|
|
|
* above.
|
2016-05-24 10:08:24 +00:00
|
|
|
|
*/
|
|
|
|
|
|
2016-11-20 22:41:36 +00:00
|
|
|
|
int mathed_mu(FontInfo const & font, double mu)
|
2016-05-24 10:08:24 +00:00
|
|
|
|
{
|
2016-11-20 22:41:36 +00:00
|
|
|
|
MetricsBase mb(nullptr, font);
|
|
|
|
|
return Length(mu, Length::MU).inPixels(mb);
|
2016-05-24 10:08:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-11-20 22:41:36 +00:00
|
|
|
|
int mathed_thinmuskip(FontInfo const & font) { return mathed_mu(font, 3.0); }
|
|
|
|
|
int mathed_medmuskip(FontInfo const & font) { return mathed_mu(font, 4.0); }
|
|
|
|
|
int mathed_thickmuskip(FontInfo const & font) { return mathed_mu(font, 5.0); }
|
2016-05-24 10:08:24 +00:00
|
|
|
|
|
2015-03-26 15:55:19 +00:00
|
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
|
int mathed_char_width(FontInfo const & font, char_type c)
|
2001-02-13 13:28:32 +00:00
|
|
|
|
{
|
2006-10-11 17:24:46 +00:00
|
|
|
|
return theFontMetrics(font).width(c);
|
2001-02-13 13:28:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
|
int mathed_char_kerning(FontInfo const & font, char_type c)
|
2007-03-21 17:21:59 +00:00
|
|
|
|
{
|
|
|
|
|
frontend::FontMetrics const & fm = theFontMetrics(font);
|
|
|
|
|
return fm.rbearing(c) - fm.width(c);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
|
void mathed_string_dim(FontInfo const & font,
|
2006-10-22 10:15:23 +00:00
|
|
|
|
docstring const & s,
|
2006-10-21 11:15:37 +00:00
|
|
|
|
Dimension & dim)
|
2002-07-11 11:27:24 +00:00
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
|
frontend::FontMetrics const & fm = theFontMetrics(font);
|
2003-05-27 13:55:03 +00:00
|
|
|
|
dim.asc = 0;
|
|
|
|
|
dim.des = 0;
|
2006-10-22 10:15:23 +00:00
|
|
|
|
for (docstring::const_iterator it = s.begin();
|
2006-10-21 11:15:37 +00:00
|
|
|
|
it != s.end();
|
|
|
|
|
++it) {
|
2006-10-07 16:15:06 +00:00
|
|
|
|
dim.asc = max(dim.asc, fm.ascent(*it));
|
|
|
|
|
dim.des = max(dim.des, fm.descent(*it));
|
2001-02-13 13:28:32 +00:00
|
|
|
|
}
|
2007-02-26 15:36:36 +00:00
|
|
|
|
dim.wid = fm.width(s);
|
2001-02-13 13:28:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-08-30 22:42:26 +00:00
|
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
|
int mathed_string_width(FontInfo const & font, docstring const & s)
|
2001-02-13 13:28:32 +00:00
|
|
|
|
{
|
2006-10-17 14:46:45 +00:00
|
|
|
|
return theFontMetrics(font).width(s);
|
2001-02-13 13:28:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-03-21 14:20:48 +00:00
|
|
|
|
void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
|
2006-10-22 10:15:23 +00:00
|
|
|
|
docstring const & name)
|
2001-02-13 13:28:32 +00:00
|
|
|
|
{
|
2001-08-15 07:02:16 +00:00
|
|
|
|
if (name == ".") {
|
2002-06-14 12:24:28 +00:00
|
|
|
|
pi.pain.line(x + w/2, y, x + w/2, y + h,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
Color_cursor, Painter::line_onoffdash);
|
2001-08-15 07:02:16 +00:00
|
|
|
|
return;
|
2002-03-21 17:42:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-09-03 15:22:55 +00:00
|
|
|
|
deco_struct const * mds = search_deco(name);
|
2001-02-13 13:28:32 +00:00
|
|
|
|
if (!mds) {
|
2003-08-02 11:30:30 +00:00
|
|
|
|
lyxerr << "Deco was not found. Programming error?" << endl;
|
2006-10-22 10:15:23 +00:00
|
|
|
|
lyxerr << "name: '" << to_utf8(name) << "'" << endl;
|
2001-02-13 13:28:32 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
2002-03-21 17:42:56 +00:00
|
|
|
|
|
2001-09-12 16:13:31 +00:00
|
|
|
|
int const n = (w < h) ? w : h;
|
2001-02-16 09:25:43 +00:00
|
|
|
|
int const r = mds->angle;
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double const * d = mds->data;
|
2002-03-21 17:42:56 +00:00
|
|
|
|
|
2001-09-03 15:22:55 +00:00
|
|
|
|
if (h > 70 && (name == "(" || name == ")"))
|
2001-02-13 13:28:32 +00:00
|
|
|
|
d = parenthHigh;
|
2002-03-21 17:42:56 +00:00
|
|
|
|
|
2001-09-12 16:13:31 +00:00
|
|
|
|
Matrix mt(r, w, h);
|
|
|
|
|
Matrix sqmt(r, n, n);
|
2001-08-09 15:19:31 +00:00
|
|
|
|
|
|
|
|
|
if (r > 0 && r < 3)
|
|
|
|
|
y += h;
|
|
|
|
|
|
|
|
|
|
if (r >= 2)
|
2001-09-12 16:24:36 +00:00
|
|
|
|
x += w;
|
2001-08-09 15:19:31 +00:00
|
|
|
|
|
2002-05-30 14:56:13 +00:00
|
|
|
|
for (int i = 0; d[i]; ) {
|
2001-09-12 15:56:09 +00:00
|
|
|
|
int code = int(d[i++]);
|
|
|
|
|
if (code & 1) { // code == 1 || code == 3
|
|
|
|
|
double xx = d[i++];
|
|
|
|
|
double yy = d[i++];
|
|
|
|
|
double x2 = d[i++];
|
|
|
|
|
double y2 = d[i++];
|
2001-09-12 16:24:36 +00:00
|
|
|
|
if (code == 3)
|
2001-09-12 16:13:31 +00:00
|
|
|
|
sqmt.transform(xx, yy);
|
2001-02-13 13:28:32 +00:00
|
|
|
|
else
|
2001-09-12 16:13:31 +00:00
|
|
|
|
mt.transform(xx, yy);
|
|
|
|
|
mt.transform(x2, y2);
|
2002-06-14 12:24:28 +00:00
|
|
|
|
pi.pain.line(
|
2002-07-22 22:00:49 +00:00
|
|
|
|
int(x + xx + 0.5), int(y + yy + 0.5),
|
|
|
|
|
int(x + x2 + 0.5), int(y + y2 + 0.5),
|
2010-04-28 13:19:09 +00:00
|
|
|
|
pi.base.font.color());
|
2004-04-08 15:20:05 +00:00
|
|
|
|
} else {
|
2001-02-16 09:25:43 +00:00
|
|
|
|
int xp[32];
|
|
|
|
|
int yp[32];
|
|
|
|
|
int const n = int(d[i++]);
|
2001-02-13 13:28:32 +00:00
|
|
|
|
for (int j = 0; j < n; ++j) {
|
2001-09-12 15:56:09 +00:00
|
|
|
|
double xx = d[i++];
|
|
|
|
|
double yy = d[i++];
|
2002-11-27 10:30:28 +00:00
|
|
|
|
// lyxerr << ' ' << xx << ' ' << yy << ' ';
|
2001-09-12 16:24:36 +00:00
|
|
|
|
if (code == 4)
|
2001-09-12 16:13:31 +00:00
|
|
|
|
sqmt.transform(xx, yy);
|
2001-02-13 13:28:32 +00:00
|
|
|
|
else
|
2001-09-12 16:13:31 +00:00
|
|
|
|
mt.transform(xx, yy);
|
2002-07-22 22:00:49 +00:00
|
|
|
|
xp[j] = int(x + xx + 0.5);
|
|
|
|
|
yp[j] = int(y + yy + 0.5);
|
2002-11-27 10:30:28 +00:00
|
|
|
|
// lyxerr << "P[" << j ' ' << xx << ' ' << yy << ' ' << x << ' ' << y << ']';
|
2001-02-13 13:28:32 +00:00
|
|
|
|
}
|
2010-04-28 13:19:09 +00:00
|
|
|
|
pi.pain.lines(xp, yp, n, pi.base.font.color());
|
2001-02-13 13:28:32 +00:00
|
|
|
|
}
|
2001-09-12 15:56:09 +00:00
|
|
|
|
}
|
2001-02-13 13:28:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2016-11-20 21:34:03 +00:00
|
|
|
|
void mathedSymbolDim(MetricsBase & mb, Dimension & dim, latexkeys const * sym)
|
2016-05-25 12:16:51 +00:00
|
|
|
|
{
|
|
|
|
|
LASSERT((bool)sym, return);
|
|
|
|
|
//lyxerr << "metrics: symbol: '" << sym->name
|
|
|
|
|
// << "' in font: '" << sym->inset
|
|
|
|
|
// << "' drawn as: '" << sym->draw
|
|
|
|
|
// << "'" << endl;
|
|
|
|
|
|
|
|
|
|
bool const italic_upcase_greek = sym->inset == "cmr" &&
|
|
|
|
|
sym->extra == "mathalpha" &&
|
2016-11-20 21:34:03 +00:00
|
|
|
|
mb.fontname == "mathit";
|
2016-05-25 12:16:51 +00:00
|
|
|
|
std::string const font = italic_upcase_greek ? "cmm" : sym->inset;
|
2016-11-20 21:34:03 +00:00
|
|
|
|
Changer dummy = mb.changeFontSet(font);
|
|
|
|
|
mathed_string_dim(mb.font, sym->draw, dim);
|
2016-05-25 12:16:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void mathedSymbolDraw(PainterInfo & pi, int x, int y, latexkeys const * sym)
|
|
|
|
|
{
|
|
|
|
|
LASSERT((bool)sym, return);
|
|
|
|
|
//lyxerr << "drawing: symbol: '" << sym->name
|
|
|
|
|
// << "' in font: '" << sym->inset
|
|
|
|
|
// << "' drawn as: '" << sym->draw
|
|
|
|
|
// << "'" << endl;
|
|
|
|
|
|
|
|
|
|
bool const italic_upcase_greek = sym->inset == "cmr" &&
|
|
|
|
|
sym->extra == "mathalpha" &&
|
|
|
|
|
pi.base.fontname == "mathit";
|
|
|
|
|
std::string const font = italic_upcase_greek ? "cmm" : sym->inset;
|
|
|
|
|
|
|
|
|
|
Changer dummy = pi.base.changeFontSet(font);
|
|
|
|
|
pi.draw(x, y, sym->draw);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-05-03 14:28:28 +00:00
|
|
|
|
void metricsStrRedBlack(MetricsInfo & mi, Dimension & dim, docstring const & str)
|
|
|
|
|
{
|
2012-05-03 13:51:55 +00:00
|
|
|
|
FontInfo font = mi.base.font;
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
augmentFont(font, "mathnormal");
|
2012-05-03 13:51:55 +00:00
|
|
|
|
mathed_string_dim(font, str, dim);
|
2012-05-03 14:28:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-10-17 14:46:45 +00:00
|
|
|
|
void drawStrRed(PainterInfo & pi, int x, int y, docstring const & str)
|
2001-02-13 19:10:18 +00:00
|
|
|
|
{
|
2007-10-28 18:51:54 +00:00
|
|
|
|
FontInfo f = pi.base.font;
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
augmentFont(f, "mathnormal");
|
2007-10-25 12:41:02 +00:00
|
|
|
|
f.setColor(Color_latex);
|
2006-10-17 14:46:45 +00:00
|
|
|
|
pi.pain.text(x, y, str, f);
|
2001-02-13 19:10:18 +00:00
|
|
|
|
}
|
2001-07-06 12:09:32 +00:00
|
|
|
|
|
2001-08-30 22:42:26 +00:00
|
|
|
|
|
2006-10-17 14:46:45 +00:00
|
|
|
|
void drawStrBlack(PainterInfo & pi, int x, int y, docstring const & str)
|
2001-07-06 12:09:32 +00:00
|
|
|
|
{
|
2007-10-28 18:51:54 +00:00
|
|
|
|
FontInfo f = pi.base.font;
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
augmentFont(f, "mathnormal");
|
2007-10-25 12:41:02 +00:00
|
|
|
|
f.setColor(Color_foreground);
|
2006-10-17 14:46:45 +00:00
|
|
|
|
pi.pain.text(x, y, str, f);
|
2001-07-06 12:09:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-08-30 22:42:26 +00:00
|
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
|
void math_font_max_dim(FontInfo const & font, int & asc, int & des)
|
2001-07-20 14:54:13 +00:00
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
|
frontend::FontMetrics const & fm = theFontMetrics(font);
|
2006-10-07 16:15:06 +00:00
|
|
|
|
asc = fm.maxAscent();
|
|
|
|
|
des = fm.maxDescent();
|
2001-07-20 14:54:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-08-30 22:42:26 +00:00
|
|
|
|
|
2002-05-30 07:09:54 +00:00
|
|
|
|
struct fontinfo {
|
2007-12-12 19:28:07 +00:00
|
|
|
|
string cmd_;
|
2007-10-28 18:51:54 +00:00
|
|
|
|
FontFamily family_;
|
|
|
|
|
FontSeries series_;
|
|
|
|
|
FontShape shape_;
|
2007-10-25 12:41:02 +00:00
|
|
|
|
ColorCode color_;
|
2002-05-30 07:09:54 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
|
FontFamily const inh_family = INHERIT_FAMILY;
|
|
|
|
|
FontSeries const inh_series = INHERIT_SERIES;
|
|
|
|
|
FontShape const inh_shape = INHERIT_SHAPE;
|
2002-05-30 07:09:54 +00:00
|
|
|
|
|
|
|
|
|
|
2002-08-07 08:11:41 +00:00
|
|
|
|
// mathnormal should be the first, otherwise the fallback further down
|
2002-07-01 11:17:14 +00:00
|
|
|
|
// does not work
|
2002-05-30 07:09:54 +00:00
|
|
|
|
fontinfo fontinfos[] = {
|
2003-04-14 14:56:49 +00:00
|
|
|
|
// math fonts
|
2016-05-25 12:16:51 +00:00
|
|
|
|
// Color_math determines which fonts are math (see isMathFont)
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"mathnormal", ROMAN_FAMILY, MEDIUM_SERIES,
|
|
|
|
|
ITALIC_SHAPE, Color_math},
|
2008-09-10 14:36:38 +00:00
|
|
|
|
{"mathbf", inh_family, BOLD_SERIES,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"mathcal", CMSY_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"mathfrak", EUFRAK_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"mathrm", ROMAN_FAMILY, inh_series,
|
|
|
|
|
UP_SHAPE, Color_math},
|
|
|
|
|
{"mathsf", SANS_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"mathbb", MSB_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"mathtt", TYPEWRITER_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2003-09-30 10:56:22 +00:00
|
|
|
|
{"mathit", inh_family, inh_series,
|
2007-10-28 18:51:54 +00:00
|
|
|
|
ITALIC_SHAPE, Color_math},
|
2010-07-17 15:51:11 +00:00
|
|
|
|
{"mathscr", RSFS_FAMILY, inh_series,
|
2014-03-08 09:57:24 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"cmex", CMEX_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"cmm", CMM_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"cmr", CMR_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"cmsy", CMSY_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"eufrak", EUFRAK_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"msa", MSA_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"msb", MSB_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2012-12-15 12:02:40 +00:00
|
|
|
|
{"stmry", STMARY_FAMILY, inh_series,
|
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"wasy", WASY_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"esint", ESINT_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2003-04-14 14:56:49 +00:00
|
|
|
|
|
|
|
|
|
// Text fonts
|
|
|
|
|
{"text", inh_family, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_foreground},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"textbf", inh_family, BOLD_SERIES,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_foreground},
|
2003-04-14 14:56:49 +00:00
|
|
|
|
{"textit", inh_family, inh_series,
|
2007-10-28 18:51:54 +00:00
|
|
|
|
ITALIC_SHAPE, Color_foreground},
|
|
|
|
|
{"textmd", inh_family, MEDIUM_SERIES,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_foreground},
|
2003-04-14 14:56:49 +00:00
|
|
|
|
{"textnormal", inh_family, inh_series,
|
2007-10-28 18:51:54 +00:00
|
|
|
|
UP_SHAPE, Color_foreground},
|
|
|
|
|
{"textrm", ROMAN_FAMILY,
|
|
|
|
|
inh_series, UP_SHAPE,Color_foreground},
|
2003-04-14 14:56:49 +00:00
|
|
|
|
{"textsc", inh_family, inh_series,
|
2007-10-28 18:51:54 +00:00
|
|
|
|
SMALLCAPS_SHAPE, Color_foreground},
|
|
|
|
|
{"textsf", SANS_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_foreground},
|
2003-04-14 14:56:49 +00:00
|
|
|
|
{"textsl", inh_family, inh_series,
|
2007-10-28 18:51:54 +00:00
|
|
|
|
SLANTED_SHAPE, Color_foreground},
|
|
|
|
|
{"texttt", TYPEWRITER_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_foreground},
|
2003-04-14 14:56:49 +00:00
|
|
|
|
{"textup", inh_family, inh_series,
|
2007-10-28 18:51:54 +00:00
|
|
|
|
UP_SHAPE, Color_foreground},
|
2002-06-24 15:37:14 +00:00
|
|
|
|
|
2002-07-08 11:29:51 +00:00
|
|
|
|
// TIPA support
|
2003-04-14 14:56:49 +00:00
|
|
|
|
{"textipa", inh_family, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_foreground},
|
2003-04-14 14:56:49 +00:00
|
|
|
|
|
2009-07-03 00:05:58 +00:00
|
|
|
|
// mhchem support
|
|
|
|
|
{"ce", inh_family, inh_series,
|
|
|
|
|
inh_shape, Color_foreground},
|
|
|
|
|
{"cf", inh_family, inh_series,
|
|
|
|
|
inh_shape, Color_foreground},
|
|
|
|
|
|
2003-04-14 14:56:49 +00:00
|
|
|
|
// LyX internal usage
|
|
|
|
|
{"lyxtex", inh_family, inh_series,
|
2007-10-28 18:51:54 +00:00
|
|
|
|
UP_SHAPE, Color_latex},
|
2014-06-07 08:50:11 +00:00
|
|
|
|
// FIXME: The following two don't work on OS X, since the Symbol font
|
|
|
|
|
// uses a different encoding, and is therefore disabled in
|
|
|
|
|
// FontLoader::available().
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"lyxsymbol", SYMBOL_FAMILY, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"lyxboldsymbol", SYMBOL_FAMILY, BOLD_SERIES,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_math},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"lyxblacktext", ROMAN_FAMILY, MEDIUM_SERIES,
|
|
|
|
|
UP_SHAPE, Color_foreground},
|
2003-04-14 14:56:49 +00:00
|
|
|
|
{"lyxnochange", inh_family, inh_series,
|
2007-10-25 12:41:02 +00:00
|
|
|
|
inh_shape, Color_foreground},
|
2007-10-28 18:51:54 +00:00
|
|
|
|
{"lyxfakebb", TYPEWRITER_FAMILY, BOLD_SERIES,
|
|
|
|
|
UP_SHAPE, Color_math},
|
|
|
|
|
{"lyxfakecal", SANS_FAMILY, MEDIUM_SERIES,
|
|
|
|
|
ITALIC_SHAPE, Color_math},
|
|
|
|
|
{"lyxfakefrak", ROMAN_FAMILY, BOLD_SERIES,
|
|
|
|
|
ITALIC_SHAPE, Color_math}
|
2002-05-30 07:09:54 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
fontinfo * lookupFont(string const & name)
|
2002-05-30 07:09:54 +00:00
|
|
|
|
{
|
2003-08-02 11:30:30 +00:00
|
|
|
|
//lyxerr << "searching font '" << name << "'" << endl;
|
2002-07-11 09:34:58 +00:00
|
|
|
|
int const n = sizeof(fontinfos) / sizeof(fontinfo);
|
2002-05-30 07:09:54 +00:00
|
|
|
|
for (int i = 0; i < n; ++i)
|
|
|
|
|
if (fontinfos[i].cmd_ == name) {
|
2003-08-02 11:30:30 +00:00
|
|
|
|
//lyxerr << "found '" << i << "'" << endl;
|
2002-05-30 07:09:54 +00:00
|
|
|
|
return fontinfos + i;
|
|
|
|
|
}
|
2002-07-11 09:34:58 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
fontinfo * searchFont(string const & name)
|
2002-07-11 09:34:58 +00:00
|
|
|
|
{
|
|
|
|
|
fontinfo * f = lookupFont(name);
|
|
|
|
|
return f ? f : fontinfos;
|
2002-07-01 11:17:14 +00:00
|
|
|
|
// this should be mathnormal
|
|
|
|
|
//return searchFont("mathnormal");
|
2002-05-30 07:09:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
bool isFontName(string const & name)
|
2002-07-11 09:34:58 +00:00
|
|
|
|
{
|
|
|
|
|
return lookupFont(name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
bool isMathFont(string const & name)
|
2010-04-27 19:23:31 +00:00
|
|
|
|
{
|
|
|
|
|
fontinfo * f = lookupFont(name);
|
|
|
|
|
return f && f->color_ == Color_math;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
bool isTextFont(string const & name)
|
Index: src/mathed/InsetMathHull.cpp
===================================================================
--- src/mathed/InsetMathHull.cpp (revisione 34304)
+++ src/mathed/InsetMathHull.cpp (copia locale)
@@ -328,6 +328,23 @@ docstring InsetMathHull::standardFont()
}
+docstring InsetMathHull::standardColor() const
+{
+ docstring color;
+ switch (type_) {
+ case hullRegexp:
+ color = from_ascii("foreground");
+ break;
+ case hullNone:
+ color = from_ascii("foreground");
+ break;
+ default:
+ color = from_ascii("math");
+ }
+ return color;
+}
+
+
bool InsetMathHull::previewState(BufferView * bv) const
{
if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) {
@@ -417,8 +434,11 @@ void InsetMathHull::draw(PainterInfo & p
return;
}
+ bool const really_change_color = pi.base.font.color() == Color_none;
+ ColorChanger dummy0(pi.base.font, standardColor(), really_change_color);
FontSetChanger dummy1(pi.base, standardFont());
StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+
InsetMathGrid::draw(pi, x + 1, y);
if (numberedType()) {
Index: src/mathed/MathSupport.cpp
===================================================================
--- src/mathed/MathSupport.cpp (revisione 34311)
+++ src/mathed/MathSupport.cpp (copia locale)
@@ -653,6 +653,13 @@ bool isMathFont(docstring const & name)
}
+bool isTextFont(docstring const & name)
+{
+ fontinfo * f = lookupFont(name);
+ return f && f->color_ == Color_foreground;
+}
+
+
FontInfo getFont(docstring const & name)
{
FontInfo font;
Index: src/mathed/MathSupport.h
===================================================================
--- src/mathed/MathSupport.h (revisione 34311)
+++ src/mathed/MathSupport.h (copia locale)
@@ -51,6 +51,8 @@ bool isFontName(docstring const & name);
bool isMathFont(docstring const & name);
+bool isTextFont(docstring const & name);
+
// converts single cell to string
docstring asString(MathData const & ar);
// converts single inset to string
Index: src/mathed/InsetMathHull.h
===================================================================
--- src/mathed/InsetMathHull.h (revisione 34304)
+++ src/mathed/InsetMathHull.h (copia locale)
@@ -197,6 +197,8 @@ private:
void changeCols(col_type);
///
docstring standardFont() const;
+ ///
+ docstring standardColor() const;
/// consistency check
void check() const;
/// can this change its number of rows?
Index: src/MetricsInfo.cpp
===================================================================
--- src/MetricsInfo.cpp (revisione 34312)
+++ src/MetricsInfo.cpp (copia locale)
@@ -235,11 +235,15 @@ FontSetChanger::FontSetChanger(MetricsBa
save_ = mb;
FontSize oldsize = save_.font.size();
ColorCode oldcolor = save_.font.color();
+ docstring const oldname = from_ascii(save_.fontname);
mb.fontname = name;
mb.font = sane_font;
augmentFont(mb.font, from_ascii(name));
mb.font.setSize(oldsize);
- mb.font.setColor(oldcolor);
+ if (string(name) != "lyxtex"
+ && ((isTextFont(oldname) && oldcolor != Color_foreground)
+ || (isMathFont(oldname) && oldcolor != Color_math)))
+ mb.font.setColor(oldcolor);
}
}
@@ -252,11 +256,15 @@ FontSetChanger::FontSetChanger(MetricsBa
save_ = mb;
FontSize oldsize = save_.font.size();
ColorCode oldcolor = save_.font.color();
+ docstring const oldname = from_ascii(save_.fontname);
mb.fontname = to_utf8(name);
mb.font = sane_font;
augmentFont(mb.font, name);
mb.font.setSize(oldsize);
- mb.font.setColor(oldcolor);
+ if (name != "lyxtex"
+ && ((isTextFont(oldname) && oldcolor != Color_foreground)
+ || (isMathFont(oldname) && oldcolor != Color_math)))
+ mb.font.setColor(oldcolor);
}
}
@@ -294,17 +302,21 @@ WidthChanger::~WidthChanger()
//
/////////////////////////////////////////////////////////////////////////
-ColorChanger::ColorChanger(FontInfo & font, string const & color)
- : Changer<FontInfo, string>(font)
+ColorChanger::ColorChanger(FontInfo & font, docstring const & color,
+ bool really_change_color)
+ : Changer<FontInfo, ColorCode>(font), change_(really_change_color)
{
- save_ = lcolor.getFromLyXName(color);
- font.setColor(lcolor.getFromLyXName(color));
+ if (change_) {
+ save_ = font.color();
+ font.setColor(lcolor.getFromLyXName(to_utf8(color)));
+ }
}
ColorChanger::~ColorChanger()
{
- orig_.setColor(lcolor.getFromLyXName(save_));
+ if (change_)
+ orig_.setColor(save_);
}
Index: src/MetricsInfo.h
===================================================================
--- src/MetricsInfo.h (revisione 34312)
+++ src/MetricsInfo.h (copia locale)
@@ -222,12 +222,16 @@ public:
// temporarily change the used color
-class ColorChanger : public Changer<FontInfo, std::string> {
+class ColorChanger : public Changer<FontInfo, ColorCode> {
public:
///
- ColorChanger(FontInfo & font, std::string const & color);
+ ColorChanger(FontInfo & font, docstring const & color,
+ bool really_change_color = true);
///
~ColorChanger();
+private:
+ ///
+ bool change_;
};
} // namespace lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34320 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-28 01:40:11 +00:00
|
|
|
|
{
|
|
|
|
|
fontinfo * f = lookupFont(name);
|
|
|
|
|
return f && f->color_ == Color_foreground;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
FontInfo getFont(string const & name)
|
2002-06-18 15:44:30 +00:00
|
|
|
|
{
|
2007-10-28 18:51:54 +00:00
|
|
|
|
FontInfo font;
|
2002-06-18 15:44:30 +00:00
|
|
|
|
augmentFont(font, name);
|
|
|
|
|
return font;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
void fakeFont(string const & orig, string const & fake)
|
2002-06-18 15:44:30 +00:00
|
|
|
|
{
|
|
|
|
|
fontinfo * forig = searchFont(orig);
|
|
|
|
|
fontinfo * ffake = searchFont(fake);
|
|
|
|
|
if (forig && ffake) {
|
|
|
|
|
forig->family_ = ffake->family_;
|
|
|
|
|
forig->series_ = ffake->series_;
|
|
|
|
|
forig->shape_ = ffake->shape_;
|
|
|
|
|
forig->color_ = ffake->color_;
|
|
|
|
|
} else {
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
lyxerr << "Can't fake font '" << orig << "' with '"
|
|
|
|
|
<< fake << "'" << endl;
|
2002-06-18 15:44:30 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-01 11:17:14 +00:00
|
|
|
|
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
void augmentFont(FontInfo & font, string const & name)
|
2002-05-30 07:09:54 +00:00
|
|
|
|
{
|
|
|
|
|
static bool initialized = false;
|
|
|
|
|
if (!initialized) {
|
|
|
|
|
initialized = true;
|
2002-06-18 15:44:30 +00:00
|
|
|
|
// fake fonts if necessary
|
Remove a conversion to_utf8() inside FontSetChanger
This requires to change many docstrings into std::strings. The logic behind that
is that they represent a fixed set of math fonts, and therefore “string” means
here “poor man's enum” rather than text (this is consistent with MetricsBase).
Profiling of scrolling inside a document over macro-instensive areas:
Before the patch:
44,1% BufferView::updateMetrics()
-> 34,8% InsetMathHull::metrics()
-> 9,8% FontSetChanger::FontSetChanger()
28,4% BufferView::draw()
After the patch:
35,3% BufferView::updateMetrics()
-> 27,2% InsetMathHull::metrics
-> 0,4% FontSetChanger::FontSetChanger()
47,5% BufferView::draw()
FontSetChanger::FontSetChanger() is made 41x less expensive (with reference
BV::draw()) just by removing this conversion. The remaining 0,4% could be
squished by replacing the strings with a proper enum, but this is premature. Of
course, this only treats the symptoms: there is no good reason that this
function is called 45500 times over the time of 40 repaints.
2016-06-07 21:58:55 +00:00
|
|
|
|
if (!theFontLoader().available(getFont("mathfrak")))
|
|
|
|
|
fakeFont("mathfrak", "lyxfakefrak");
|
|
|
|
|
if (!theFontLoader().available(getFont("mathcal")))
|
|
|
|
|
fakeFont("mathcal", "lyxfakecal");
|
2002-05-30 07:09:54 +00:00
|
|
|
|
}
|
|
|
|
|
fontinfo * info = searchFont(name);
|
2002-06-24 15:37:14 +00:00
|
|
|
|
if (info->family_ != inh_family)
|
2002-05-30 07:09:54 +00:00
|
|
|
|
font.setFamily(info->family_);
|
2002-06-24 15:37:14 +00:00
|
|
|
|
if (info->series_ != inh_series)
|
2002-05-30 07:09:54 +00:00
|
|
|
|
font.setSeries(info->series_);
|
2002-06-24 15:37:14 +00:00
|
|
|
|
if (info->shape_ != inh_shape)
|
2002-05-30 07:09:54 +00:00
|
|
|
|
font.setShape(info->shape_);
|
2007-10-25 12:41:02 +00:00
|
|
|
|
if (info->color_ != Color_none)
|
2002-05-30 07:09:54 +00:00
|
|
|
|
font.setColor(info->color_);
|
|
|
|
|
}
|
2003-06-02 10:03:27 +00:00
|
|
|
|
|
|
|
|
|
|
2013-02-17 10:08:58 +00:00
|
|
|
|
bool isAlphaSymbol(MathAtom const & at)
|
|
|
|
|
{
|
|
|
|
|
if (at->asCharInset() ||
|
|
|
|
|
(at->asSymbolInset() &&
|
|
|
|
|
at->asSymbolInset()->isOrdAlpha()))
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
if (at->asFontInset()) {
|
|
|
|
|
MathData const & ar = at->asFontInset()->cell(0);
|
|
|
|
|
for (size_t i = 0; i < ar.size(); ++i) {
|
|
|
|
|
if (!(ar[i]->asCharInset() ||
|
|
|
|
|
(ar[i]->asSymbolInset() &&
|
|
|
|
|
ar[i]->asSymbolInset()->isOrdAlpha())))
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-04-26 16:05:57 +00:00
|
|
|
|
docstring asString(MathData const & ar)
|
2003-06-02 10:03:27 +00:00
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
|
odocstringstream os;
|
2016-09-04 02:02:47 +00:00
|
|
|
|
otexrowstream ots(os);
|
2015-10-07 03:13:21 +00:00
|
|
|
|
WriteStream ws(ots);
|
2003-06-02 10:03:27 +00:00
|
|
|
|
ws << ar;
|
2006-10-22 10:15:23 +00:00
|
|
|
|
return os.str();
|
2003-06-02 10:03:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-10-17 21:40:11 +00:00
|
|
|
|
void asArray(docstring const & str, MathData & ar, Parse::flags pf)
|
2003-06-02 10:03:27 +00:00
|
|
|
|
{
|
2008-10-17 21:40:11 +00:00
|
|
|
|
bool quiet = pf & Parse::QUIET;
|
2008-10-20 00:18:29 +00:00
|
|
|
|
if ((str.size() == 1 && quiet) || (!mathed_parse_cell(ar, str, pf) && quiet))
|
2008-10-17 21:40:11 +00:00
|
|
|
|
mathed_parse_cell(ar, str, pf | Parse::VERBATIM);
|
2003-06-02 10:03:27 +00:00
|
|
|
|
}
|
2004-01-07 18:28:50 +00:00
|
|
|
|
|
|
|
|
|
|
2006-10-22 10:15:23 +00:00
|
|
|
|
docstring asString(InsetMath const & inset)
|
2004-01-07 18:28:50 +00:00
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
|
odocstringstream os;
|
2016-09-04 02:02:47 +00:00
|
|
|
|
otexrowstream ots(os);
|
2015-10-07 03:13:21 +00:00
|
|
|
|
WriteStream ws(ots);
|
2004-01-07 18:28:50 +00:00
|
|
|
|
inset.write(ws);
|
2006-10-22 10:15:23 +00:00
|
|
|
|
return os.str();
|
2004-01-07 18:28:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-10-22 10:15:23 +00:00
|
|
|
|
docstring asString(MathAtom const & at)
|
2004-01-07 18:28:50 +00:00
|
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
|
odocstringstream os;
|
2016-09-04 02:02:47 +00:00
|
|
|
|
otexrowstream ots(os);
|
2015-10-07 03:13:21 +00:00
|
|
|
|
WriteStream ws(ots);
|
2004-01-07 18:28:50 +00:00
|
|
|
|
at->write(ws);
|
2006-10-22 10:15:23 +00:00
|
|
|
|
return os.str();
|
2004-01-07 18:28:50 +00:00
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
|
2016-12-19 23:15:59 +00:00
|
|
|
|
int axis_height(MetricsBase & mb)
|
|
|
|
|
{
|
|
|
|
|
Changer dummy = mb.changeFontSet("mathnormal");
|
|
|
|
|
return theFontMetrics(mb.font).ascent('-') - 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2016-12-19 23:15:59 +00:00
|
|
|
|
void validate_math_word(LaTeXFeatures & features, docstring const & word)
|
|
|
|
|
{
|
|
|
|
|
MathWordList const & words = mathedWordList();
|
|
|
|
|
MathWordList::const_iterator it = words.find(word);
|
|
|
|
|
if (it != words.end()) {
|
|
|
|
|
string const req = it->second.requires;
|
|
|
|
|
if (!req.empty())
|
|
|
|
|
features.require(req);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
} // namespace lyx
|