Amend 6c3447c8: FindAdv: sometimes a space is added on some math symbols

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 5a15158a76290b496c444763a6234c2d7229216a..e1284b0e80b81c6daced3d87cf0dcb23b318621b 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -22,37 +22,17 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "Counters.h"
-#include "Encoding.h"
-#include "Language.h"
-#include "LaTeXFeatures.h"
-#include "Layout.h"
 #include "Font.h"
-#include "LyXRC.h"
-#include "Row.h"
-#include "OutputParams.h"
-#include "sgml.h"
+#include "Layout.h"
+#include "LayoutEnums.h"
+#include "Paragraph.h"
 #include "TextClass.h"
-#include "TexRow.h"
 
 #include "frontends/FontMetrics.h"
 
-#include "insets/InsetBibitem.h"
-#include "insets/InsetArgument.h"
-
 #include "support/lassert.h"
 #include "support/debug.h"
-#include "support/ExceptionMessage.h"
-#include "support/gettext.h"
-#include "support/lstrings.h"
-#include "support/textutils.h"
 
-#include "support/bind.h"
-#include <boost/crc.hpp>
-
-#include <algorithm>
-#include <list>
-#include <stack>
 #include <sstream>
 
 using namespace std;
@@ -60,9 +40,10 @@ using namespace lyx::support;
 
 namespace lyx {
 
+const int pm_npos = -10000;
 
 ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
-       position_(-1), par_(&par)
+       position_(pm_npos), id_(par.id()), par_(&par)
 {}
 
 
@@ -81,36 +62,14 @@ void ParagraphMetrics::reset(Paragraph const & par)
 {
        par_ = &par;
        dim_ = Dimension();
-       //position_ = -1;
+       //position_ = pm_npos;
 }
 
 
-size_t ParagraphMetrics::computeRowSignature(Row const & row,
-               BufferParams const & bparams) const
+int ParagraphMetrics::position() 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) {
-                       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 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();
+       LASSERT(hasPosition(), return pm_npos);
+       return position_;
 }
 
 
@@ -120,22 +79,15 @@ void ParagraphMetrics::setPosition(int position)
 }
 
 
-Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
+void ParagraphMetrics::resetPosition()
 {
-       LBUFERR(!rows().empty());
-
-       // If boundary is set we should return the row on which
-       // the character before is inside.
-       if (pos > 0 && boundary)
-               --pos;
-
-       RowList::iterator rit = rows_.end();
-       RowList::iterator const begin = rows_.begin();
+       position_ = pm_npos;
+}
 
-       for (--rit; rit != begin && rit->pos() > pos; --rit)
-               ;
 
-       return *rit;
+bool ParagraphMetrics::hasPosition() const
+{
+       return position_ != pm_npos;
 }