#include "math_arrayinset.h"
#include "math_parser.h"
#include "math_mathmlstream.h"
+#include "math_metricsinfo.h"
#include "math_streamstr.h"
#include "Lsstream.h"
{
vector< vector<string> > dat;
istringstream is(str.c_str());
- while (is) {
- string line;
- getline(is, line);
+ string line;
+ while (getline(is, line)) {
istringstream ls(line.c_str());
typedef istream_iterator<string> iter;
vector<string> v = vector<string>(iter(ls), iter());
for (col_type col = 1; col < dat[0].size(); ++col)
addCol(0);
for (row_type row = 0; row < dat.size(); ++row)
- for (col_type col = 0; col < dat[row].size(); ++col)
+ for (col_type col = 0; col < dat[0].size(); ++col)
mathed_parse_cell(cell(index(row, col)), dat[row][col]);
}
}
-void MathArrayInset::metrics(MathMetricsInfo const & st) const
+void MathArrayInset::metrics(MathMetricsInfo & mi) const
{
- MathMetricsInfo mi = st;
- if (mi.style == LM_ST_DISPLAY)
- mi.style = LM_ST_TEXT;
+ MathArrayChanger dummy(mi.base);
MathGridInset::metrics(mi);
}
+void MathArrayInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+ MathArrayChanger dummy(pi.base);
+ MathGridInset::draw(pi, x, y);
+}
+
+
void MathArrayInset::write(WriteStream & os) const
{
if (os.fragile())
os << "\\protect";
- os << "\\begin{" << name_ << "}";
+ os << "\\begin{" << name_ << '}';
if (v_align_ == 't' || v_align_ == 'b')
os << '[' << char(v_align_) << ']';
if (os.fragile())
os << "\\protect";
- os << "\\end{" << name_ << "}\n";
+ os << "\\end{" << name_ << '}';
+ // adding a \n here is bad if the array is the last item
+ // in an \eqnarray...
}
void MathArrayInset::normalize(NormalStream & os) const
{
- os << "[" << name_ << " ";
+ os << '[' << name_ << ' ';
MathGridInset::normalize(os);
- os << "]";
+ os << ']';
}
{
os << "array(";
MathGridInset::maplize(os);
- os << ")";
+ os << ')';
}