Some comments.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 2541e83a7467837d0a9b1470800df65f9752bcb8..44164943c529c6d7e677b7456c4fd58604d861f6 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -19,7 +19,7 @@
 
 #include "Paragraph.h"
 
-#include "BaseClassList.h"
+#include "LayoutFile.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Changes.h"
@@ -49,6 +49,7 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetLabel.h"
 
+#include "support/assert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
@@ -248,8 +249,8 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner)
 
 bool Paragraph::isChanged(pos_type start, pos_type end) const
 {
-       BOOST_ASSERT(start >= 0 && start <= size());
-       BOOST_ASSERT(end > start && end <= size() + 1);
+       LASSERT(start >= 0 && start <= size(), /**/);
+       LASSERT(end > start && end <= size() + 1, /**/);
 
        return d->changes_.isChanged(start, end);
 }
@@ -294,7 +295,7 @@ void Paragraph::setChange(Change const & change)
 
 void Paragraph::setChange(pos_type pos, Change const & change)
 {
-       BOOST_ASSERT(pos >= 0 && pos <= size());
+       LASSERT(pos >= 0 && pos <= size(), /**/);
        d->changes_.set(change, pos);
 
        // see comment in setChange(Change const &) above
@@ -306,7 +307,7 @@ void Paragraph::setChange(pos_type pos, Change const & change)
 
 Change const & Paragraph::lookupChange(pos_type pos) const
 {
-       BOOST_ASSERT(pos >= 0 && pos <= size());
+       LASSERT(pos >= 0 && pos <= size(), /**/);
        return d->changes_.lookup(pos);
 }
 
@@ -314,8 +315,8 @@ Change const & Paragraph::lookupChange(pos_type pos) const
 void Paragraph::acceptChanges(BufferParams const & bparams, pos_type start,
                pos_type end)
 {
-       BOOST_ASSERT(start >= 0 && start <= size());
-       BOOST_ASSERT(end > start && end <= size() + 1);
+       LASSERT(start >= 0 && start <= size(), /**/);
+       LASSERT(end > start && end <= size() + 1, /**/);
 
        for (pos_type pos = start; pos < end; ++pos) {
                switch (lookupChange(pos).type) {
@@ -350,8 +351,8 @@ void Paragraph::acceptChanges(BufferParams const & bparams, pos_type start,
 void Paragraph::rejectChanges(BufferParams const & bparams,
                pos_type start, pos_type end)
 {
-       BOOST_ASSERT(start >= 0 && start <= size());
-       BOOST_ASSERT(end > start && end <= size() + 1);
+       LASSERT(start >= 0 && start <= size(), /**/);
+       LASSERT(end > start && end <= size() + 1, /**/);
 
        for (pos_type pos = start; pos < end; ++pos) {
                switch (lookupChange(pos).type) {
@@ -386,7 +387,7 @@ void Paragraph::rejectChanges(BufferParams const & bparams,
 void Paragraph::Private::insertChar(pos_type pos, char_type c,
                Change const & change)
 {
-       BOOST_ASSERT(pos >= 0 && pos <= int(text_.size()));
+       LASSERT(pos >= 0 && pos <= int(text_.size()), /**/);
 
        // track change
        changes_.insert(change, pos);
@@ -412,11 +413,11 @@ void Paragraph::Private::insertChar(pos_type pos, char_type c,
 void Paragraph::insertInset(pos_type pos, Inset * inset,
                                   Change const & change)
 {
-       BOOST_ASSERT(inset);
-       BOOST_ASSERT(pos >= 0 && pos <= size());
+       LASSERT(inset, /**/);
+       LASSERT(pos >= 0 && pos <= size(), /**/);
 
        d->insertChar(pos, META_INSET, change);
-       BOOST_ASSERT(d->text_[pos] == META_INSET);
+       LASSERT(d->text_[pos] == META_INSET, /**/);
 
        // Add a new entry in the insetlist_.
        d->insetlist_.insert(inset, pos);
@@ -425,7 +426,7 @@ void Paragraph::insertInset(pos_type pos, Inset * inset,
 
 bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
 {
-       BOOST_ASSERT(pos >= 0 && pos <= size());
+       LASSERT(pos >= 0 && pos <= size(), /**/);
 
        // keep the logic here in sync with the logic of isMergedOnEndOfParDeletion()
 
@@ -474,8 +475,8 @@ bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
 
 int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
 {
-       BOOST_ASSERT(start >= 0 && start <= size());
-       BOOST_ASSERT(end >= start && end <= size() + 1);
+       LASSERT(start >= 0 && start <= size(), /**/);
+       LASSERT(end >= start && end <= size() + 1, /**/);
 
        pos_type i = start;
        for (pos_type count = end - start; count; --count) {
@@ -647,7 +648,7 @@ void Paragraph::Private::latexInset(
                                             unsigned int & column)
 {
        Inset * inset = owner_->getInset(i);
-       BOOST_ASSERT(inset);
+       LASSERT(inset, /**/);
 
        if (style.pass_thru) {
                inset->plaintext(os, runparams);
@@ -1162,8 +1163,7 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
                        if (c != '\0')
                                os << to_utf8(docstring(1, c));
                        else
-                               lyxerr << "ERROR (Paragraph::writeFile):"
-                                       " NULL char in structure." << endl;
+                               LYXERR0("NUL char in structure.");
                        ++column;
                        break;
                }
@@ -1273,8 +1273,8 @@ Font const Paragraph::getFontSettings(BufferParams const & bparams,
                                         pos_type pos) const
 {
        if (pos > size()) {
-               lyxerr << " pos: " << pos << " size: " << size() << endl;
-               BOOST_ASSERT(pos <= size());
+               LYXERR0("pos: " << pos << " size: " << size());
+               LASSERT(pos <= size(), /**/);
        }
 
        FontList::const_iterator cit = d->fontlist_.fontIterator(pos);
@@ -1290,7 +1290,7 @@ Font const Paragraph::getFontSettings(BufferParams const & bparams,
 
 FontSpan Paragraph::fontSpan(pos_type pos) const
 {
-       BOOST_ASSERT(pos <= size());
+       LASSERT(pos <= size(), /**/);
        pos_type start = 0;
 
        FontList::const_iterator cit = d->fontlist_.begin();
@@ -1309,8 +1309,7 @@ FontSpan Paragraph::fontSpan(pos_type pos) const
        }
 
        // This should not happen, but if so, we take no chances.
-       //lyxerr << "Paragraph::getEndPosOfFontSpan: This should not happen!"
-       //      << endl;
+       // LYXERR0("Paragraph::getEndPosOfFontSpan: This should not happen!");
        return FontSpan(pos, pos);
 }
 
@@ -1333,7 +1332,7 @@ Font const Paragraph::getFirstFontSettings(BufferParams const & bparams) const
 Font const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
                                 Font const & outerfont) const
 {
-       BOOST_ASSERT(pos >= 0);
+       LASSERT(pos >= 0, /**/);
 
        Font font = getFontSettings(bparams, pos);
 
@@ -1378,8 +1377,7 @@ FontSize Paragraph::highestFontInRange
 }
 
 
-char_type
-Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
+char_type Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 {
        char_type c = d->text_[pos];
        if (!lyxrc.rtl_support)
@@ -1414,14 +1412,13 @@ Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
        }
        if (uc != c && getFontSettings(bparams, pos).isRightToLeft())
                return uc;
-       else
-               return c;
+       return c;
 }
 
 
 void Paragraph::setFont(pos_type pos, Font const & font)
 {
-       BOOST_ASSERT(pos <= size());
+       LASSERT(pos <= size(), /**/);
 
        // First, reduce font against layout/label font
        // Update: The setCharFont() routine in text2.cpp already
@@ -1616,19 +1613,28 @@ void Paragraph::setBeginOfBody()
 
 bool Paragraph::forceEmptyLayout() const
 {
-       return inInset() && inInset()->forceEmptyLayout();
+       Inset const * const inset = inInset();
+       if (!inset)
+               return true;
+       return inset->forceEmptyLayout();
 }
 
 
 bool Paragraph::allowParagraphCustomization() const
 {
-       return inInset() && inInset()->allowParagraphCustomization(0);
+       Inset const * const inset = inInset();
+       if (!inset)
+               return true;
+       return inset->allowParagraphCustomization();
 }
 
 
 bool Paragraph::useEmptyLayout() const
 {
-       return inInset() && inInset()->useEmptyLayout();
+       Inset const * const inset = inInset();
+       if (!inset)
+               return false;
+       return inset->useEmptyLayout();
 }
 
 
@@ -2216,7 +2222,8 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 bool Paragraph::isHfill(pos_type pos) const
 {
        Inset const * inset = getInset(pos);
-       return inset && inset->lyxCode() == HFILL_CODE;
+       return inset && (inset->lyxCode() == SPACE_CODE &&
+                        inset->isStretchableSpace());
 }
 
 
@@ -2396,7 +2403,7 @@ bool Paragraph::allowEmpty() const
 
 char_type Paragraph::transformChar(char_type c, pos_type pos) const
 {
-       if (!Encodings::is_arabic(c))
+       if (!Encodings::isArabicChar(c))
                return c;
 
        char_type prev_char = ' ';
@@ -2404,7 +2411,7 @@ char_type Paragraph::transformChar(char_type c, pos_type pos) const
 
        for (pos_type i = pos - 1; i >= 0; --i) {
                char_type const par_char = d->text_[i];
-               if (!Encodings::isComposeChar_arabic(par_char)) {
+               if (!Encodings::isArabicComposeChar(par_char)) {
                        prev_char = par_char;
                        break;
                }
@@ -2412,21 +2419,21 @@ char_type Paragraph::transformChar(char_type c, pos_type pos) const
 
        for (pos_type i = pos + 1, end = size(); i < end; ++i) {
                char_type const par_char = d->text_[i];
-               if (!Encodings::isComposeChar_arabic(par_char)) {
+               if (!Encodings::isArabicComposeChar(par_char)) {
                        next_char = par_char;
                        break;
                }
        }
 
-       if (Encodings::is_arabic(next_char)) {
-               if (Encodings::is_arabic(prev_char) &&
-                       !Encodings::is_arabic_special(prev_char))
+       if (Encodings::isArabicChar(next_char)) {
+               if (Encodings::isArabicChar(prev_char) &&
+                       !Encodings::isArabicSpecialChar(prev_char))
                        return Encodings::transformChar(c, Encodings::FORM_MEDIAL);
                else
                        return Encodings::transformChar(c, Encodings::FORM_INITIAL);
        } else {
-               if (Encodings::is_arabic(prev_char) &&
-                       !Encodings::is_arabic_special(prev_char))
+               if (Encodings::isArabicChar(prev_char) &&
+                       !Encodings::isArabicSpecialChar(prev_char))
                        return Encodings::transformChar(c, Encodings::FORM_FINAL);
                else
                        return Encodings::transformChar(c, Encodings::FORM_ISOLATED);
@@ -2742,7 +2749,7 @@ void Paragraph::registerWords()
 
 void Paragraph::updateWords(CursorSlice const & sl)
 {
-       BOOST_ASSERT(&sl.paragraph() == this);
+       LASSERT(&sl.paragraph() == this, /**/);
        deregisterWords();
        collectWords(sl);
        registerWords();