perhaps fix for g++3.0 compile problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2486
a592a061-630c-0410-9148-
cb99ea01b6c8
if (row == nrows() - 1)
return "";
if (row == nrows() - 1)
return "";
- if (rowinfo_[row].skip_ != LyXLength())
+ if (rowinfo_[row].skip_.value() != 0)
return "\\\\[" + rowinfo_[row].skip_.asLatexString() + "]\n";
// make sure an upcoming '[' does not break anything
return "\\\\[" + rowinfo_[row].skip_.asLatexString() + "]\n";
// make sure an upcoming '[' does not break anything
for (int row = 0; row < nrows(); ++row) {
for (int col = 0; col < ncols(); ++col) {
for (int row = 0; row < nrows(); ++row) {
for (int col = 0; col < ncols(); ++col) {
cell(index(row, col)).write(os, fragile);
cell(index(row, col)).write(os, fragile);
}
if (n) {
if (!label_[row].empty())
}
if (n) {
if (!label_[row].empty())
#endif
#include "math_sizeinset.h"
#endif
#include "math_sizeinset.h"
+#include "math_parser.h"
#include "support/LOstream.h"
#include "support/LOstream.h"
-MathSizeInset::MathSizeInset(MathStyles st)
- : MathNestInset(1), style_(st)
+MathSizeInset::MathSizeInset(latexkeys const * l)
+ : MathNestInset(1), key_(l)
-char const * MathSizeInset::name() const
-{
- switch (style_) {
- case LM_ST_DISPLAY:
- return "displaystyle";
- case LM_ST_TEXT:
- return "textstyle";
- case LM_ST_SCRIPT:
- return "scriptstyle";
- case LM_ST_SCRIPTSCRIPT:
- return "scriptscriptstyle";
- }
- return "unknownstyle";
-}
-
-
MathInset * MathSizeInset::clone() const
{
return new MathSizeInset(*this);
MathInset * MathSizeInset::clone() const
{
return new MathSizeInset(*this);
void MathSizeInset::metrics(MathStyles /* st */) const
{
void MathSizeInset::metrics(MathStyles /* st */) const
{
- xcell(0).metrics(style_);
+ xcell(0).metrics(MathStyles(key_->id));
ascent_ = xcell(0).ascent_;
descent_ = xcell(0).descent_;
width_ = xcell(0).width_;
ascent_ = xcell(0).ascent_;
descent_ = xcell(0).descent_;
width_ = xcell(0).width_;
void MathSizeInset::write(std::ostream & os, bool fragile) const
{
void MathSizeInset::write(std::ostream & os, bool fragile) const
{
- os << "{\\" << name() << " ";
+ os << "{\\" << key_->name << " ";
cell(0).write(os, fragile);
os << "}";
}
cell(0).write(os, fragile);
os << "}";
}
void MathSizeInset::writeNormal(std::ostream & os) const
{
void MathSizeInset::writeNormal(std::ostream & os) const
{
- os << "[" << name() << " ";
+ os << "[" << key_->name << " ";
cell(0).writeNormal(os);
os << "]";
}
cell(0).writeNormal(os);
os << "]";
}
#endif
/** An inset for \scriptsize etc
#endif
/** An inset for \scriptsize etc
class MathSizeInset : public MathNestInset {
public:
///
class MathSizeInset : public MathNestInset {
public:
///
- explicit MathSizeInset(MathStyles st);
+ explicit MathSizeInset(latexkeys const * l);
///
MathInset * clone() const;
///
///
MathInset * clone() const;
///
void writeNormal(std::ostream &) const;
private:
void writeNormal(std::ostream &) const;
private:
- ///
- char const * name() const;
+ latexkeys const * key_;