anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 07:45:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

'native' support for \ge and \le; cosmetics

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2371 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2001-07-27 13:59:33 +00:00
parent 8aa0eee33a
commit ff74dbd043
3 changed files with 14 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mathed/math_hash.C
View File

@ -208,8 +208,8 @@ latexkeys const wordlist[] =
{"propto", LM_TK_SYM, LM_propto, LMB_RELATION},
{"protect", LM_TK_PROTECT, 0, LMB_RELATION},
{"psi", LM_TK_SYM, LM_psi, LMB_NONE},
{"qquad", LM_TK_SPACE, LM_qquad, LMB_NONE},
{"quad", LM_TK_SPACE, LM_quad, LMB_NONE},
{"qquad", LM_TK_SPACE, 5, LMB_NONE},
{"quad", LM_TK_SPACE, 4, LMB_NONE},
{"rangle", LM_TK_SYM, LM_rangle, LMB_NONE},
{"rceil", LM_TK_SYM, LM_rceil, LMB_NONE},
{"rfloor", LM_TK_SYM, LM_rfloor, LMB_NONE},

87
src/mathed/math_macrotable.C
View File

@ -10,13 +10,9 @@
#include "math_macro.h"
#include "math_macrotemplate.h"
#include "math_parser.h"
#include "array.h"
#include "math_decorationinset.h"
#include "math_deliminset.h"
#include "math_fracinset.h"
#include "math_inset.h"
#include "debug.h"
#include "support/LAssert.h"
using std::endl;
@ -100,79 +96,20 @@ void MathMacroTable::builtinMacros()
return;
built = true;
//lyxerr[Debug::MATHED] << "Building macros" << endl;
/*
// This macro doesn't have arguments
{
MathMacroTemplate * t = new MathMacroTemplate("notin", 0);
MathDecorationInset * p = new MathDecorationInset("not");
p->cell(0).push_back(LM_in, LM_TC_SYMB);
t->push_back(p);
insertTemplate(t);
}
*/
createTemplate("silentmult", 0, "\\cdot");
createTemplate("emptyset", 0, "\\not0");
createTemplate("notin", 0, "\\not\\in");
/*
{
MathMacroTemplate * t = new MathMacroTemplate("emptyset", 0);
MathDecorationInset * p = new MathDecorationInset("not", LM_not);
p->cell(0).push_back('O', LM_TC_VAR);
t->push_back(p);
insertTemplate(t);
}
*/
{
MathMacroTemplate * t = new MathMacroTemplate("land", 0);
t->push_back(LM_wedge, LM_TC_SYMB);
insertTemplate(t);
}
{
MathMacroTemplate * t = new MathMacroTemplate("lor", 0);
t->push_back(LM_vee, LM_TC_SYMB);
insertTemplate(t);
}
{
MathMacroTemplate * t = new MathMacroTemplate("to", 0);
t->push_back(LM_rightarrow, LM_TC_SYMB);
insertTemplate(t);
}
{
MathMacroTemplate * t = new MathMacroTemplate("perp", 0);
t->push_back(LM_bot, LM_TC_BOP);
insertTemplate(t);
}
/*
{
MathMacroTemplate & m = createTemplate("lint", 4);
istringstream is("\\int_{#1}^{#2}#3 d#4\0");
mathed_parser_file(is, 0);
MathMatrixInset * p = &m;
mathed_parse(m.array, p, 0);
}
*/
/*
{
MathMacroTemplate * t = new MathMacroTemplate("binomii", 2);
istringstream is("\\left(\\frac{#1}{#2}\\right)\0");
mathed_parser_file(is, 0);
mathed_parse(t->array, t, 0);
insertTemplate(t);
}
*/
createTemplate("emptyset", 0, "\\not0");
createTemplate("ge", 0, "\\geq");
createTemplate("gets", 0, "\\leftarrow");
createTemplate("land", 0, "\\wedge");
createTemplate("le", 0, "\\leq");
createTemplate("lor", 0, "\\vee");
createTemplate("notin", 0, "\\not\\in");
createTemplate("perp", 0, "\\bot");
createTemplate("to", 0, "\\rightarrow");
//createTemplate("lint", 4, "\\int_{#1}^{#2}#3 d#4");
//createTemplate("silentmult", 0, "\\cdot");
//createTemplate("binomi", 2, "\\left(\\frac{#1}{#2}\\right)");
// binom has two arguments
{

3
src/mathed/symbol_def.h
View File

@ -14,9 +14,6 @@ enum Math_Symbols_enum {
LM_dot = '.',
LM_bar = '-',
LM_quad = 4,
LM_qquad = 5,
/// Symbols that don't exist in X11 symbol font but that we fake
LM_not = 10,