Account for old versions of Pygments

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 97170bb96ab863623bd10390d7d017eb9cd61122..01db6cb934b0be5c019ab2998300e84b5b56178a 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -47,7 +47,6 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include "support/bind.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -86,25 +85,36 @@ void ParagraphMetrics::reset(Paragraph const & par)
 
 
 size_t ParagraphMetrics::computeRowSignature(Row const & row,
-               BufferParams const & bparams) const
+               BufferView const & bv) const
 {
        boost::crc_32_type crc;
        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.track_changes) {
+               if (par_->isInset(i)) {
+                       Inset const * in = par_->getInset(i);
+                       Dimension const d = in->dimension(bv);
+                       int const b[] = { d.wid, d.asc, d.des };
+                       crc.process_bytes(b, sizeof(b));
+               } else {
+                       char_type const b[] = { par_->getChar(i) };
+                       crc.process_bytes(b, sizeof(char_type));
+               }
+               if (bv.buffer().params().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
                        crc.process_bytes(b, 1);
-               }                       
+               }
        }
 
+       pos_type const b1[] = { row.sel_beg, row.sel_end };
+       crc.process_bytes(b1, sizeof(b1));
+
        Dimension const & d = row.dimension();
-       char_type const b[] = { static_cast<char_type>(row.sel_beg),
-                               static_cast<char_type>(row.sel_end),
-               row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des};
-       crc.process_bytes(b, sizeof(b));
+       int const b2[] = { row.begin_margin_sel,
+                          row.end_margin_sel,
+                          d.wid, d.asc, d.des };
+       crc.process_bytes(b2, sizeof(b2));
+       crc.process_bytes(&row.separator, sizeof(row.separator));
 
        return crc.checksum();
 }
@@ -116,24 +126,6 @@ void ParagraphMetrics::setPosition(int 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;
-}
-
-
 Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 {
        LBUFERR(!rows().empty());
@@ -209,25 +201,7 @@ int ParagraphMetrics::rightMargin(BufferView const & bv) const
 }
 
 
-int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
-{
-       // The most special cases are handled first.
-       if (Inset const * inset = par_->getInset(pos))
-               return insetDimension(inset).wid;
-
-       char_type const c = par_->getChar(pos);
-
-       if (c == '\t')
-               return 4 * theFontMetrics(font).width(' ');
-
-       // Note that this function is only called in
-       // RowPainter::paintText, and only used for characters that do
-       // not require handling of compose chars or ligatures. It can
-       // therefore be kept simple.
-       return theFontMetrics(font).width(c);
-}
-
-
+// FIXME: this code seems bogus. Audit and rewrite (see bug #9860).
 bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
 {
        if (!par_->isHfill(pos))