mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-25 05:55:34 +00:00
1f0305509b
The computation of the legth of expanded hfills did not take into account their unexpanded size. This is done now by increasing the dimension (+=) instead of merely setting it. Moreover, since the insets sizes are integer number, rounding effects have to be taken in account. To this end, the extra number of pixels is added to the last hfill in the row. This fixes part of bug #9860. Note not everything is fixed by this patch: the logic of ParagraphMetrics::hfillExpansion seems bogus to me. I do not see why consecutive hfills at the beginning of a row should not be all expanded. Since I do not know what are the peculiarities of hfill handling in LaTeX, I did not change it (yet). I did not either try to investigate the label hfill part, because I do not even know what is so special about it. I think there is a lot of old logic that nobody ever tried to question.
233 lines
5.3 KiB
C++
233 lines
5.3 KiB
C++
/**
|
|
* \file Paragraph.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Asger Alstrup
|
|
* \author Lars Gullik Bjønnes
|
|
* \author Jean-Marc Lasgouttes
|
|
* \author Angus Leeming
|
|
* \author John Levon
|
|
* \author André Pönitz
|
|
* \author Dekel Tsur
|
|
* \author Jürgen Vigna
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "ParagraphMetrics.h"
|
|
|
|
#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 "sgml.h"
|
|
#include "TextClass.h"
|
|
#include "TexRow.h"
|
|
|
|
#include "frontends/FontMetrics.h"
|
|
|
|
#include "insets/InsetBibitem.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/bind.h"
|
|
#include <boost/crc.hpp>
|
|
|
|
#include <algorithm>
|
|
#include <list>
|
|
#include <stack>
|
|
#include <sstream>
|
|
|
|
using namespace std;
|
|
using namespace lyx::support;
|
|
|
|
namespace lyx {
|
|
|
|
|
|
ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
|
|
position_(-1), par_(&par)
|
|
{}
|
|
|
|
|
|
ParagraphMetrics & ParagraphMetrics::operator=(
|
|
ParagraphMetrics const & pm)
|
|
{
|
|
rows_ = pm.rows_;
|
|
dim_ = pm.dim_;
|
|
par_ = pm.par_;
|
|
position_ = pm.position_;
|
|
return *this;
|
|
}
|
|
|
|
|
|
void ParagraphMetrics::reset(Paragraph const & par)
|
|
{
|
|
par_ = ∥
|
|
dim_ = Dimension();
|
|
//position_ = -1;
|
|
}
|
|
|
|
|
|
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.track_changes) {
|
|
Change change = par_->lookupChange(i);
|
|
char_type const b[] = { static_cast<char_type>(change.type) };
|
|
// 1 byte is enough to encode Change::Type
|
|
crc.process_bytes(b, 1);
|
|
}
|
|
}
|
|
|
|
Dimension const & d = row.dimension();
|
|
char_type const b[] = { static_cast<char_type>(row.sel_beg),
|
|
static_cast<char_type>(row.sel_end),
|
|
row.begin_margin_sel,
|
|
row.end_margin_sel,
|
|
d.wid, d.asc, d.des };
|
|
crc.process_bytes(b, sizeof(b));
|
|
crc.process_bytes(&row.separator, sizeof(row.separator));
|
|
|
|
return crc.checksum();
|
|
}
|
|
|
|
|
|
void ParagraphMetrics::setPosition(int position)
|
|
{
|
|
position_ = position;
|
|
}
|
|
|
|
|
|
Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
|
|
{
|
|
LBUFERR(!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
|
|
{
|
|
LBUFERR(!rows().empty());
|
|
|
|
// If boundary is set we should return the row on which
|
|
// the character before is inside.
|
|
if (pos > 0 && boundary)
|
|
--pos;
|
|
|
|
RowList::const_iterator rit = rows_.end();
|
|
RowList::const_iterator const begin = rows_.begin();
|
|
|
|
for (--rit; rit != begin && rit->pos() > pos; --rit)
|
|
;
|
|
|
|
return *rit;
|
|
}
|
|
|
|
|
|
size_t ParagraphMetrics::pos2row(pos_type pos) const
|
|
{
|
|
LBUFERR(!rows().empty());
|
|
|
|
RowList::const_iterator rit = rows_.end();
|
|
RowList::const_iterator const begin = rows_.begin();
|
|
|
|
for (--rit; rit != begin && rit->pos() > pos; --rit)
|
|
;
|
|
|
|
return rit - begin;
|
|
}
|
|
|
|
|
|
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];
|
|
}
|
|
}
|
|
|
|
int ParagraphMetrics::rightMargin(BufferView const & bv) const
|
|
{
|
|
BufferParams const & params = bv.buffer().params();
|
|
DocumentClass const & tclass = params.documentClass();
|
|
frontend::FontMetrics const & fm = theFontMetrics(params.getFont());
|
|
int const r_margin =
|
|
bv.rightMargin()
|
|
+ fm.signedWidth(tclass.rightmargin())
|
|
+ fm.signedWidth(par_->layout().rightmargin)
|
|
* 4 / (par_->getDepth() + 4);
|
|
|
|
return r_margin;
|
|
}
|
|
|
|
|
|
// 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(), return false);
|
|
|
|
// expand at the end of a row only if there is another hfill on the same row
|
|
if (pos == row.endpos() - 1) {
|
|
for (pos_type i = row.pos(); i < pos; i++) {
|
|
if (par_->isHfill(i))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// expand at the beginning of a row only if it is the first row of a paragraph
|
|
if (pos == row.pos())
|
|
return pos == 0;
|
|
|
|
// do not expand in some labels
|
|
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_->isEnvSeparator(i) && !par_->isHfill(i))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
} // namespace lyx
|