X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=95974f5705a578d3d032cb352c5496ade545c76c;hb=c48091f33a773732fa6c789927e5833e44108d9d;hp=483620a8e7ace77332da7af2569db91297c57e4d;hpb=cdf13782003f6fca74b267c6b23d76bb9edaa65c;p=lyx.git diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp index 483620a8e7..95974f5705 100644 --- a/src/ParagraphMetrics.cpp +++ b/src/ParagraphMetrics.cpp @@ -4,13 +4,13 @@ * Licence details can be found in the file COPYING. * * \author Asger Alstrup - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Dekel Tsur - * \author Jürgen Vigna + * \author Jürgen Vigna * * Full author contact details are available in file CREDITS. */ @@ -24,8 +24,6 @@ #include "BufferView.h" #include "Counters.h" #include "Encoding.h" -#include "debug.h" -#include "gettext.h" #include "Language.h" #include "LaTeXFeatures.h" #include "Layout.h" @@ -33,7 +31,6 @@ #include "LyXRC.h" #include "Row.h" #include "OutputParams.h" -#include "paragraph_funcs.h" #include "sgml.h" #include "TextClass.h" #include "TexRow.h" @@ -42,14 +39,15 @@ #include "frontends/FontMetrics.h" #include "insets/InsetBibitem.h" -#include "insets/InsetOptArg.h" +#include "insets/InsetArgument.h" +#include "support/lassert.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 +#include "support/bind.h" #include #include @@ -57,25 +55,15 @@ #include #include +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=( @@ -97,20 +85,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, + row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des}; + crc.process_bytes(b, sizeof(b)); + + return crc.checksum(); } @@ -140,7 +135,7 @@ void ParagraphMetrics::setInsetDimension(Inset const * inset, Row & ParagraphMetrics::getRow(pos_type pos, bool boundary) { - BOOST_ASSERT(!rows().empty()); + LASSERT(!rows().empty(), /**/); // If boundary is set we should return the row on which // the character before is inside. @@ -159,7 +154,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary) Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const { - BOOST_ASSERT(!rows().empty()); + LASSERT(!rows().empty(), /**/); // If boundary is set we should return the row on which // the character before is inside. @@ -178,7 +173,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const size_t ParagraphMetrics::pos2row(pos_type pos) const { - BOOST_ASSERT(!rows().empty()); + LASSERT(!rows().empty(), /**/); RowList::const_iterator rit = rows_.end(); RowList::const_iterator const begin = rows_.begin(); @@ -199,15 +194,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; @@ -217,11 +212,14 @@ int ParagraphMetrics::rightMargin(Buffer const & buffer) const int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const { // The most special cases are handled first. - if (par_->isInset(pos)) - return insetDimension(par_->getInset(pos)).wid; + if (Inset const * inset = par_->getInset(pos)) + return insetDimension(inset).wid; char_type c = par_->getChar(pos); + if (c == '\t') + return 4 * theFontMetrics(font).width(' '); + if (!isPrintable(c)) return theFontMetrics(font).width(c); @@ -230,12 +228,13 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const if (language->lang() == "arabic_arabtex" || language->lang() == "arabic_arabi" || language->lang() == "farsi") { - if (Encodings::isComposeChar_arabic(c)) + if (Encodings::isArabicComposeChar(c)) return 0; c = par_->transformChar(c, pos); } else if (language->lang() == "hebrew" && - Encodings::isComposeChar_hebrew(c)) + Encodings::isHebrewComposeChar(c)) { return 0; + } } return theFontMetrics(font).width(c); } @@ -246,7 +245,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const if (!par_->isHfill(pos)) return false; - BOOST_ASSERT(pos >= row.pos() && pos < row.endpos()); + LASSERT(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) { @@ -263,7 +262,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