Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 9d6404dbe6047f829d2b66562120f023d6bbb981..36d850b1d9f867d9bee153852a94d03fb47cf189 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -24,8 +24,8 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "debug.h"
-#include "gettext.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"
@@ -35,6 +35,7 @@
 #include "OutputParams.h"
 #include "paragraph_funcs.h"
 #include "sgml.h"
+#include "TextClass.h"
 #include "TexRow.h"
 #include "VSpace.h"
 
@@ -56,21 +57,11 @@
 #include <stack>
 #include <sstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using lyx::support::contains;
-using lyx::support::rsplit;
-using support::subst;
-
-using std::distance;
-using std::endl;
-using std::list;
-using std::stack;
-using std::string;
-using std::ostream;
-using std::ostringstream;
-
 
 ParagraphMetrics::ParagraphMetrics(Paragraph const & par): position_(-1), par_(&par)
 {
@@ -96,20 +87,27 @@ void ParagraphMetrics::reset(Paragraph const & par)
 }
 
 
-void ParagraphMetrics::computeRowSignature(Row & row,
-               BufferParams const & bparams)
+size_t ParagraphMetrics::computeRowSignature(Row const & row,
+               BufferParams const & bparams) 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, 1);
+               crc.process_bytes(b, sizeof(char_type));
                if (bparams.trackChanges) {
                        Change change = par_->lookupChange(i);
                        char_type const b[] = { change.type };
+                       // 1 byte is enough to encode Change::Type
                        crc.process_bytes(b, 1);
                }                       
        }
-       row.setCrc(crc.checksum());
+
+       Dimension const & d = row.dimension();
+       char_type const b[] = { row.sel_beg, row.sel_end, d.wid, d.asc, d.des};
+       // Each of the variable to process is 4 bytes: 4x5 = 20
+       crc.process_bytes(b, 20);
+
+       return crc.checksum();
 }