X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=31b31a2d0158a156117835fb3af784369c398acd;hb=c1fd622c51752d790576600f5911813ff8dac3fa;hp=16f2fb2713b0c5224905594ff4ad162e2ff7b9c7;hpb=8f3acbb4842ff31d1229eec8fba4890be743f2d9;p=lyx.git diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp index 16f2fb2713..31b31a2d01 100644 --- a/src/ParagraphMetrics.cpp +++ b/src/ParagraphMetrics.cpp @@ -22,38 +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 "paragraph_funcs.h" -#include "sgml.h" +#include "Layout.h" +#include "LayoutEnums.h" +#include "Paragraph.h" #include "TextClass.h" -#include "TexRow.h" -#include "VSpace.h" #include "frontends/FontMetrics.h" -#include "insets/InsetBibitem.h" -#include "insets/InsetOptArg.h" - #include "support/lassert.h" #include "support/debug.h" -#include "support/gettext.h" -#include "support/lstrings.h" -#include "support/textutils.h" -#include -#include - -#include -#include -#include #include using namespace std; @@ -63,7 +42,7 @@ namespace lyx { ParagraphMetrics::ParagraphMetrics(Paragraph const & par) : - position_(-1), par_(&par) + position_(-1), id_(par.id()), par_(&par) {} @@ -86,77 +65,15 @@ void ParagraphMetrics::reset(Paragraph const & par) } -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, 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); - } - } - - 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}; - // Each of the variable to process is 4 bytes: 4x7 = 28 - crc.process_bytes(b, 28); - - return crc.checksum(); -} - - void ParagraphMetrics::setPosition(int position) { position_ = 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) -{ - LASSERT(!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(); - - for (--rit; rit != begin && rit->pos() > pos; --rit) - ; - - return *rit; -} - - Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const { - LASSERT(!rows().empty(), /**/); + LBUFERR(!rows().empty()); // If boundary is set we should return the row on which // the character before is inside. @@ -175,7 +92,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const size_t ParagraphMetrics::pos2row(pos_type pos) const { - LASSERT(!rows().empty(), /**/); + LBUFERR(!rows().empty()); RowList::const_iterator rit = rows_.end(); RowList::const_iterator const begin = rows_.begin(); @@ -191,8 +108,7 @@ void ParagraphMetrics::dump() const { lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl; for (size_t i = 0; i != rows_.size(); ++i) { - lyxerr << " row " << i << ": "; - rows_[i].dump(); + lyxerr << " row " << i << ": " << rows_[i]; } } @@ -211,43 +127,13 @@ 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 c = par_->getChar(pos); - - if (c == '\t') - return 4 * theFontMetrics(font).width(' '); - - if (!isPrintable(c)) - return theFontMetrics(font).width(c); - - Language const * language = font.language(); - if (language->rightToLeft()) { - if (language->lang() == "arabic_arabtex" || - language->lang() == "arabic_arabi" || - language->lang() == "farsi") { - if (Encodings::isArabicComposeChar(c)) - return 0; - c = par_->transformChar(c, pos); - } else if (language->lang() == "hebrew" && - Encodings::isHebrewComposeChar(c)) { - return 0; - } - } - 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)) return false; - LASSERT(pos >= row.pos() && pos < row.endpos(), /**/); + LASSERT(pos >= row.pos() && pos < row.endpos(), return false); // expand at the end of a row only if there is another hfill on the same row if (pos == row.endpos() - 1) { @@ -259,9 +145,8 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const } // expand at the beginning of a row only if it is the first row of a paragraph - if (pos == row.pos()) { + if (pos == row.pos()) return pos == 0; - } // do not expand in some labels if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody()) @@ -271,7 +156,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const // the specified position that is neither a newline nor an hfill, // the hfill will be expanded, otherwise it won't for (pos_type i = row.pos(); i < pos; i++) { - if (!par_->isNewline(i) && !par_->isHfill(i)) + if (!par_->isNewline(i) && !par_->isEnvSeparator(i) && !par_->isHfill(i)) return true; } return false;