Transfer Paragraph::hfillExpansion() to ParagraphMetrics. This also reduce the depend...

[features.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 0fd4838d2563d8d7fbc3c12b87436985627e2398..d9272f225501213a6fa82e9d5cd3bc648bce8e0b 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -90,11 +90,10 @@ void ParagraphMetrics::reset(Paragraph const & par)
 {
        par_ = ∥
        dim_ = Dimension();
-       rows_.clear();
 }
 
 
-size_type ParagraphMetrics::calculateRowSignature(Row const & row,
+void ParagraphMetrics::computeRowSignature(Row & row,
                BufferParams const & bparams)
 {
        boost::crc_32_type crc;
@@ -107,22 +106,7 @@ size_type ParagraphMetrics::calculateRowSignature(Row const & row,
                        crc.process_bytes(b, 1);
                }                       
        }
-       return crc.checksum();
-}
-
-
-void ParagraphMetrics::updateRowChangeStatus(BufferParams const & bparams)
-{
-       size_t const size = rows_.size();
-       row_change_status_.resize(size);
-       row_signature_.resize(size);
-
-       for (size_t i = 0; i != size; ++i) {
-               // Row signature; has row changed since last update?
-               size_type const row_sig = calculateRowSignature(rows_[i], bparams);
-               row_change_status_[i] = row_signature_[i] != row_sig;
-               row_signature_[i] = row_sig;
-       }
+       row.setCrc(crc.checksum());
 }
 
 
@@ -229,4 +213,39 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 }
 
 
+bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
+{
+       if (!par_->isHfill(pos))
+               return false;
+
+       BOOST_ASSERT(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) {
+               for (pos_type i = row.pos(); i < pos; i++) {
+                       if (par_->isHfill(i))
+                               return true;
+               }
+               return false;
+       }
+
+       // expand at the beginning of a row only if it is the first row of a paragraph
+       if (pos == row.pos()) {
+               return pos == 0;
+       }
+
+       // do not expand in some labels
+       if (par_->layout()->margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
+               return false;
+
+       // if there is anything between the first char of the row and
+       // 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))
+                       return true;
+       }
+       return false;
+}
+
 } // namespace lyx