X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.cpp;h=01db6cb934b0be5c019ab2998300e84b5b56178a;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=a05177831dc85f4ccf66ac6465b4335aa9fc9ee3;hpb=6ce171eec85dd1ed275daa1c01294e7d4f964d80;p=lyx.git diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp index a05177831d..01db6cb934 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,30 +24,29 @@ #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" #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/ExceptionMessage.h" +#include "support/gettext.h" #include "support/lstrings.h" #include "support/textutils.h" -#include "support/convert.h" -#include "support/unicode.h" -#include #include #include @@ -55,25 +54,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): par_(&par), position_(-1) -{ -} +ParagraphMetrics::ParagraphMetrics(Paragraph const & par) : + position_(-1), par_(&par) +{} ParagraphMetrics & ParagraphMetrics::operator=( @@ -95,20 +84,39 @@ void ParagraphMetrics::reset(Paragraph const & par) } -void ParagraphMetrics::computeRowSignature(Row & row, - BufferParams const & bparams) +size_t ParagraphMetrics::computeRowSignature(Row const & row, + BufferView const & bv) 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); - if (bparams.trackChanges) { + if (par_->isInset(i)) { + Inset const * in = par_->getInset(i); + Dimension const d = in->dimension(bv); + int const b[] = { d.wid, d.asc, d.des }; + crc.process_bytes(b, sizeof(b)); + } else { + char_type const b[] = { par_->getChar(i) }; + crc.process_bytes(b, sizeof(char_type)); + } + if (bv.buffer().params().track_changes) { Change change = par_->lookupChange(i); - char_type const b[] = { change.type }; + char_type const b[] = { static_cast(change.type) }; + // 1 byte is enough to encode Change::Type crc.process_bytes(b, 1); - } + } } - row.setCrc(crc.checksum()); + + pos_type const b1[] = { row.sel_beg, row.sel_end }; + crc.process_bytes(b1, sizeof(b1)); + + Dimension const & d = row.dimension(); + int 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(); } @@ -120,7 +128,7 @@ void ParagraphMetrics::setPosition(int position) Row & ParagraphMetrics::getRow(pos_type pos, bool boundary) { - BOOST_ASSERT(!rows().empty()); + LBUFERR(!rows().empty()); // If boundary is set we should return the row on which // the character before is inside. @@ -139,7 +147,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary) Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const { - BOOST_ASSERT(!rows().empty()); + LBUFERR(!rows().empty()); // If boundary is set we should return the row on which // the character before is inside. @@ -158,7 +166,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const size_t ParagraphMetrics::pos2row(pos_type pos) const { - BOOST_ASSERT(!rows().empty()); + LBUFERR(!rows().empty()); RowList::const_iterator rit = rows_.end(); RowList::const_iterator const begin = rows_.begin(); @@ -174,59 +182,32 @@ 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]; } } -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; } -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 (!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::isComposeChar_arabic(c)) - return 0; - c = par_->transformChar(c, pos); - } else if (language->lang() == "hebrew" && - Encodings::isComposeChar_hebrew(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; - BOOST_ASSERT(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) { @@ -238,19 +219,18 @@ 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()) + if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody()) return false; // if there is anything between the first char of the row and // 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;