mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
c668ebf611
The algorithm used for breaking a paragraph in LaTeX export is changed for avoiding spurious blank lines causing too much vertical space. This change is tied to the introduction of a new inset (with two different specializations) helping in either outputing LaTeX paragraph breaks or separating environments in LyX. Both of the above goals were previously achieved by the ---Separator--- layout and can now be accomplished by the new inset in a more natural way. As an example, after leaving an environment by hitting the Return key for two times, a third return automatically inserts a parbreak inset, which is equivalent to the old separator layout, i.e., it also introduces a blank line in the output. If this blank line is not wanted, the parbreak separator can be changed to a plain separator by a right click of the mouse. Of course, an environment can still be separated by the following one by using the Alt+P+Return shortcut (or the corresponding menu key), but now the plain separator inset is used instead of the old separator layout, such that no blank line occurs in the LaTeX output. Old documents are converted such that the LaTeX output remains unchanged. As a result of this conversion, the old separator layout is replaced by the new parbreak inset, which may also appear in places where the old algorithm was introducing blank lines while the new one is not. Note that not all blank lines were actually affecting the LaTeX output, because a blank line is simply ignored by the TeX engine when it occurs in the so called "vertical mode" (e.g., after an alignment environment). The old ---Separator--- layout is now gone and old layout files using it are also automatically converted. Round trip conversions between old and new format should leave a document unchanged. This means that the new behavior about paragraph breaking is not "carried back" to the old format. Indeed, this would need introducing special LaTeX commands in ERT that would accumulate in roundtrip conversions, horribly cluttering the document. So, when converting a modified document to old formats, the LaTeX output may slightly differ in vertical spacing if the document is processed by an old version of LyX. In other words, forward compatibility is guaranteed, but not backwards.
279 lines
6.2 KiB
C++
279 lines
6.2 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));
|
|
|
|
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)
|
|
{
|
|
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].dump();
|
|
}
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
|
|
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);
|
|
}
|
|
|
|
|
|
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
|