adjust

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 0fd4838d2563d8d7fbc3c12b87436985627e2398..6b889083086f6414e4b80e1fdc9d805f4ed4248c 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -28,6 +28,7 @@
 #include "gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
+#include "Layout.h"
 #include "Font.h"
 #include "LyXRC.h"
 #include "Row.h"
@@ -71,7 +72,7 @@ using std::ostream;
 using std::ostringstream;
 
 
-ParagraphMetrics::ParagraphMetrics(Paragraph const & par): par_(&par)
+ParagraphMetrics::ParagraphMetrics(Paragraph const & par): position_(-1), par_(&par)
 {
 }
 
@@ -82,6 +83,7 @@ ParagraphMetrics & ParagraphMetrics::operator=(
        rows_ = pm.rows_;
        dim_ = pm.dim_;
        par_ = pm.par_;
+       position_ = pm.position_;
        return *this;
 }
 
@@ -90,11 +92,11 @@ void ParagraphMetrics::reset(Paragraph const & par)
 {
        par_ = ∥
        dim_ = Dimension();
-       rows_.clear();
+       //position_ = -1;
 }
 
 
-size_type ParagraphMetrics::calculateRowSignature(Row const & row,
+void ParagraphMetrics::computeRowSignature(Row & row,
                BufferParams const & bparams)
 {
        boost::crc_32_type crc;
@@ -107,22 +109,31 @@ size_type ParagraphMetrics::calculateRowSignature(Row const & row,
                        crc.process_bytes(b, 1);
                }                       
        }
-       return crc.checksum();
+       row.setCrc(crc.checksum());
 }
 
 
-void ParagraphMetrics::updateRowChangeStatus(BufferParams const & bparams)
+void ParagraphMetrics::setPosition(int position)
 {
-       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;
-       }
+       position_ = position;
+}
+
+
+Dimension const & ParagraphMetrics::insetDimension(Inset const * inset) const
+{
+       InsetDims::const_iterator it = inset_dims_.find(inset);
+       if (it != inset_dims_.end())
+               return it->second;
+
+       static Dimension dummy;
+       return dummy;
+}
+
+
+void ParagraphMetrics::setInsetDimension(Inset const * inset,
+               Dimension const & dim)
+{
+       inset_dims_[inset] = dim;
 }
 
 
@@ -208,7 +219,7 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 
        // The most special cases are handled first.
        if (c == Paragraph::META_INSET)
-               return par_->getInset(pos)->width();
+               return insetDimension(par_->getInset(pos)).wid;
 
        if (!isPrintable(c))
                return theFontMetrics(font).width(c);
@@ -229,4 +240,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