* do not ignore "requires" field in MathMacro

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 7b5fbe1395f01386e21d6688555884ea869eee97..aa5f01c5768909654d9ed27955b3635dd1619864 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -31,7 +31,7 @@
 #include "Color.h"
 #include "Length.h"
 #include "LyXRC.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
 #include "VSpace.h"
@@ -106,7 +106,7 @@ int numberOfHfills(Paragraph const & par, Row const & row)
 
 } // namespace anon
 
-TextMetrics::TextMetrics(BufferView * bv, LyXText * text)
+TextMetrics::TextMetrics(BufferView * bv, Text * text)
        : bv_(bv), text_(text)
 {
        BOOST_ASSERT(bv_);
@@ -145,7 +145,7 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim)
        BOOST_ASSERT(mi.base.textwidth);
        max_width_ = mi.base.textwidth;
 
-       //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+       //lyxerr << "Text::metrics: width: " << mi.base.textwidth
        //      << " maxWidth: " << max_width_ << "\nfont: " << mi.base.font << endl;
        
        bool changed = false;
@@ -281,7 +281,7 @@ RowMetrics TextMetrics::computeRowMetrics(pit_type const pit,
                result.x = text_->leftMargin(buffer, max_width_, pit, row.pos());
 
        // is there a manual margin with a manual label
-       LyXLayout_ptr const & layout = par.layout();
+       Layout_ptr const & layout = par.layout();
 
        if (layout->margintype == MARGIN_MANUAL
            && layout->labeltype == LABEL_MANUAL) {
@@ -453,7 +453,7 @@ void TextMetrics::rowBreakPoint(int width, pit_type const pit,
                return;
        }
 
-       LyXLayout_ptr const & layout = par.layout();
+       Layout_ptr const & layout = par.layout();
 
        if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
                row.endpos(addressBreakPoint(pos, par));
@@ -606,7 +606,7 @@ void TextMetrics::setHeightOfRow(pit_type const pit,
        // ok, let us initialize the maxasc and maxdesc value.
        // Only the fontsize count. The other properties
        // are taken from the layoutfont. Nicer on the screen :)
-       LyXLayout_ptr const & layout = par.layout();
+       Layout_ptr const & layout = par.layout();
 
        // as max get the first character of this row then it can
        // increase but not decrease the height. Just some point to
@@ -765,7 +765,7 @@ void TextMetrics::setHeightOfRow(pit_type const pit,
 
        // FIXME: the correct way is to do the following is to move the 
        // following code in another method specially tailored for the 
-       // main LyXText. The following test is thus bogus.
+       // main Text. The following test is thus bogus.
        // Top and bottom margin of the document (only at top-level)
        if (main_text_) {
                if (pit == 0 && row.pos() == 0)
@@ -788,7 +788,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
 {
        Buffer const & buffer = *bv_->buffer();
 
-       /// For the main LyXText, it is possible that this pit is not
+       /// For the main Text, it is possible that this pit is not
        /// yet in the CoordCache when moving cursor up.
        /// x Paragraph coordinate is always 0 for main text anyway.
        int const xo = main_text_? 0 : bv_->coordCache().get(text_, pit).x_;
@@ -799,7 +799,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
        pos_type vc = row.pos();
        pos_type end = row.endpos();
        pos_type c = 0;
-       LyXLayout_ptr const & layout = par.layout();
+       Layout_ptr const & layout = par.layout();
 
        bool left_side = false;
 
@@ -934,7 +934,7 @@ pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const
 }
 
 
-//int LyXText::pos2x(pit_type pit, pos_type pos) const
+//int Text::pos2x(pit_type pit, pos_type pos) const
 //{
 //     ParagraphMetrics const & pm = parMetrics(pit);
 //     Row const & r = pm.rows()[row];