Convert cursorX() and computeRowMetrics() to the new scheme

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index e6541fdb0b3090958fe89c035d9eb05b93cb98a1..93b0461161e4513e02ae4961093a42592bdc6e6d 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -42,6 +42,7 @@
 
 #include "support/lassert.h"
 #include "support/debug.h"
+#include "support/ExceptionMessage.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
@@ -91,7 +92,7 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
        for (pos_type i = row.pos(); i < row.endpos(); ++i) {
                char_type const b[] = { par_->getChar(i) };
                crc.process_bytes(b, sizeof(char_type));
-               if (bparams.trackChanges) {
+               if (bparams.track_changes) {
                        Change change = par_->lookupChange(i);
                        char_type const b[] = { static_cast<char_type>(change.type) };
                        // 1 byte is enough to encode Change::Type
@@ -135,7 +136,7 @@ void ParagraphMetrics::setInsetDimension(Inset const * inset,
 
 Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 {
-       LASSERT(!rows().empty(), /**/);
+       LBUFERR(!rows().empty());
 
        // If boundary is set we should return the row on which
        // the character before is inside.
@@ -154,7 +155,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
-       LASSERT(!rows().empty(), /**/);
+       LBUFERR(!rows().empty());
 
        // If boundary is set we should return the row on which
        // the character before is inside.
@@ -173,7 +174,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 
 size_t ParagraphMetrics::pos2row(pos_type pos) const
 {
-       LASSERT(!rows().empty(), /**/);
+       LBUFERR(!rows().empty());
 
        RowList::const_iterator rit = rows_.end();
        RowList::const_iterator const begin = rows_.begin();
@@ -189,8 +190,7 @@ void ParagraphMetrics::dump() const
 {
        lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
        for (size_t i = 0; i != rows_.size(); ++i) {
-               lyxerr << "  row " << i << ":   ";
-               rows_[i].dump();
+               lyxerr << "  row " << i << ":   " << rows_[i];
        }
 }
 
@@ -245,7 +245,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        if (!par_->isHfill(pos))
                return false;
 
-       LASSERT(pos >= row.pos() && pos < row.endpos(), /**/);
+       LASSERT(pos >= row.pos() && pos < row.endpos(), return false);
 
        // expand at the end of a row only if there is another hfill on the same row
        if (pos == row.endpos() - 1) {
@@ -268,7 +268,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        // the specified position that is neither a newline nor an hfill,
        // the hfill will be expanded, otherwise it won't
        for (pos_type i = row.pos(); i < pos; i++) {
-               if (!par_->isNewline(i) && !par_->isHfill(i))
+               if (!par_->isNewline(i) && !par_->isEnvSeparator(i) && !par_->isHfill(i))
                        return true;
        }
        return false;