Change the "empty layout" to the "plain layout", to try to avoid confusion.

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index b249f01d9bf0baa1359a891d0355f71bc9a0f2c1..801642e52576bfe9a78922797944d0d0f1f2200c 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -42,6 +42,7 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetOptArg.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
@@ -136,7 +137,7 @@ void ParagraphMetrics::setInsetDimension(Inset const * inset,
 
 Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 {
-       BOOST_ASSERT(!rows().empty());
+       LASSERT(!rows().empty(), /**/);
 
        // If boundary is set we should return the row on which
        // the character before is inside.
@@ -155,7 +156,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
-       BOOST_ASSERT(!rows().empty());
+       LASSERT(!rows().empty(), /**/);
 
        // If boundary is set we should return the row on which
        // the character before is inside.
@@ -174,7 +175,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 
 size_t ParagraphMetrics::pos2row(pos_type pos) const
 {
-       BOOST_ASSERT(!rows().empty());
+       LASSERT(!rows().empty(), /**/);
 
        RowList::const_iterator rit = rows_.end();
        RowList::const_iterator const begin = rows_.begin();
@@ -198,12 +199,12 @@ void ParagraphMetrics::dump() const
 int ParagraphMetrics::rightMargin(BufferView const & bv) const
 {
        BufferParams const & params = bv.buffer().params();
-       TextClass const & tclass = params.textClass();
+       DocumentClass const & tclass = params.documentClass();
        frontend::FontMetrics const & fm = theFontMetrics(params.getFont());
        int const r_margin =
                bv.rightMargin()
                + fm.signedWidth(tclass.rightmargin())
-               + fm.signedWidth(par_->layout()->rightmargin)
+               + fm.signedWidth(par_->layout().rightmargin)
                * 4 / (par_->getDepth() + 4);
 
        return r_margin;
@@ -226,11 +227,11 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
                if (language->lang() == "arabic_arabtex" ||
                        language->lang() == "arabic_arabi" ||
                        language->lang() == "farsi") {
-                               if (Encodings::isComposeChar_arabic(c))
+                               if (Encodings::isArabicComposeChar(c))
                                        return 0;
                                c = par_->transformChar(c, pos);
                } else if (language->lang() == "hebrew" &&
-                               Encodings::isComposeChar_hebrew(c)) {
+                               Encodings::isHebrewComposeChar(c)) {
                        return 0;       
                }
        }
@@ -243,7 +244,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        if (!par_->isHfill(pos))
                return false;
 
-       BOOST_ASSERT(pos >= row.pos() && pos < row.endpos());
+       LASSERT(pos >= row.pos() && pos < row.endpos(), /**/);
 
        // expand at the end of a row only if there is another hfill on the same row
        if (pos == row.endpos() - 1) {
@@ -260,7 +261,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        }
 
        // do not expand in some labels
-       if (par_->layout()->margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
+       if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
                return false;
 
        // if there is anything between the first char of the row and