even example code should follow the style conventions

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 701e6742334731e7d575861d9e6972200c4f5419..fc71943377ce0f76c7d9140e50ecec7bfaa22a12 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -24,16 +24,16 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "debug.h"
-#include "gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
+#include "Layout.h"
 #include "Font.h"
 #include "LyXRC.h"
 #include "Row.h"
 #include "OutputParams.h"
 #include "paragraph_funcs.h"
 #include "sgml.h"
+#include "TextClass.h"
 #include "TexRow.h"
 #include "VSpace.h"
 
@@ -42,10 +42,11 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetOptArg.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/convert.h"
-#include "support/unicode.h"
 
 #include <boost/bind.hpp>
 #include <boost/crc.hpp>
@@ -55,25 +56,15 @@
 #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)
-{
-}
+ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
+       position_(-1), par_(&par)
+{}
 
 
 ParagraphMetrics & ParagraphMetrics::operator=(
@@ -95,20 +86,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();
 }
 
 
@@ -118,6 +116,24 @@ 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)
 {
        BOOST_ASSERT(!rows().empty());
@@ -179,15 +195,15 @@ void ParagraphMetrics::dump() const
        }
 }
 
-int ParagraphMetrics::rightMargin(Buffer const & buffer) const
+int ParagraphMetrics::rightMargin(BufferView const & bv) const
 {
-       BufferParams const & params = buffer.params();
-       TextClass const & tclass = params.getTextClass();
+       BufferParams const & params = bv.buffer().params();
+       DocumentClass const & tclass = params.documentClass();
        frontend::FontMetrics const & fm = theFontMetrics(params.getFont());
        int const r_margin =
-               lyx::rightMargin()
+               bv.rightMargin()
                + fm.signedWidth(tclass.rightmargin())
-               + fm.signedWidth(par_->layout()->rightmargin)
+               + fm.signedWidth(par_->layout().rightmargin)
                * 4 / (par_->getDepth() + 4);
 
        return r_margin;
@@ -196,11 +212,11 @@ int ParagraphMetrics::rightMargin(Buffer const & buffer) const
 
 int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 {
-       char_type c = par_->getChar(pos);
-
        // The most special cases are handled first.
-       if (c == Paragraph::META_INSET)
-               return par_->getInset(pos)->width();
+       if (Inset const * inset = par_->getInset(pos))
+               return insetDimension(inset).wid;
+
+       char_type c = par_->getChar(pos);
 
        if (!isPrintable(c))
                return theFontMetrics(font).width(c);
@@ -214,8 +230,9 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
                                        return 0;
                                c = par_->transformChar(c, pos);
                } else if (language->lang() == "hebrew" &&
-                       Encodings::isComposeChar_hebrew(c))
-                       return 0;
+                               Encodings::isComposeChar_hebrew(c)) {
+                       return 0;       
+               }
        }
        return theFontMetrics(font).width(c);
 }
@@ -243,7 +260,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        }
 
        // do not expand in some labels
-       if (par_->layout()->margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
+       if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
                return false;
 
        // if there is anything between the first char of the row and