20 files changed:
#endif
#include "math_inset.h"
#endif
#include "math_inset.h"
-#include "math_charinset.h"
#include "debug.h"
#include "array.h"
#include "debug.h"
#include "array.h"
-#include "math_scriptinset.h"
#include "mathed/support.h"
using std::ostream;
#include "mathed/support.h"
using std::ostream;
-void MathArray::insert(int pos, unsigned char b, MathTextCodes t)
-{
- bf_.insert(begin() + pos, new MathCharInset(b, t));
-}
-
-
void MathArray::insert(int pos, MathArray const & array)
{
bf_.insert(begin() + pos, array.begin(), array.end());
void MathArray::insert(int pos, MathArray const & array)
{
bf_.insert(begin() + pos, array.begin(), array.end());
-void MathArray::push_back(unsigned char b, MathTextCodes c)
-{
- insert(size(), b, c);
-}
-
-
void MathArray::push_back(MathArray const & array)
{
insert(size(), array);
void MathArray::push_back(MathArray const & array)
{
insert(size(), array);
#include <vector>
#include <iosfwd>
#include <vector>
#include <iosfwd>
-#include "mathed/support.h"
-#include "math_defs.h"
-
class MathInset;
class MathMacro;
class MathInset;
class MathMacro;
class LaTeXFeatures;
#ifdef __GNUG__
class LaTeXFeatures;
#ifdef __GNUG__
///
void insert(int pos, MathInset * inset);
///
///
void insert(int pos, MathInset * inset);
///
- void insert(int pos, unsigned char, MathTextCodes);
- ///
void insert(int pos, MathArray const &);
///
void insert(int pos, MathArray const &);
///
///
void push_back(MathInset * inset);
///
///
void push_back(MathInset * inset);
///
- void push_back(unsigned char, MathTextCodes);
- ///
void push_back(MathArray const &);
///
void pop_back();
void push_back(MathArray const &);
///
void pop_back();
#include "math_bigopinset.h"
#include "mathed/math_parser.h"
#include "math_bigopinset.h"
#include "mathed/math_parser.h"
+#include "mathed/support.h"
#include "support/LOstream.h"
#include "support/LOstream.h"
// larger in displayed formulae and take limits
#include "math_diminset.h"
// larger in displayed formulae and take limits
#include "math_diminset.h"
#include "math_cursor.h"
#include "math_arrayinset.h"
#include "math_bigopinset.h"
#include "math_cursor.h"
#include "math_arrayinset.h"
#include "math_bigopinset.h"
+#include "math_charinset.h"
#include "math_symbolinset.h"
#include "math_decorationinset.h"
#include "math_deliminset.h"
#include "math_symbolinset.h"
#include "math_decorationinset.h"
#include "math_deliminset.h"
- array().insert(pos(), c, t);
+ array().insert(pos(), new MathCharInset(c, t));
#include "math_diminset.h"
#include "math_defs.h"
#include "math_diminset.h"
#include "math_defs.h"
#ifdef __GNUG__
#pragma interface
#ifdef __GNUG__
#pragma interface
#include "math_funcliminset.h"
#include "mathed/math_parser.h"
#include "math_funcliminset.h"
#include "mathed/math_parser.h"
+#include "mathed/support.h"
#include "support/LOstream.h"
#include "support/LOstream.h"
#define MATH_GRID_H
#include "math_nestinset.h"
#define MATH_GRID_H
#include "math_nestinset.h"
#ifdef __GNUG__
#pragma interface
#ifdef __GNUG__
#pragma interface
return new MathMacro(*this);
}
return new MathMacro(*this);
}
-string const & MathMacro::name() const
+
+const char * MathMacro::name() const
- return tmplate_->name();
+ return tmplate_->name().c_str();
void MathMacro::metrics(MathStyles st) const
{
if (mathcursor && mathcursor->isInside(this)) {
void MathMacro::metrics(MathStyles st) const
{
if (mathcursor && mathcursor->isInside(this)) {
///
void operator=(MathMacro const &);
///
///
void operator=(MathMacro const &);
///
- string const & name() const;
+ char const * name() const;
///
MathMacroTemplate const * const tmplate_;
///
MathMacroTemplate const * const tmplate_;
#define MATH_MACROTEMPLATE_H
#include "math_nestinset.h"
#define MATH_MACROTEMPLATE_H
#include "math_nestinset.h"
#ifdef __GNUG__
#pragma interface
#ifdef __GNUG__
#pragma interface
#include <vector>
#include "math_matrixinset.h"
#include <vector>
#include "math_matrixinset.h"
#include "debug.h"
#include "support/LOstream.h"
#include "Painter.h"
#include "debug.h"
#include "support/LOstream.h"
#include "Painter.h"
-void MathNestInset::push_back(unsigned char ch, MathTextCodes fcode)
-{
- if (nargs())
- cells_.back().data_.push_back(ch, fcode);
- else
- lyxerr << "can't push without a cell\n";
-}
-
-
void MathNestInset::push_back(MathInset * p)
{
if (nargs())
void MathNestInset::push_back(MathInset * p)
{
if (nargs())
///
void push_back(MathInset *);
///
///
void push_back(MathInset *);
///
- void push_back(unsigned char ch, MathTextCodes fcode);
- ///
#include "math_inset.h"
#include "math_arrayinset.h"
#include "math_bigopinset.h"
#include "math_inset.h"
#include "math_arrayinset.h"
#include "math_bigopinset.h"
+#include "math_charinset.h"
#include "math_dotsinset.h"
#include "math_decorationinset.h"
#include "math_deliminset.h"
#include "math_dotsinset.h"
#include "math_decorationinset.h"
#include "math_deliminset.h"
case LM_TK_ALPHA:
if (!isspace(yylval.i) || yyvarcode == LM_TC_TEXTRM)
case LM_TK_ALPHA:
if (!isspace(yylval.i) || yyvarcode == LM_TC_TEXTRM)
- array.push_back(yylval.i, yyvarcode);
+ array.push_back(new MathCharInset(yylval.i, yyvarcode));
break;
case LM_TK_ARGUMENT: {
break;
case LM_TK_ARGUMENT: {
- array.push_back(yylval.i, LM_TC_SPECIAL);
+ array.push_back(new MathCharInset(yylval.i, LM_TC_SPECIAL));
- array.push_back(yylval.i, LM_TC_CONST);
+ array.push_back(new MathCharInset(yylval.i, LM_TC_CONST));
if (flags & FLAG_BRACE)
flags &= ~FLAG_BRACE;
else
if (flags & FLAG_BRACE)
flags &= ~FLAG_BRACE;
else
- array.push_back('{', LM_TC_TEX);
+ array.push_back(new MathCharInset('{', LM_TC_TEX));
if (brace == 0 && (flags & FLAG_BRACE_LAST))
flags |= FLAG_LEAVE;
else
if (brace == 0 && (flags & FLAG_BRACE_LAST))
flags |= FLAG_LEAVE;
else
- array.push_back('}', LM_TC_TEX);
+ array.push_back(new MathCharInset('}', LM_TC_TEX));
- array.push_back('[', LM_TC_CONST);
+ array.push_back(new MathCharInset('[', LM_TC_CONST));
break;
case ']':
if (flags & FLAG_BRACK_END)
flags |= FLAG_LEAVE;
else
break;
case ']':
if (flags & FLAG_BRACK_END)
flags |= FLAG_LEAVE;
else
- array.push_back(']', LM_TC_CONST);
+ array.push_back(new MathCharInset(']', LM_TC_CONST));
- array.push_back(yylval.i, LM_TC_BOP);
+ array.push_back(new MathCharInset(yylval.i, LM_TC_BOP));
#include "math_scriptinset.h"
#include "support/LOstream.h"
#include "math_scriptinset.h"
#include "support/LOstream.h"
MathScriptInset::MathScriptInset()
MathScriptInset::MathScriptInset()
dx0_ = (width_ - xcell(0).width()) / 2;
dx1_ = (width_ - xcell(1).width()) / 2;
} else {
dx0_ = (width_ - xcell(0).width()) / 2;
dx1_ = (width_ - xcell(1).width()) / 2;
} else {
+ int asc = 0;
+ int des = 0;
int wid = 0;
mathed_char_height(LM_TC_VAR, st, 'I', asc, des);
if (symbol_) {
int wid = 0;
mathed_char_height(LM_TC_VAR, st, 'I', asc, des);
if (symbol_) {
#endif
#include "math_spaceinset.h"
#endif
#include "math_spaceinset.h"
#include "LColor.h"
#include "Painter.h"
#include "support/LOstream.h"
#include "LColor.h"
#include "Painter.h"
#include "support/LOstream.h"
#include "math_symbolinset.h"
#include "math_symbolinset.h"
-#include "mathed/math_parser.h"
+#include "math_parser.h"
+#include "support.h"
#include "support/LOstream.h"
#include "support/LOstream.h"
#define MATH_SYMBOLINSET_H
#include "math_diminset.h"
#define MATH_SYMBOLINSET_H
#include "math_diminset.h"
#include <iosfwd>
#include "array.h"
#include <iosfwd>
#include "array.h"
#ifdef __GNUG__
#pragma interface
#ifdef __GNUG__
#pragma interface