Jean-Marc's fix for wrong descent

[lyx.git] / src / mathed / math_parboxinset.C

diff --git a/src/mathed/math_parboxinset.C b/src/mathed/math_parboxinset.C
index 93ebf416660c62e4a1d5f567d30deafd3f028c20..5a4ad25dd64baa0b5f94c2fbd27e067f9c5c2cfc 100644 (file)
--- a/src/mathed/math_parboxinset.C
+++ b/src/mathed/math_parboxinset.C
@@ -7,8 +7,7 @@
 
 
 MathParboxInset::MathParboxInset()
-       : MathNestInset(1), lyx_width_(0), tex_width_("0mm"),
-         position_('c')
+       : lyx_width_(0), tex_width_("0mm"), position_('c')
 {
        lyxerr << "constructing MathParboxInset\n";
 }
@@ -36,92 +35,18 @@ void MathParboxInset::setWidth(string const & w)
 
 void MathParboxInset::metrics(MathMetricsInfo & mi) const
 {
-       MathFontSetChanger dummy(mi.base, "textnormal");
-
-       // we do our own metrics fiddling
-       // delete old cache
-       rows_.clear();
-
-#if 1
-
-       xcell(0).metrics(mi);
-       width_ = xcell(0).width();
-       ascent_ = xcell(0).ascent();
-       descent_ = xcell(0).descent();
-
-#else
-
-       xcell(0).metricsExternal(mi, rows_);
-
-       int spaces = 0;
-       Dimension safe(0, 0, 0);
-       Dimension curr(0, 0, 0);
-       int safepos = 0;
-       int yo = 0;
-       for (size_type i = 0, n = cell(0).size(); i != n; ++i) {
-               // Special handling of spaces. We reached a safe position for breaking.
-               if (cell(0)[i]->getChar() == ' ') {
-                       safe += curr;
-                       safepos = i + 1;
-                       ++spaces;
-                       // restart chunk
-                       curr = Dimension(0, 0, 0);
-                       continue;
-               }
-
-               // This is a regular item. Go on if we either don't care for
-               // the width limit or have not reached that limit.
-               curr += rows_[i].dim;
-               if (curr.w + safe.w <= lyx_width_) 
-                       continue;
-
-               // We passed the limit. Create a row entry.
-               MathXArray::Row row;
-               if (spaces) {
-                       // but we had a space break before this position.
-                       row.dim  = safe;
-                       row.glue = (lyx_width_ - safe.w) / spaces;
-                       row.end  = safepos;
-                       i        = safepos;
-                       spaces   = 0;
-               } else {
-                       // This item is too large and it is the only one.
-                       // We have no choice but to produce an overfull box.
-                       row.dim  = curr;   // safe should be 0.
-                       row.glue = 0;      // does not matter
-                       row.end  = i + 1;
-               }
-               yo      += rows_[i].dim.height();
-               row.yo   = yo;
-               rows_.push_back(row);
-       }
-       // last row:
-       MathXArray::Row row;
-       row.dim  = safe;
-       row.dim += curr;
-       row.end  = cell(0).size();
-       row.glue = spaces ? (lyx_width_ - row.dim.w) / spaces : 0;
-       yo      += row.dim.height();
-       row.yo   = yo;
-       rows_.push_back(row);
-
-       // what to report?
-       ascent_  = xcell(0).ascent();
-       descent_ = xcell(0).descent() + 1;
-       width_   = xcell(0).width()   + 2;
-#endif
+       MathFontSetChanger dummy1(mi.base, "textnormal");
+       MathWidthChanger dummy2(mi.base, lyx_width_);
+       MathTextInset::metrics(mi);
+       metricsMarkers2();
 }
 
 
 void MathParboxInset::draw(MathPainterInfo & pi, int x, int y) const
 {
        MathFontSetChanger dummy(pi.base, "textnormal");
-#if 1
-       xcell(0).draw(pi, x + 1, y);
-#else
-       xcell(0).drawExternal(pi, x + 1, y, rows_);
-#endif
-       drawMarkers(pi, x, y);
+       MathTextInset::draw(pi, x + 1, y);
+       drawMarkers2(pi, x, y);
 }
 
 
@@ -136,6 +61,5 @@ void MathParboxInset::write(WriteStream & os) const
 
 void MathParboxInset::infoize(std::ostream & os) const
 {
-       os << "Box: Parbox " << tex_width_ << ' ';
+       os << "Box: Parbox " << tex_width_;
 }
-