mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-06 00:10:59 +00:00
rename MathBigopInset into MathSymbolInset. That's what it is nowadays...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2365 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
739b051626
commit
811980f739
@ -20,8 +20,6 @@ libmathed_la_SOURCES = \
|
|||||||
formulamacro.h \
|
formulamacro.h \
|
||||||
math_arrayinset.C \
|
math_arrayinset.C \
|
||||||
math_arrayinset.h \
|
math_arrayinset.h \
|
||||||
math_bigopinset.C \
|
|
||||||
math_bigopinset.h \
|
|
||||||
math_cursor.C \
|
math_cursor.C \
|
||||||
math_cursor.h \
|
math_cursor.h \
|
||||||
math_decorationinset.C \
|
math_decorationinset.C \
|
||||||
@ -62,6 +60,8 @@ libmathed_la_SOURCES = \
|
|||||||
math_spaceinset.h \
|
math_spaceinset.h \
|
||||||
math_sqrtinset.C \
|
math_sqrtinset.C \
|
||||||
math_sqrtinset.h \
|
math_sqrtinset.h \
|
||||||
|
math_symbolinset.C \
|
||||||
|
math_symbolinset.h \
|
||||||
support.C \
|
support.C \
|
||||||
support.h \
|
support.h \
|
||||||
symbol_def.h
|
symbol_def.h
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "formulabase.h"
|
#include "formulabase.h"
|
||||||
#include "math_cursor.h"
|
#include "math_cursor.h"
|
||||||
#include "math_arrayinset.h"
|
#include "math_arrayinset.h"
|
||||||
#include "math_bigopinset.h"
|
#include "math_symbolinset.h"
|
||||||
#include "math_decorationinset.h"
|
#include "math_decorationinset.h"
|
||||||
#include "math_deliminset.h"
|
#include "math_deliminset.h"
|
||||||
#include "math_dotsinset.h"
|
#include "math_dotsinset.h"
|
||||||
@ -668,7 +668,7 @@ void MathCursor::interpret(string const & s)
|
|||||||
case LM_TK_SYM:
|
case LM_TK_SYM:
|
||||||
case LM_TK_BIGSYM:
|
case LM_TK_BIGSYM:
|
||||||
case LM_TK_FUNCLIM:
|
case LM_TK_FUNCLIM:
|
||||||
p = new MathBigopInset(l);
|
p = new MathSymbolInset(l);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LM_TK_STACK:
|
case LM_TK_STACK:
|
||||||
@ -712,7 +712,7 @@ void MathCursor::interpret(string const & s)
|
|||||||
insert(p);
|
insert(p);
|
||||||
if (p->nargs()) {
|
if (p->nargs()) {
|
||||||
plainLeft();
|
plainLeft();
|
||||||
right(); // do not push for e.g. MathBigopInset
|
right(); // do not push for e.g. MathSymbolInset
|
||||||
if (oldsel)
|
if (oldsel)
|
||||||
selPaste();
|
selPaste();
|
||||||
}
|
}
|
||||||
|
@ -177,7 +177,7 @@ latexkeys const wordlist[] =
|
|||||||
{"neq", LM_TK_SYM, LM_neq, LMB_RELATION},
|
{"neq", LM_TK_SYM, LM_neq, LMB_RELATION},
|
||||||
{"newcommand", LM_TK_NEWCOMMAND, 0 , LMB_NONE},
|
{"newcommand", LM_TK_NEWCOMMAND, 0 , LMB_NONE},
|
||||||
{"ni", LM_TK_SYM, LM_ni, LMB_RELATION},
|
{"ni", LM_TK_SYM, LM_ni, LMB_RELATION},
|
||||||
{"nolimits", LM_TK_LIMIT, -1, LMB_NONE},
|
{"nolimits", LM_TK_LIMIT, static_cast<unsigned>(-1), LMB_NONE},
|
||||||
{"nonumber", LM_TK_NONUM, 0, LMB_NONE},
|
{"nonumber", LM_TK_NONUM, 0, LMB_NONE},
|
||||||
{"not", LM_TK_DECORATION, LM_not, LMB_NONE},
|
{"not", LM_TK_DECORATION, LM_not, LMB_NONE},
|
||||||
{"notin", LM_TK_MACRO, LM_notin, LMB_RELATION},
|
{"notin", LM_TK_MACRO, LM_notin, LMB_RELATION},
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "array.h"
|
#include "array.h"
|
||||||
#include "math_inset.h"
|
#include "math_inset.h"
|
||||||
#include "math_arrayinset.h"
|
#include "math_arrayinset.h"
|
||||||
#include "math_bigopinset.h"
|
#include "math_symbolinset.h"
|
||||||
#include "math_dotsinset.h"
|
#include "math_dotsinset.h"
|
||||||
#include "math_decorationinset.h"
|
#include "math_decorationinset.h"
|
||||||
#include "math_deliminset.h"
|
#include "math_deliminset.h"
|
||||||
@ -644,7 +644,7 @@ void mathed_parse(MathArray & array, unsigned flags)
|
|||||||
case LM_TK_SYM:
|
case LM_TK_SYM:
|
||||||
case LM_TK_FUNCLIM:
|
case LM_TK_FUNCLIM:
|
||||||
limits = 0;
|
limits = 0;
|
||||||
array.push_back(new MathBigopInset(yylval.l));
|
array.push_back(new MathSymbolInset(yylval.l));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LM_TK_BOP:
|
case LM_TK_BOP:
|
||||||
@ -748,7 +748,7 @@ void mathed_parse(MathArray & array, unsigned flags)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case LM_TK_FUNC:
|
case LM_TK_FUNC:
|
||||||
array.push_back(new MathFuncInset(yylval.l->name));
|
array.push_back(new MathSymbolInset(yylval.l));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LM_TK_UNDEF:
|
case LM_TK_UNDEF:
|
||||||
|
@ -1,34 +1,34 @@
|
|||||||
#include "math_bigopinset.h"
|
#include "math_symbolinset.h"
|
||||||
#include "mathed/math_parser.h"
|
#include "mathed/math_parser.h"
|
||||||
#include "support/LOstream.h"
|
#include "support/LOstream.h"
|
||||||
|
|
||||||
|
|
||||||
using std::ostream;
|
using std::ostream;
|
||||||
|
|
||||||
MathBigopInset::MathBigopInset(const latexkeys * l)
|
MathSymbolInset::MathSymbolInset(const latexkeys * l)
|
||||||
: sym_(l)
|
: sym_(l)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
MathInset * MathBigopInset::clone() const
|
MathInset * MathSymbolInset::clone() const
|
||||||
{
|
{
|
||||||
return new MathBigopInset(*this);
|
return new MathSymbolInset(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void MathBigopInset::write(ostream & os, bool /* fragile */) const
|
void MathSymbolInset::write(ostream & os, bool /* fragile */) const
|
||||||
{
|
{
|
||||||
os << '\\' << sym_->name << ' ';
|
os << '\\' << sym_->name << ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void MathBigopInset::writeNormal(ostream & os) const
|
void MathSymbolInset::writeNormal(ostream & os) const
|
||||||
{
|
{
|
||||||
os << "[bigop " << sym_->name << "] ";
|
os << "[bigop " << sym_->name << "] ";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void MathBigopInset::metrics(MathStyles st)
|
void MathSymbolInset::metrics(MathStyles st)
|
||||||
{
|
{
|
||||||
size(st);
|
size(st);
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ void MathBigopInset::metrics(MathStyles st)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void MathBigopInset::draw(Painter & pain, int x, int y)
|
void MathSymbolInset::draw(Painter & pain, int x, int y)
|
||||||
{
|
{
|
||||||
xo(x);
|
xo(x);
|
||||||
yo(y);
|
yo(y);
|
@ -1,16 +1,16 @@
|
|||||||
// -*- C++ -*-
|
// -*- C++ -*-
|
||||||
#ifndef MATH_BIGOPINSET_H
|
#ifndef MATH_SYMBOLINSET_H
|
||||||
#define MATH_BIGOPINSET_H
|
#define MATH_SYMBOLINSET_H
|
||||||
|
|
||||||
#include "math_inset.h"
|
#include "math_inset.h"
|
||||||
|
|
||||||
struct latexkeys;
|
struct latexkeys;
|
||||||
|
|
||||||
/// big operators
|
/// big operators
|
||||||
class MathBigopInset : public MathInset {
|
class MathSymbolInset : public MathInset {
|
||||||
public:
|
public:
|
||||||
///
|
///
|
||||||
explicit MathBigopInset(latexkeys const *);
|
explicit MathSymbolInset(latexkeys const *);
|
||||||
///
|
///
|
||||||
MathInset * clone() const;
|
MathInset * clone() const;
|
||||||
///
|
///
|
Loading…
Reference in New Issue
Block a user