-/* This file is part of
- * ======================================================
+/**
+ * \file text.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * LyX, The Document Processor
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Dekel Tsur
+ * \author Jürgen Vigna
*
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
#include <config.h>
#include "lyxtext.h"
-#include "lyxrow.h"
#include "paragraph.h"
#include "gettext.h"
#include "bufferparams.h"
/// left margin
extern int const LEFT_MARGIN = PAPER_MARGIN + CHANGEBAR_MARGIN;
-extern int bibitemMaxWidth(BufferView *, LyXFont const &);
+
+
+int bibitemMaxWidth(BufferView *, LyXFont const &);
BufferView * LyXText::bv()
void LyXText::updateRowPositions()
{
- RowList::iterator rit = rows().begin();
- RowList::iterator rend = rows().end();
- for (int y = 0; rit != rend ; ++rit) {
- rit->y(y);
- y += rit->height();
- }
-}
-
-
-int LyXText::top_y() const
-{
- if (anchor_row_ == rowlist_.end())
- return 0;
-
- return anchor_row_->y() + anchor_row_offset_;
-}
-
-
-void LyXText::top_y(int newy)
-{
- if (rows().empty())
- return;
-
- if (isInInset()) {
- anchor_row_ = rows().begin();
- anchor_row_offset_ = newy;
- return;
- }
-
- lyxerr[Debug::GUI] << "setting top y = " << newy << endl;
-
- int y = newy;
- RowList::iterator rit = getRowNearY(y);
-
- if (rit == anchor_row_ && anchor_row_offset_ == newy - y) {
- lyxerr[Debug::GUI] << "top_y to same value, skipping update" << endl;
- return;
+ ParagraphList::iterator pit = ownerParagraphs().begin();
+ ParagraphList::iterator end = ownerParagraphs().end();
+ for (height = 0; pit != end; ++pit) {
+ RowList::iterator rit = pit->rows.begin();
+ RowList::iterator rend = pit->rows.end();
+ for ( ; rit != rend ; rit = ++rit) {
+ rit->y(height);
+ height += rit->height();
+ }
}
-
- anchor_row_ = rit;
- anchor_row_offset_ = newy - y;
- lyxerr[Debug::GUI] << "changing reference to row: " << &*anchor_row_
- << " offset: " << anchor_row_offset_ << endl;
- postPaint();
-}
-
-
-void LyXText::anchor_row(RowList::iterator rit)
-{
- int old_y = top_y();
- anchor_row_offset_ = 0;
- anchor_row_ = rit;
- anchor_row_offset_ = old_y - top_y();
- lyxerr[Debug::GUI] << "anchor_row(): changing reference to row: "
- << &*anchor_row_ << " offset: "
- << anchor_row_offset_ << endl;
}
int LyXText::workWidth() const
{
- if (inset_owner) {
- // FIXME: pass (const ?) ref
- return inset_owner->textWidth(bv());
- }
- return bv()->workWidth();
-}
-
-
-int LyXText::workWidth(Inset const * inset) const
-{
- ParagraphList::iterator par = std::find(ownerParagraphs().begin(),
- ownerParagraphs().end(),
- *inset->parOwner());
- if (par == ownerParagraphs().end()) {
- lyxerr[Debug::GUI] << "LyXText::workWidth: unexpected\n";
- return -1;
- }
-
- pos_type pos = par->getPositionOfInset(inset);
- Assert(pos != -1);
-
- LyXLayout_ptr const & layout = par->layout();
-
- if (layout->margintype != MARGIN_RIGHT_ADDRESS_BOX) {
- // Optimization here: in most cases, the real row is
- // not needed, but only the par/pos values. So we just
- // construct a dummy row for leftMargin. (JMarc)
- Row dummyrow;
- dummyrow.par(par);
- dummyrow.pos(pos);
- return workWidth() - leftMargin(dummyrow);
- } else {
- int dummy_y;
- RowList::iterator row = getRow(par, pos, dummy_y);
- RowList::iterator frow = row;
- RowList::iterator beg = rowlist_.begin();
-
- while (frow != beg && frow->par() == boost::prior(frow)->par())
- --frow;
-
- // FIXME: I don't understand this code - jbl
-
- unsigned int maxw = 0;
- while (!isParEnd(*this, frow)) {
- if ((frow != row) && (maxw < frow->width()))
- maxw = frow->width();
- ++frow;
- }
- if (maxw)
- return maxw;
-
- }
- return workWidth();
+ return inset_owner ? inset_owner->textWidth() : bv()->workWidth();
}
return 0;
char const c = pit->getChar(pos);
- return singleWidth(pit, pos, c);
+ LyXFont const & font = getFont(pit, pos);
+ return singleWidth(pit, pos, c, font);
}
int LyXText::singleWidth(ParagraphList::iterator pit,
- pos_type pos, char c) const
+ pos_type pos, char c, LyXFont const & font) const
{
- if (pos >= pit->size())
+ if (pos >= pit->size()) {
+ lyxerr << "in singleWidth(), pos: " << pos << endl;
+ Assert(false);
return 0;
+ }
- LyXFont const font = getFont(bv()->buffer(), pit, pos);
// The most common case is handled first (Asger)
if (IsPrintable(c)) {
if (font.language()->RightToLeft()) {
- if (font.language()->lang() == "arabic" &&
- (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
- lyxrc.font_norm_type == LyXRC::ISO_10646_1)) {
+ if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
+ lyxrc.font_norm_type == LyXRC::ISO_10646_1)
+ && font.language()->lang() == "arabic") {
if (Encodings::IsComposeChar_arabic(c))
return 0;
else
return 0;
}
return font_metrics::width(c, font);
-
}
if (c == Paragraph::META_INSET) {
- Inset * tmpinset = pit->getInset(pos);
- if (tmpinset) {
- if (tmpinset->lyxCode() == Inset::HFILL_CODE) {
- // Because of the representation as vertical lines
- return 3;
- }
-#if 1
-#warning inset->update FIXME
- // this IS needed otherwise on initialitation we don't get the fill
- // of the row right (ONLY on initialization if we read a file!)
- // should be changed! (Jug 20011204)
- //tmpinset->update(bv());
- Dimension dim;
- MetricsInfo mi;
- mi.base.bv = bv();
- mi.base.font = font;
- tmpinset->metrics(mi, dim);
-#endif
- //return tmpinset->width(bv(), font);
- return dim.wid;
+ InsetOld * tmpinset = pit->getInset(pos);
+ Assert(tmpinset);
+ if (tmpinset->lyxCode() == InsetOld::HFILL_CODE) {
+ // Because of the representation as vertical lines
+ return 3;
}
- return 0;
+ return tmpinset->width();
}
if (IsSeparatorChar(c))
}
-void LyXText::computeBidiTables(Buffer const * buf,
- RowList::iterator row) const
+void LyXText::computeBidiTables(ParagraphList::iterator pit,
+ Buffer const & buf, RowList::iterator row) const
{
bidi_same_direction = true;
if (!lyxrc.rtl_support) {
return;
}
- ParagraphList::iterator row_par = row->par();
-
- Inset * inset = row_par->inInset();
+ InsetOld * inset = pit->inInset();
if (inset && inset->owner() &&
- inset->owner()->lyxCode() == Inset::ERT_CODE) {
+ inset->owner()->lyxCode() == InsetOld::ERT_CODE) {
bidi_start = -1;
return;
}
bidi_start = row->pos();
- bidi_end = lastPrintablePos(*this, row);
+ bidi_end = lastPrintablePos(*pit, row);
if (bidi_start > bidi_end) {
bidi_start = -1;
pos_type stack[2];
bool const rtl_par =
- row_par->isRightToLeftPar(buf->params);
+ pit->isRightToLeftPar(buf.params);
int level = 0;
bool rtl = false;
bool rtl0 = false;
- pos_type const body_pos = row_par->beginningOfBody();
+ pos_type const body_pos = pit->beginningOfBody();
for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) {
- bool is_space = row_par->isLineSeparator(lpos);
+ bool is_space = pit->isLineSeparator(lpos);
pos_type const pos =
(is_space && lpos + 1 <= bidi_end &&
- !row_par->isLineSeparator(lpos + 1) &&
- !row_par->isNewline(lpos + 1))
+ !pit->isLineSeparator(lpos + 1) &&
+ !pit->isNewline(lpos + 1))
? lpos + 1 : lpos;
- LyXFont font = row_par->getFontSettings(buf->params, pos);
+ LyXFont font = pit->getFontSettings(buf.params, pos);
if (pos != lpos && 0 < lpos && rtl0 && font.isRightToLeft() &&
font.number() == LyXFont::ON &&
- row_par->getFontSettings(buf->params, lpos - 1).number()
+ pit->getFontSettings(buf.params, lpos - 1).number()
== LyXFont::ON) {
- font = row_par->getFontSettings(buf->params, lpos);
+ font = pit->getFontSettings(buf.params, lpos);
is_space = false;
}
// This method requires a previous call to ComputeBidiTables()
-bool LyXText::isBoundary(Buffer const * buf, Paragraph const & par,
+bool LyXText::isBoundary(Buffer const & buf, Paragraph const & par,
pos_type pos) const
{
if (!lyxrc.rtl_support || pos == 0)
bool const rtl = bidi_level(pos - 1) % 2;
bool const rtl2 = bidi_InRange(pos)
? bidi_level(pos) % 2
- : par.isRightToLeftPar(buf->params);
+ : par.isRightToLeftPar(buf.params);
return rtl != rtl2;
}
-bool LyXText::isBoundary(Buffer const * buf, Paragraph const & par,
+bool LyXText::isBoundary(Buffer const & buf, Paragraph const & par,
pos_type pos, LyXFont const & font) const
{
if (!lyxrc.rtl_support)
bool const rtl = font.isVisibleRightToLeft();
bool const rtl2 = bidi_InRange(pos)
? bidi_level(pos) % 2
- : par.isRightToLeftPar(buf->params);
+ : par.isRightToLeftPar(buf.params);
return rtl != rtl2;
}
-int LyXText::leftMargin(Row const & row) const
+int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
{
- Inset * ins;
-
- if (row.pos() < row.par()->size())
- if ((row.par()->getChar(row.pos()) == Paragraph::META_INSET) &&
- (ins = row.par()->getInset(row.pos())) &&
- (ins->needFullRow() || ins->display()))
- return LEFT_MARGIN;
-
LyXTextClass const & tclass =
bv()->buffer()->params.getLyXTextClass();
- LyXLayout_ptr const & layout = row.par()->layout();
+ LyXLayout_ptr const & layout = pit->layout();
string parindent = layout->parindent;
// this is the way, LyX handles the LaTeX-Environments.
// I have had this idea very late, so it seems to be a
// later added hack and this is true
- if (!row.par()->getDepth()) {
- if (row.par()->layout() == tclass.defaultLayout()) {
+ if (!pit->getDepth()) {
+ if (pit->layout() == tclass.defaultLayout()) {
// find the previous same level paragraph
- if (row.par() != ownerParagraphs().begin()) {
+ if (pit != ownerParagraphs().begin()) {
ParagraphList::iterator newpit =
- depthHook(row.par(), ownerParagraphs(),
- row.par()->getDepth());
- if (newpit == row.par() &&
+ depthHook(pit, ownerParagraphs(),
+ pit->getDepth());
+ if (newpit == pit &&
newpit->layout()->nextnoindent)
parindent.erase();
}
} else {
// find the next level paragraph
- ParagraphList::iterator newpar = outerHook(row.par(),
+ ParagraphList::iterator newpar = outerHook(pit,
ownerParagraphs());
// make a corresponding row. Needed to call leftMargin()
// check wether it is a sufficent paragraph
if (newpar != ownerParagraphs().end() &&
newpar->layout()->isEnvironment()) {
- Row dummyrow;
- dummyrow.par(newpar);
- dummyrow.pos(newpar->size());
- x = leftMargin(dummyrow);
+ x = leftMargin(newpar, Row(newpar->size()));
}
if (newpar != ownerParagraphs().end() &&
- row.par()->layout() == tclass.defaultLayout()) {
+ pit->layout() == tclass.defaultLayout()) {
if (newpar->params().noindent())
parindent.erase();
else {
}
}
- LyXFont const labelfont = getLabelFont(bv()->buffer(), row.par());
+ LyXFont const labelfont = getLabelFont(pit);
switch (layout->margintype) {
case MARGIN_DYNAMIC:
if (!layout->leftmargin.empty()) {
x += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
}
- if (!row.par()->getLabelstring().empty()) {
+ if (!pit->getLabelstring().empty()) {
x += font_metrics::signedWidth(layout->labelindent,
labelfont);
- x += font_metrics::width(row.par()->getLabelstring(),
+ x += font_metrics::width(pit->getLabelstring(),
labelfont);
x += font_metrics::width(layout->labelsep, labelfont);
}
case MARGIN_MANUAL:
x += font_metrics::signedWidth(layout->labelindent, labelfont);
// The width of an empty par, even with manual label, should be 0
- if (!row.par()->empty() && row.pos() >= row.par()->beginningOfBody()) {
- if (!row.par()->getLabelWidthString().empty()) {
- x += font_metrics::width(row.par()->getLabelWidthString(),
+ if (!pit->empty() && row.pos() >= pit->beginningOfBody()) {
+ if (!pit->getLabelWidthString().empty()) {
+ x += font_metrics::width(pit->getLabelWidthString(),
labelfont);
x += font_metrics::width(layout->labelsep, labelfont);
}
break;
case MARGIN_STATIC:
x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
- / (row.par()->getDepth() + 4);
+ / (pit->getDepth() + 4);
break;
case MARGIN_FIRST_DYNAMIC:
if (layout->labeltype == LABEL_MANUAL) {
- if (row.pos() >= row.par()->beginningOfBody()) {
+ if (row.pos() >= pit->beginningOfBody()) {
x += font_metrics::signedWidth(layout->leftmargin,
labelfont);
} else {
// theorems (JMarc)
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(row.par(), ownerParagraphs()))) {
+ && !isFirstInSequence(pit, ownerParagraphs()))) {
x += font_metrics::signedWidth(layout->leftmargin,
labelfont);
} else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
x += font_metrics::signedWidth(layout->labelindent,
labelfont);
x += font_metrics::width(layout->labelsep, labelfont);
- x += font_metrics::width(row.par()->getLabelstring(),
+ x += font_metrics::width(pit->getLabelstring(),
labelfont);
}
break;
// are *NOT* allowed in the LaTeX realisation of this layout.
// find the first row of this paragraph
- RowList::iterator tmprit = rowlist_.begin();
- while (tmprit != rowlist_.end()
- && tmprit->par() != row.par())
- ++tmprit;
-
- int minfill = tmprit->fill();
- while (boost::next(tmprit) != rowlist_.end() &&
- boost::next(tmprit)->par() == row.par()) {
- ++tmprit;
- if (tmprit->fill() < minfill)
- minfill = tmprit->fill();
- }
+ RowList::iterator rit = pit->rows.begin();
+ RowList::iterator end = pit->rows.end();
+ int minfill = rit->fill();
+ for ( ; rit != end; ++rit)
+ if (rit->fill() < minfill)
+ minfill = rit->fill();
x += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
break;
}
- if ((workWidth() > 0) &&
- !row.par()->params().leftIndent().zero())
- {
- LyXLength const len = row.par()->params().leftIndent();
+ if (workWidth() > 0 && !pit->params().leftIndent().zero()) {
+ LyXLength const len = pit->params().leftIndent();
int const tw = inset_owner ?
inset_owner->latexTextWidth(bv()) : workWidth();
x += len.inPixels(tw);
LyXAlignment align;
- if (row.par()->params().align() == LYX_ALIGN_LAYOUT)
+ if (pit->params().align() == LYX_ALIGN_LAYOUT)
align = layout->align;
else
- align = row.par()->params().align();
+ align = pit->params().align();
// set the correct parindent
if (row.pos() == 0) {
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|| (layout->labeltype == LABEL_STATIC
&& layout->latextype == LATEX_ENVIRONMENT
- && !isFirstInSequence(row.par(), ownerParagraphs())))
+ && !isFirstInSequence(pit, ownerParagraphs())))
&& align == LYX_ALIGN_BLOCK
- && !row.par()->params().noindent()
+ && !pit->params().noindent()
// in tabulars and ert paragraphs are never indented!
- && (!row.par()->inInset() || !row.par()->inInset()->owner() ||
- (row.par()->inInset()->owner()->lyxCode() != Inset::TABULAR_CODE &&
- row.par()->inInset()->owner()->lyxCode() != Inset::ERT_CODE))
- && (row.par()->layout() != tclass.defaultLayout() ||
+ && (!pit->inInset() || !pit->inInset()->owner() ||
+ (pit->inInset()->owner()->lyxCode() != InsetOld::TABULAR_CODE &&
+ pit->inInset()->owner()->lyxCode() != InsetOld::ERT_CODE))
+ && (pit->layout() != tclass.defaultLayout() ||
bv()->buffer()->params.paragraph_separation ==
BufferParams::PARSEP_INDENT)) {
x += font_metrics::signedWidth(parindent,
}
-int LyXText::rightMargin(Buffer const & buf, Row const & row) const
+int LyXText::rightMargin(ParagraphList::iterator pit,
+ Buffer const & buf, Row const &) const
{
- Inset * ins;
-
- if (row.pos() < row.par()->size())
- if ((row.par()->getChar(row.pos()) == Paragraph::META_INSET) &&
- (ins = row.par()->getInset(row.pos())) &&
- (ins->needFullRow() || ins->display()))
- return PAPER_MARGIN;
-
LyXTextClass const & tclass = buf.params.getLyXTextClass();
- LyXLayout_ptr const & layout = row.par()->layout();
+ LyXLayout_ptr const & layout = pit->layout();
- int x = PAPER_MARGIN
+ return PAPER_MARGIN
+ font_metrics::signedWidth(tclass.rightmargin(),
tclass.defaultfont());
-
- x += font_metrics::signedWidth(layout->rightmargin,
+ + font_metrics::signedWidth(layout->rightmargin,
tclass.defaultfont())
- * 4 / (row.par()->getDepth() + 4);
- return x;
+ * 4 / (pit->getDepth() + 4);
}
-int LyXText::labelEnd(Row const & row) const
+int LyXText::labelEnd(ParagraphList::iterator pit, Row const & row) const
{
- if (row.par()->layout()->margintype == MARGIN_MANUAL) {
+ if (pit->layout()->margintype == MARGIN_MANUAL) {
Row tmprow = row;
- tmprow.pos(row.par()->size());
+ tmprow.pos(pit->size());
// return the beginning of the body
- return leftMargin(tmprow);
+ return leftMargin(pit, tmprow);
}
// LabelEnd is only needed if the layout
};
-pos_type LyXText::rowBreakPoint(Row const & row) const
+pos_type LyXText::rowBreakPoint(ParagraphList::iterator pit,
+ Row const & row) const
{
- ParagraphList::iterator pit = row.par();
-
// maximum pixel width of a row.
- int width = workWidth() - rightMargin(*bv()->buffer(), row);
+ int width = workWidth()
+ - rightMargin(pit, *bv()->buffer(), row);
// inset->textWidth() returns -1 via workWidth(),
// but why ?
// or the end of the par, then choose the possible break
// nearest that.
- int const left = leftMargin(row);
+ int const left = leftMargin(pit, row);
int x = left;
// pixel width since last breakpoint
int chunkwidth = 0;
- bool fullrow = false;
pos_type i = pos;
+
+ // We re-use the font resolution for the entire font span when possible
+ LyXFont font = getFont(pit, i);
+ lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
+
for (; i < last; ++i) {
if (pit->isNewline(i)) {
point = i;
}
char const c = pit->getChar(i);
+ if (i > endPosOfFontSpan) {
+ font = getFont(pit, i);
+ endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
+ }
int thiswidth;
// add the auto-hfill from label end to the body
if (body_pos && i == body_pos) {
- thiswidth = font_metrics::width(layout->labelsep,
- getLabelFont(bv()->buffer(), pit));
+ thiswidth = font_metrics::width(layout->labelsep, getLabelFont(pit));
if (pit->isLineSeparator(i - 1))
thiswidth -= singleWidth(pit, i - 1);
- int left_margin = labelEnd(row);
+ int left_margin = labelEnd(pit, row);
if (thiswidth + x < left_margin)
thiswidth = left_margin - x;
- thiswidth += singleWidth(pit, i, c);
+ thiswidth += singleWidth(pit, i, c, font);
} else {
- thiswidth = singleWidth(pit, i, c);
+ thiswidth = singleWidth(pit, i, c, font);
}
x += thiswidth;
chunkwidth += thiswidth;
- Inset * in = pit->isInset(i) ? pit->getInset(i) : 0;
- fullrow = (in && (in->display() || in->needFullRow()));
+ InsetOld * in = pit->isInset(i) ? pit->getInset(i) : 0;
// break before a character that will fall off
// the right of the row
if (x >= width) {
- // if no break before or we are at an inset
- // that will take up a row, break here
- if (point == last || fullrow || chunkwidth >= (width - left)) {
+ // if no break before, break here
+ if (point == last || chunkwidth >= (width - left)) {
if (pos < i)
point = i - 1;
else
continue;
}
- if (!fullrow)
- continue;
-
- // full row insets start at a new row
- if (i == pos) {
- if (pos < last - 1) {
- point = i;
- if (pit->isLineSeparator(i + 1))
- ++point;
- } else {
- // to avoid extra rows
- point = last;
- }
- } else {
- point = i - 1;
- }
-
- return point;
+ continue;
}
if (point == last && x >= width) {
// manual labels cannot be broken in LaTeX. But we
// want to make our on-screen rendering of footnotes
// etc. still break
- if (!fullrow && body_pos && point < body_pos)
+ if (body_pos && point < body_pos)
point = body_pos - 1;
return point;
// returns the minimum space a row needs on the screen in pixel
-int LyXText::fill(RowList::iterator row, int paper_width) const
+int LyXText::fill(ParagraphList::iterator pit,
+ RowList::iterator row, int paper_width) const
{
if (paper_width < 0)
return 0;
int w;
// get the pure distance
- pos_type const last = lastPrintablePos(*this, row);
+ pos_type const last = lastPrintablePos(*pit, row);
- ParagraphList::iterator pit = row->par();
LyXLayout_ptr const & layout = pit->layout();
// special handling of the right address boxes
if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
int const tmpfill = row->fill();
row->fill(0); // the minfill in MarginLeft()
- w = leftMargin(*row);
+ w = leftMargin(pit, *row);
row->fill(tmpfill);
} else
- w = leftMargin(*row);
+ w = leftMargin(pit, *row);
pos_type const body_pos = pit->beginningOfBody();
pos_type i = row->pos();
- while (i <= last) {
- if (body_pos > 0 && i == body_pos) {
- w += font_metrics::width(layout->labelsep, getLabelFont(bv()->buffer(), pit));
- if (pit->isLineSeparator(i - 1))
- w -= singleWidth(pit, i - 1);
- int left_margin = labelEnd(*row);
- if (w < left_margin)
- w = left_margin;
+ if (! pit->empty() && i <= last) {
+ // We re-use the font resolution for the entire span when possible
+ LyXFont font = getFont(pit, i);
+ lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
+ while (i <= last) {
+ if (body_pos > 0 && i == body_pos) {
+ w += font_metrics::width(layout->labelsep, getLabelFont(pit));
+ if (pit->isLineSeparator(i - 1))
+ w -= singleWidth(pit, i - 1);
+ int left_margin = labelEnd(pit, *row);
+ if (w < left_margin)
+ w = left_margin;
+ }
+ char const c = pit->getChar(i);
+ if (IsPrintable(c) && i > endPosOfFontSpan) {
+ // We need to get the next font
+ font = getFont(pit, i);
+ endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
+ }
+ w += singleWidth(pit, i, c, font);
+ ++i;
}
- w += singleWidth(pit, i);
- ++i;
}
if (body_pos > 0 && body_pos > last) {
- w += font_metrics::width(layout->labelsep, getLabelFont(bv()->buffer(), pit));
+ w += font_metrics::width(layout->labelsep, getLabelFont(pit));
if (last >= 0 && pit->isLineSeparator(last))
w -= singleWidth(pit, last);
- int const left_margin = labelEnd(*row);
+ int const left_margin = labelEnd(pit, *row);
if (w < left_margin)
w = left_margin;
}
- int const fill = paper_width - w - rightMargin(*bv()->buffer(), *row);
+ int const fill = paper_width - w - rightMargin(pit, *bv()->buffer(), *row);
// If this case happens, it means that our calculation
// of the widths of the chars when we do rowBreakPoint()
if (lyxerr.debugging() && fill < 0) {
lyxerr[Debug::GUI] << "Eek, fill() was < 0: " << fill
<< " w " << w << " paper_width " << paper_width
- << " right margin " << rightMargin(*bv()->buffer(), *row) << endl;
+ << " right margin " << rightMargin(pit, *bv()->buffer(), *row) << endl;
}
-
return fill;
}
// returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(Row const & row) const
+int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const
{
- ParagraphList::iterator pit = row.par();
-
pos_type last = pit->beginningOfBody();
Assert(last > 0);
int fill = 0;
string const & labwidstr = pit->params().labelWidthString();
if (!labwidstr.empty()) {
- LyXFont const labfont = getLabelFont(bv()->buffer(), pit);
+ LyXFont const labfont = getLabelFont(pit);
int const labwidth = font_metrics::width(labwidstr, labfont);
fill = max(labwidth - w, 0);
}
}
-void LyXText::setHeightOfRow(RowList::iterator rit)
+void LyXText::setHeightOfRow(ParagraphList::iterator pit, RowList::iterator rit)
{
- Assert(rit != rows().end());
-
// get the maximum ascent and the maximum descent
- float layoutasc = 0;
- float layoutdesc = 0;
- float tmptop = 0;
- LyXFont tmpfont;
- Inset * tmpinset = 0;
-
- // ok , let us initialize the maxasc and maxdesc value.
- // This depends in LaTeX of the font of the last character
- // in the paragraph. The hack below is necessary because
- // of the possibility of open footnotes
-
- // Correction: only the fontsize count. The other properties
- // are taken from the layoutfont. Nicer on the screen :)
- ParagraphList::iterator pit = rit->par();
+ double layoutasc = 0;
+ double layoutdesc = 0;
+ double tmptop = 0;
+ // ok, let us initialize the maxasc and maxdesc value.
+ // Only the fontsize count. The other properties
+ // are taken from the layoutfont. Nicer on the screen :)
LyXLayout_ptr const & layout = pit->layout();
// as max get the first character of this row then it can increase but not
// decrease the height. Just some point to start with so we don't have to
// do the assignment below too often.
- LyXFont font = getFont(bv()->buffer(), pit, rit->pos());
+ LyXFont font = getFont(pit, rit->pos());
LyXFont::FONT_SIZE const tmpsize = font.size();
- font = getLayoutFont(bv()->buffer(), pit);
+ font = getLayoutFont(pit);
LyXFont::FONT_SIZE const size = font.size();
font.setSize(tmpsize);
- LyXFont labelfont = getLabelFont(bv()->buffer(), pit);
+ LyXFont labelfont = getLabelFont(pit);
- float spacing_val = 1.0;
- if (!pit->params().spacing().isDefault()) {
+ double spacing_val = 1.0;
+ if (!pit->params().spacing().isDefault())
spacing_val = pit->params().spacing().getValue();
- } else {
+ else
spacing_val = bv()->buffer()->params.spacing.getValue();
- }
//lyxerr << "spacing_val = " << spacing_val << endl;
- int maxasc = int(font_metrics::maxAscent(font) *
- layout->spacing.getValue() *
- spacing_val);
+ int maxasc = int(font_metrics::maxAscent(font) *
+ layout->spacing.getValue() * spacing_val);
int maxdesc = int(font_metrics::maxDescent(font) *
- layout->spacing.getValue() *
- spacing_val);
+ layout->spacing.getValue() * spacing_val);
- pos_type const pos_end = lastPos(*this, rit);
+ pos_type const pos_end = lastPos(*pit, rit);
int labeladdon = 0;
int maxwidth = 0;
if (!pit->empty()) {
+ // We re-use the font resolution for the entire font span when possible
+ LyXFont font = getFont(pit, rit->pos());
+ lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(rit->pos());
+
+ // Optimisation
+ Paragraph const & par = *pit;
+
// Check if any insets are larger
for (pos_type pos = rit->pos(); pos <= pos_end; ++pos) {
- if (pit->isInset(pos)) {
- tmpfont = getFont(bv()->buffer(), pit, pos);
- tmpinset = pit->getInset(pos);
- if (tmpinset) {
-#if 1 // this is needed for deep update on initialitation
-#warning inset->update FIXME
- //tmpinset->update(bv());
- Dimension dim;
- MetricsInfo mi;
- mi.base.bv = bv();
- mi.base.font = tmpfont;
- tmpinset->metrics(mi, dim);
-#endif
- //maxwidth += tmpinset->width(bv(), tmpfont);
- //maxasc = max(maxasc,
- // tmpinset->ascent(bv(), tmpfont));
- //maxdesc = max(maxdesc,
- // tmpinset->descent(bv(), tmpfont));
- maxwidth += dim.wid;
- maxasc = max(maxasc, dim.asc);
- maxdesc = max(maxdesc, dim.des);
+ // Manual inlined optimised version of common case of
+ // "maxwidth += singleWidth(pit, pos);"
+ char const c = par.getChar(pos);
+
+ if (IsPrintable(c)) {
+ if (pos > endPosOfFontSpan) {
+ // We need to get the next font
+ font = getFont(pit, pos);
+ endPosOfFontSpan = par.getEndPosOfFontSpan(pos);
+ }
+ if (! font.language()->RightToLeft()) {
+ maxwidth += font_metrics::width(c, font);
+ } else {
+ // Fall-back to normal case
+ maxwidth += singleWidth(pit, pos, c, font);
+ // And flush font cache
+ endPosOfFontSpan = 0;
}
} else {
- maxwidth += singleWidth(pit, pos);
+ // Special handling of insets - are any larger?
+ if (par.isInset(pos)) {
+ InsetOld const * tmpinset = par.getInset(pos);
+ if (tmpinset) {
+ maxwidth += tmpinset->width();
+ maxasc = max(maxasc, tmpinset->ascent());
+ maxdesc = max(maxdesc, tmpinset->descent());
+ }
+ } else {
+ // Fall-back to normal case
+ maxwidth += singleWidth(pit, pos, c, font);
+ // And flush font cache
+ endPosOfFontSpan = 0;
+ }
}
}
}
// there height depends on the font of the nearest character
if (pit->params().lineTop())
- maxasc += 2 * font_metrics::ascent('x', getFont(bv()->buffer(),
- pit, 0));
+ maxasc += 2 * font_metrics::ascent('x', getFont(pit, 0));
// and now the pagebreaks
if (pit->params().pagebreakTop())
maxasc += 3 * defaultRowHeight();
}
labeladdon = int(
- (font_metrics::maxAscent(labelfont) *
- layout->spacing.getValue() *
- spacing_val)
- +(font_metrics::maxDescent(labelfont) *
+ (font_metrics::maxAscent(labelfont) +
+ font_metrics::maxDescent(labelfont)) *
layout->spacing.getValue() *
- spacing_val)
+ spacing_val
+ layout->topsep * defaultRowHeight()
+ layout->labelbottomsep * defaultRowHeight());
}
prev->getLabelWidthString() == pit->getLabelWidthString())
{
layoutasc = (layout->itemsep * defaultRowHeight());
- } else if (rit != rows().begin()) {
+ } else if (rit != firstRow()) {
tmptop = layout->topsep;
- if (boost::prior(pit)->getDepth() >= pit->getDepth())
- tmptop -= boost::prior(rit)->par()->layout()->bottomsep;
+ //if (boost::prior(pit)->getDepth() >= pit->getDepth())
+ // tmptop -= getPar(previousRow(rit))->layout()->bottomsep;
if (tmptop > 0)
layoutasc = (tmptop * defaultRowHeight());
}
// is it a bottom line?
- RowList::iterator next_rit = boost::next(rit);
- if (next_rit == rows().end() || next_rit->par() != pit) {
+ if (boost::next(rit) == pit->rows.end()) {
// the bottom margin
ParagraphList::iterator nextpit = boost::next(pit);
- if (nextpit == ownerParagraphs().end() &&
- !isInInset())
+ if (nextpit == ownerParagraphs().end() && !isInInset())
maxdesc += PAPER_MARGIN;
// add the vertical spaces, that the user added
// there height depends on the font of the nearest character
if (pit->params().lineBottom())
maxdesc += 2 * font_metrics::ascent('x',
- getFont(bv()->buffer(),
- pit,
- max(pos_type(0), pit->size() - 1)));
+ getFont(pit, max(pos_type(0), pit->size() - 1)));
// and now the pagebreaks
if (pit->params().pagebreakBottom())
maxasc += int(layoutasc * 2 / (2 + pit->getDepth()));
maxdesc += int(layoutdesc * 2 / (2 + pit->getDepth()));
- // calculate the new height of the text
- height -= rit->height();
-
rit->height(maxasc + maxdesc + labeladdon);
rit->baseline(maxasc + labeladdon);
-
- height += rit->height();
-
rit->top_of_text(rit->baseline() - font_metrics::maxAscent(font));
- float x = 0;
- if (layout->margintype != MARGIN_RIGHT_ADDRESS_BOX) {
- float dummy;
- // this IS needed
- rit->width(maxwidth);
- prepareToPrint(rit, x, dummy, dummy, dummy, false);
- }
+ double x = 0;
rit->width(int(maxwidth + x));
if (inset_owner) {
width = max(0, workWidth());
- RowList::iterator it = rows().begin();
- RowList::iterator end = rows().end();
- for (; it != end; ++it) {
- if (it->width() > width)
- width = it->width();
+ RowList::iterator rit = firstRow();
+ RowList::iterator end = endRow();
+ ParagraphList::iterator it = ownerParagraphs().begin();
+ while (rit != end) {
+ if (rit->width() > width)
+ width = rit->width();
+ nextRow(it, rit);
}
}
}
-// Appends the implicit specified paragraph before the specified row,
-// start at the implicit given position
-void LyXText::appendParagraph(RowList::iterator rowit)
-{
- Assert(rowit != rowlist_.end());
-
- pos_type const last = rowit->par()->size();
- bool done = false;
-
- do {
- pos_type z = rowBreakPoint(*rowit);
-
- RowList::iterator tmprow = rowit;
-
- if (z < last) {
- ++z;
- Row newrow(rowit->par(), z);
- rowit = rowlist_.insert(boost::next(rowit), newrow);
- } else {
- done = true;
- }
-
- // Set the dimensions of the row
- // fixed fill setting now by calling inset->update() in
- // SingleWidth when needed!
- tmprow->fill(fill(tmprow, workWidth()));
- setHeightOfRow(tmprow);
-
- } while (!done);
-}
-
-
-void LyXText::breakAgain(RowList::iterator rit)
-{
- Assert(rit != rows().end());
-
- bool not_ready = true;
-
- do {
- pos_type z = rowBreakPoint(*rit);
- RowList::iterator tmprit = rit;
- RowList::iterator end = rows().end();
-
- if (z < rit->par()->size()) {
- RowList::iterator next_rit = boost::next(rit);
-
- if (next_rit == end ||
- (next_rit != end &&
- next_rit->par() != rit->par())) {
- // insert a new row
- ++z;
- Row newrow(rit->par(), z);
- rit = rowlist_.insert(next_rit, newrow);
- } else {
- ++rit;
- ++z;
- if (rit->pos() == z)
- not_ready = false; // the rest will not change
- else {
- rit->pos(z);
- }
- }
- } else {
- // if there are some rows too much, delete them
- // only if you broke the whole paragraph!
- RowList::iterator tmprit2 = rit;
- while (boost::next(tmprit2) != end
- && boost::next(tmprit2)->par() == rit->par()) {
- ++tmprit2;
- }
- while (tmprit2 != rit) {
- --tmprit2;
- removeRow(boost::next(tmprit2));
- }
- not_ready = false;
- }
-
- // set the dimensions of the row
- tmprit->fill(fill(tmprit, workWidth()));
- setHeightOfRow(tmprit);
- } while (not_ready);
-}
-
-
-// this is just a little changed version of break again
-void LyXText::breakAgainOneRow(RowList::iterator rit)
-{
- Assert(rit != rows().end());
-
- pos_type z = rowBreakPoint(*rit);
- RowList::iterator tmprit = rit;
- RowList::iterator end = rows().end();
-
- if (z < rit->par()->size()) {
- RowList::iterator next_rit = boost::next(rit);
-
- if (next_rit == end ||
- (next_rit != end &&
- next_rit->par() != rit->par())) {
- // insert a new row
- ++z;
- Row newrow(rit->par(), z);
- rit = rowlist_.insert(next_rit, newrow);
- } else {
- ++rit;
- ++z;
- if (rit->pos() != z)
- rit->pos(z);
- }
- } else {
- // if there are some rows too much, delete them
- // only if you broke the whole paragraph!
- RowList::iterator tmprit2 = rit;
- while (boost::next(tmprit2) != end
- && boost::next(tmprit2)->par() == rit->par()) {
- ++tmprit2;
- }
- while (tmprit2 != rit) {
- --tmprit2;
- removeRow(boost::next(tmprit2));
- }
- }
-
- // set the dimensions of the row
- tmprit->fill(fill(tmprit, workWidth()));
- setHeightOfRow(tmprit);
-}
-
-
void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
{
// allow only if at start or end, or all previous is new text
&& layout->labeltype != LABEL_SENSITIVE)
return;
- setUndo(bv(), Undo::FINISH, cursor.par());
+ recordUndo(bv(), Undo::ATOMIC, cursor.par());
// Always break behind a space
//
if (cursor.pos() < cursor.par()->size()
&& cursor.par()->isLineSeparator(cursor.pos()))
cursor.par()->erase(cursor.pos());
- // cursor.pos(cursor.pos() + 1);
// break the paragraph
if (keep_layout)
// paragraph before or behind and we should react on that one
// but we can fix this in 1.3.0 (Jug 20020509)
bool const isempty = (cursor.par()->allowEmpty() && cursor.par()->empty());
- ::breakParagraph(bv()->buffer()->params, paragraphs, cursor.par(),
+ ::breakParagraph(bv()->buffer()->params, paragraphs, cursor.par(),
cursor.pos(), keep_layout);
+#warning Trouble Point! (Lgb)
+ // When ::breakParagraph is called from within an inset we must
+ // ensure that the correct ParagraphList is used. Today that is not
+ // the case and the Buffer::paragraphs is used. Not good. (Lgb)
+ ParagraphList::iterator next_par = boost::next(cursor.par());
+
// well this is the caption hack since one caption is really enough
if (layout->labeltype == LABEL_SENSITIVE) {
if (!cursor.pos())
cursor.par()->applyLayout(tclass.defaultLayout());
else
// set to standard-layout
- boost::next(cursor.par())->applyLayout(tclass.defaultLayout());
+ next_par->applyLayout(tclass.defaultLayout());
}
// if the cursor is at the beginning of a row without prior newline,
// This touches only the screen-update. Otherwise we would may have
// an empty row on the screen
if (cursor.pos() && cursorRow()->pos() == cursor.pos()
- && !cursorRow()->par()->isNewline(cursor.pos() - 1))
+ && !cursor.par()->isNewline(cursor.pos() - 1))
{
cursorLeft(bv());
}
- postPaint();
-
- removeParagraph(cursorRow());
-
- // set the dimensions of the cursor row
- cursorRow()->fill(fill(cursorRow(), workWidth()));
-
- setHeightOfRow(cursorRow());
-
-#warning Trouble Point! (Lgb)
- // When ::breakParagraph is called from within an inset we must
- // ensure that the correct ParagraphList is used. Today that is not
- // the case and the Buffer::paragraphs is used. Not good. (Lgb)
- ParagraphList::iterator next_par = boost::next(cursor.par());
-
while (!next_par->empty() && next_par->isNewline(0))
next_par->erase(0);
- insertParagraph(next_par, boost::next(cursorRow()));
updateCounters();
+ redoParagraph(cursor.par());
+ redoParagraph(next_par);
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
setCursor(next_par, 0);
else
setCursor(cursor.par(), 0);
-
- if (boost::next(cursorRow()) != rows().end())
- breakAgain(boost::next(cursorRow()));
-
- need_break_row = rows().end();
}
-// Just a macro to make some thing easier.
+// convenience function
void LyXText::redoParagraph()
{
clearSelection();
- redoParagraphs(cursor, boost::next(cursor.par()));
+ redoParagraph(cursor.par());
setCursorIntern(cursor.par(), cursor.pos());
}
// same Paragraph one to the right and make a rebreak
void LyXText::insertChar(char c)
{
- setUndo(bv(), Undo::INSERT, cursor.par());
+ recordUndo(bv(), Undo::INSERT, cursor.par());
// When the free-spacing option is set for the current layout,
// disable the double-space checking
- bool const freeSpacing = cursorRow()->par()->layout()->free_spacing ||
- cursorRow()->par()->isFreeSpacing();
+ bool const freeSpacing = cursor.par()->layout()->free_spacing ||
+ cursor.par()->isFreeSpacing();
if (lyxrc.auto_number) {
static string const number_operators = "+-/*";
!(contains(number_seperators, c) &&
cursor.pos() >= 1 &&
cursor.pos() < cursor.par()->size() &&
- getFont(bv()->buffer(),
- cursor.par(),
- cursor.pos()).number() == LyXFont::ON &&
- getFont(bv()->buffer(),
- cursor.par(),
- cursor.pos() - 1).number() == LyXFont::ON)
+ getFont(cursor.par(), cursor.pos()).number() == LyXFont::ON &&
+ getFont(cursor.par(), cursor.pos() - 1).number() == LyXFont::ON)
)
number(bv()); // Set current_font.number to OFF
} else if (IsDigit(c) &&
cursor.par()->isSeparator(cursor.pos() - 2) ||
cursor.par()->isNewline(cursor.pos() - 2))
) {
- setCharFont(bv()->buffer(),
+ setCharFont(
cursor.par(),
cursor.pos() - 1,
current_font);
} else if (contains(number_seperators, c) &&
cursor.pos() >= 2 &&
- getFont(bv()->buffer(),
+ getFont(
cursor.par(),
cursor.pos() - 2).number() == LyXFont::ON) {
- setCharFont(bv()->buffer(),
+ setCharFont(
cursor.par(),
cursor.pos() - 1,
current_font);
// and it should (along with realtmpfont) when we type the space.
// CHECK There is a bug here! (Asger)
- LyXFont realtmpfont = real_current_font;
- LyXFont rawtmpfont = current_font;
// store the current font. This is because of the use of cursor
// movements. The moving cursor would refresh the current font
-
- // Get the font that is used to calculate the baselineskip
- pos_type const lastpos = cursor.par()->size();
- LyXFont rawparfont =
- cursor.par()->getFontSettings(bv()->buffer()->params,
- lastpos - 1);
-
- bool jumped_over_space = false;
+ LyXFont realtmpfont = real_current_font;
+ LyXFont rawtmpfont = current_font;
if (!freeSpacing && IsLineSeparatorChar(c)) {
if ((cursor.pos() > 0
}
}
- // the display inset stuff
- if (cursorRow()->pos() < cursorRow()->par()->size()
- && cursorRow()->par()->isInset(cursorRow()->pos())) {
- Inset * inset = cursorRow()->par()->getInset(cursorRow()->pos());
- if (inset && (inset->display() || inset->needFullRow())) {
- // force a new break
- cursorRow()->fill(-1); // to force a new break
- }
- }
-
- // get the cursor row fist
- RowList::iterator row = cursorRow();
- if (c != Paragraph::META_INSET) {
- // Here case LyXText::InsertInset already inserted the character
+ // Here case LyXText::InsertInset already inserted the character
+ if (c != Paragraph::META_INSET)
cursor.par()->insertChar(cursor.pos(), c);
- }
- setCharFont(bv()->buffer(), cursor.par(), cursor.pos(), rawtmpfont);
-
- if (!jumped_over_space) {
- // refresh the positions
- RowList::iterator tmprow = row;
- while (boost::next(tmprow) != rows().end() &&
- boost::next(tmprow)->par() == row->par()) {
- ++tmprow;
- tmprow->pos(tmprow->pos() + 1);
- }
- }
-
- // Is there a break one row above
- if (row != rows().begin() &&
- boost::prior(row)->par() == row->par()
- && (cursor.par()->isLineSeparator(cursor.pos())
- || cursor.par()->isNewline(cursor.pos())
- || ((cursor.pos() + 1 < cursor.par()->size()) &&
- cursor.par()->isInset(cursor.pos() + 1))
- || cursorRow()->fill() == -1))
- {
- pos_type z = rowBreakPoint(*boost::prior(row));
-
- if (z >= row->pos()) {
- row->pos(z + 1);
-
- // set the dimensions of the row above
- boost::prior(row)->fill(fill(
- boost::prior(row),
- workWidth()));
-
- setHeightOfRow(boost::prior(row));
-
- postPaint();
-
- breakAgainOneRow(row);
- current_font = rawtmpfont;
- real_current_font = realtmpfont;
- setCursor(cursor.par(), cursor.pos() + 1,
- false, cursor.boundary());
- // cursor MUST be in row now.
-
- RowList::iterator next_row = boost::next(row);
- if (next_row != rows().end() &&
- next_row->par() == row->par())
- need_break_row = next_row;
- else
- need_break_row = rows().end();
-
- // check, wether the last characters font has changed.
- if (cursor.pos() && cursor.pos() == cursor.par()->size()
- && rawparfont != rawtmpfont)
- redoHeightOfParagraph();
-
- charInserted();
- return;
- }
- }
-
- // recalculate the fill of the row
- if (row->fill() >= 0) {
- // needed because a newline will set fill to -1. Otherwise
- // we would not get a rebreak!
- row->fill(fill(row, workWidth()));
- }
+ setCharFont(cursor.par(), cursor.pos(), rawtmpfont);
- if (c == Paragraph::META_INSET || row->fill() < 0) {
- postPaint();
- breakAgainOneRow(row);
-
- RowList::iterator next_row = boost::next(row);
-
- // will the cursor be in another row now?
- if (lastPos(*this, row) <= cursor.pos() + 1 &&
- next_row != rows().end()) {
- if (next_row != rows().end() &&
- next_row->par() == row->par()) {
- // this should always be true
- ++row;
- }
-
- breakAgainOneRow(row);
- }
- current_font = rawtmpfont;
- real_current_font = realtmpfont;
-
- setCursor(cursor.par(), cursor.pos() + 1, false,
- cursor.boundary());
- if (isBoundary(bv()->buffer(), *cursor.par(), cursor.pos())
- != cursor.boundary())
- setCursor(cursor.par(), cursor.pos(), false,
- !cursor.boundary());
-
- next_row = boost::next(row);
-
- if (next_row != rows().end() &&
- next_row->par() == row->par())
- need_break_row = next_row;
- else
- need_break_row = rows().end();
- } else {
- // FIXME: similar code is duplicated all over - make resetHeightOfRow
- setHeightOfRow(row);
- postPaint();
-
- current_font = rawtmpfont;
- real_current_font = realtmpfont;
- setCursor(cursor.par(), cursor.pos() + 1, false,
- cursor.boundary());
- }
-
- // check, wether the last characters font has changed.
- if (cursor.pos() && cursor.pos() == cursor.par()->size()
- && rawparfont != rawtmpfont) {
- redoHeightOfParagraph();
- }
+ current_font = rawtmpfont;
+ real_current_font = realtmpfont;
+ redoParagraph(cursor.par());
+ setCursor(cursor.par(), cursor.pos() + 1, false, cursor.boundary());
charInserted();
}
void LyXText::charInserted()
{
- // Here we could call FinishUndo for every 20 characters inserted.
+ // Here we could call finishUndo for every 20 characters inserted.
// This is from my experience how emacs does it. (Lgb)
static unsigned int counter;
if (counter < 20) {
}
-void LyXText::prepareToPrint(RowList::iterator rit, float & x,
- float & fill_separator,
- float & fill_hfill,
- float & fill_label_hfill,
- bool bidi) const
+void LyXText::prepareToPrint(ParagraphList::iterator pit,
+ RowList::iterator const rit) const
{
- float w = rit->fill();
- fill_hfill = 0;
- fill_label_hfill = 0;
- fill_separator = 0;
- fill_label_hfill = 0;
-
- ParagraphList::iterator pit = rit->par();
+ double w = rit->fill();
+ double fill_hfill = 0;
+ double fill_label_hfill = 0;
+ double fill_separator = 0;
+ double x = 0;
bool const is_rtl =
pit->isRightToLeftPar(bv()->buffer()->params);
- if (is_rtl) {
- x = (workWidth() > 0)
- ? rightMargin(*bv()->buffer(), *rit) : 0;
- } else
- x = (workWidth() > 0)
- ? leftMargin(*rit) : 0;
+ if (is_rtl)
+ x = workWidth() > 0 ? rightMargin(pit, *bv()->buffer(), *rit) : 0;
+ else
+ x = workWidth() > 0 ? leftMargin(pit, *rit) : 0;
// is there a manual margin with a manual label
LyXLayout_ptr const & layout = pit->layout();
if (layout->margintype == MARGIN_MANUAL
&& layout->labeltype == LABEL_MANUAL) {
/// We might have real hfills in the label part
- float nlh = numberOfLabelHfills(*this, rit);
+ int nlh = numberOfLabelHfills(*pit, rit);
// A manual label par (e.g. List) has an auto-hfill
// between the label text and the body of the
++nlh;
if (nlh && !pit->getLabelWidthString().empty()) {
- fill_label_hfill = labelFill(*rit) / nlh;
+ fill_label_hfill = labelFill(pit, *rit) / double(nlh);
}
}
// are there any hfills in the row?
- float const nh = numberOfHfills(*this, rit);
+ int const nh = numberOfHfills(*pit, rit);
if (nh) {
if (w > 0)
// we don't have to look at the alignment if it is ALIGN_LEFT and
// if the row is already larger then the permitted width as then
// we force the LEFT_ALIGN'edness!
- } else if (static_cast<int>(rit->width()) < workWidth()) {
+ } else if (int(rit->width()) < workWidth()) {
// is it block, flushleft or flushright?
// set x how you need it
int align;
} else {
align = pit->params().align();
}
-
- // center displayed insets
- Inset * inset = 0;
- if (rit->pos() < pit->size()
- && pit->isInset(rit->pos())
- && (inset = pit->getInset(rit->pos()))
- && (inset->display())) // || (inset->scroll() < 0)))
- align = (inset->lyxCode() == Inset::MATHMACRO_CODE)
- ? LYX_ALIGN_BLOCK : LYX_ALIGN_CENTER;
+ InsetOld * inset = 0;
// ERT insets should always be LEFT ALIGNED on screen
inset = pit->inInset();
if (inset && inset->owner() &&
- inset->owner()->lyxCode() == Inset::ERT_CODE)
+ inset->owner()->lyxCode() == InsetOld::ERT_CODE)
{
align = LYX_ALIGN_LEFT;
}
switch (align) {
case LYX_ALIGN_BLOCK:
- {
- float const ns = numberOfSeparators(*this, rit);
+ {
+ int const ns = numberOfSeparators(*pit, rit);
RowList::iterator next_row = boost::next(rit);
- ParagraphList::iterator next_pit = next_row->par();
-
- if (ns && next_row != rowlist_.end() &&
- next_pit == pit &&
- !(next_pit->isNewline(next_row->pos() - 1))
- && !(next_pit->isInset(next_row->pos()) &&
- next_pit->getInset(next_row->pos()) &&
- next_pit->getInset(next_row->pos())->display())
+ if (ns
+ && next_row != pit->rows.end()
+ && !pit->isNewline(next_row->pos() - 1)
) {
- fill_separator = w / ns;
+ fill_separator = w / ns;
} else if (is_rtl) {
x += w;
}
break;
}
}
- if (!bidi)
- return;
- computeBidiTables(bv()->buffer(), rit);
+ computeBidiTables(pit, *bv()->buffer(), rit);
if (is_rtl) {
pos_type body_pos = pit->beginningOfBody();
- pos_type last = lastPos(*this, rit);
+ pos_type last = lastPos(*pit, rit);
if (body_pos > 0 &&
- (body_pos - 1 > last ||
- !pit->isLineSeparator(body_pos - 1))) {
- x += font_metrics::width(layout->labelsep,
- getLabelFont(bv()->buffer(),
- pit));
+ (body_pos - 1 > last ||
+ !pit->isLineSeparator(body_pos - 1))) {
+ x += font_metrics::width(layout->labelsep, getLabelFont(pit));
if (body_pos - 1 <= last)
x += fill_label_hfill;
}
}
+
+ rit->fill_hfill(fill_hfill);
+ rit->fill_label_hfill(fill_label_hfill);
+ rit->fill_separator(fill_separator);
+ rit->x(x);
}
if (selection.start.par() == selection.end.par()) {
LyXCursor & startc = selection.start;
LyXCursor & endc = selection.end;
- setUndo(bv(), Undo::INSERT, startc.par());
+ recordUndo(bv(), Undo::INSERT, startc.par());
startc.par()->acceptChange(startc.pos(), endc.pos());
finishUndo();
clearSelection();
- redoParagraphs(startc, boost::next(startc.par()));
+ redoParagraph(startc.par());
setCursorIntern(startc.par(), 0);
}
#warning handle multi par selection
if (selection.start.par() == selection.end.par()) {
LyXCursor & startc = selection.start;
LyXCursor & endc = selection.end;
- setUndo(bv(), Undo::INSERT, startc.par());
+ recordUndo(bv(), Undo::INSERT, startc.par());
startc.par()->rejectChange(startc.pos(), endc.pos());
finishUndo();
clearSelection();
- redoParagraphs(startc, boost::next(startc.par()));
+ redoParagraph(startc.par());
setCursorIntern(startc.par(), 0);
}
#warning handle multi par selection
// Start the selection from here
selection.cursor = cursor;
- string lang_code(
- getFont(bv()->buffer(), cursor.par(), cursor.pos())
- .language()->code());
+ string lang_code = getFont(cursor.par(), cursor.pos()).language()->code();
// and find the end of the word (insets like optional hyphens
// and ligature break are part of a word)
while (cursor.pos() < cursor.par()->size()
// now find the end of the word
while (cursor.pos() < cursor.par()->size()
- && (cursor.par()->isLetter(cursor.pos())))
+ && cursor.par()->isLetter(cursor.pos()))
cursor.pos(cursor.pos() + 1);
setCursor(cursor.par(), cursor.pos());
setCursor(to.par(), to.pos() + 1);
}
- setUndo(bv(), Undo::FINISH, from.par(), to.par());
+ recordUndo(bv(), Undo::ATOMIC, from.par(), to.par());
pos_type pos = from.pos();
ParagraphList::iterator pit = from.par();
}
#warning changes
pit->setChar(pos, c);
- checkParagraph(pit, pos);
-
++pos;
}
-
- if (getRow(to) != getRow(from))
- postPaint();
}
LyXCursor tmpcursor = cursor;
// to make sure undo gets the right cursor position
cursor = old_cursor;
- setUndo(bv(), Undo::DELETE, cursor.par());
+ recordUndo(bv(), Undo::DELETE, cursor.par());
cursor = tmpcursor;
backspace();
}
{
// Get the font that is used to calculate the baselineskip
pos_type lastpos = cursor.par()->size();
- LyXFont rawparfont =
- cursor.par()->getFontSettings(bv()->buffer()->params,
- lastpos - 1);
if (cursor.pos() == 0) {
// The cursor is at the beginning of a paragraph,
// is it an empty paragraph?
- if ((lastpos == 0
- || (lastpos == 1 && cursor.par()->isSeparator(0)))) {
- // This is an empty paragraph and we delete it just by moving the cursor one step
- // left and let the DeleteEmptyParagraphMechanism handle the actual deletion
- // of the paragraph.
+ if (lastpos == 0
+ || (lastpos == 1 && cursor.par()->isSeparator(0))) {
+ // This is an empty paragraph and we delete it just
+ // by moving the cursor one step
+ // left and let the DeleteEmptyParagraphMechanism
+ // handle the actual deletion of the paragraph.
if (cursor.par() != ownerParagraphs().begin()) {
ParagraphList::iterator tmppit = boost::prior(cursor.par());
cursorLeft(bv());
// the layout things can change the height of a row !
- int const tmpheight = cursorRow()->height();
- setHeightOfRow(cursorRow());
- if (cursorRow()->height() != tmpheight)
- postPaint();
+ redoParagraph();
return;
}
}
if (cursor.par() != ownerParagraphs().begin()) {
- setUndo(bv(), Undo::DELETE,
+ recordUndo(bv(), Undo::DELETE,
boost::prior(cursor.par()),
cursor.par());
}
ParagraphList::iterator tmppit = cursor.par();
- RowList::iterator tmprow = cursorRow();
-
// We used to do cursorLeftIntern() here, but it is
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// Pasting is not allowed, if the paragraphs have different
// layout. I think it is a real bug of all other
// word processors to allow it. It confuses the user.
- // Even so with a footnote paragraph and a non-footnote
- // paragraph. I will not allow pasting in this case,
- // because the user would be confused if the footnote behaves
- // different wether it is open or closed.
-
- // Correction: Pasting is always allowed with standard-layout
+ // Correction: Pasting is always allowed with standard-layout
LyXTextClass const & tclass =
bv()->buffer()->params.getLyXTextClass();
&& (cursor.par()->layout() == tmppit->layout()
|| tmppit->layout() == tclass.defaultLayout())
&& cursor.par()->getAlign() == tmppit->getAlign()) {
- removeParagraph(tmprow);
- removeRow(tmprow);
- mergeParagraph(bv()->buffer()->params, bv()->buffer()->paragraphs, cursor.par());
-
- if (!cursor.pos() || !cursor.par()->isSeparator(cursor.pos() - 1))
- ; //cursor.par()->insertChar(cursor.pos(), ' ');
- // strangely enough it seems that commenting out the line above removes
- // most or all of the segfaults. I will however also try to move the
- // two Remove... lines in front of the PasteParagraph too.
- else
- if (cursor.pos())
- cursor.pos(cursor.pos() - 1);
-
- postPaint();
-
- // remove the lost paragraph
- // This one is not safe, since the paragraph that the tmprow and the
- // following rows belong to has been deleted by the PasteParagraph
- // above. The question is... could this be moved in front of the
- // PasteParagraph?
- //RemoveParagraph(tmprow);
- //RemoveRow(tmprow);
-
- // This rebuilds the rows.
- appendParagraph(cursorRow());
- updateCounters();
+ mergeParagraph(bv()->buffer()->params,
+ bv()->buffer()->paragraphs, cursor.par());
+
+ if (cursor.pos() && cursor.par()->isSeparator(cursor.pos() - 1))
+ cursor.pos(cursor.pos() - 1);
// the row may have changed, block, hfills etc.
+ updateCounters();
setCursor(cursor.par(), cursor.pos(), false);
}
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
- setUndo(bv(), Undo::DELETE, cursor.par());
+ recordUndo(bv(), Undo::DELETE, cursor.par());
// We used to do cursorLeftIntern() here, but it is
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- setCursorIntern(cursor.par(), cursor.pos()- 1,
+ setCursorIntern(cursor.par(), cursor.pos() - 1,
false, cursor.boundary());
-
- if (cursor.par()->isInset(cursor.pos())) {
- // force complete redo when erasing display insets
- // this is a cruel method but safe..... Matthias
- if (cursor.par()->getInset(cursor.pos())->display() ||
- cursor.par()->getInset(cursor.pos())->needFullRow()) {
- cursor.par()->erase(cursor.pos());
- redoParagraph();
- return;
- }
- }
-
- RowList::iterator row = cursorRow();
- int y = cursor.y() - row->baseline();
- pos_type z;
- // remember that a space at the end of a row doesnt count
- // when calculating the fill
- if (cursor.pos() < lastPos(*this, row) ||
- !cursor.par()->isLineSeparator(cursor.pos())) {
- row->fill(row->fill() + singleWidth(
- cursor.par(),
- cursor.pos()));
- }
-
- // some special code when deleting a newline. This is similar
- // to the behavior when pasting paragraphs
- if (cursor.pos() && cursor.par()->isNewline(cursor.pos())) {
- cursor.par()->erase(cursor.pos());
- // refresh the positions
- RowList::iterator tmprow = row;
- while (boost::next(tmprow) != rows().end() &&
- boost::next(tmprow)->par() == row->par()) {
- ++tmprow;
- tmprow->pos(tmprow->pos() - 1);
- }
- if (cursor.par()->isLineSeparator(cursor.pos() - 1))
- cursor.pos(cursor.pos() - 1);
-
- if (cursor.pos() < cursor.par()->size()
- && !cursor.par()->isSeparator(cursor.pos())) {
- cursor.par()->insertChar(cursor.pos(), ' ');
- setCharFont(bv()->buffer(), cursor.par(),
- cursor.pos(), current_font);
- // refresh the positions
- tmprow = row;
- while (boost::next(tmprow) != rows().end() &&
- boost::next(tmprow)->par() == row->par()) {
- ++tmprow;
- tmprow->pos(tmprow->pos() + 1);
- }
- }
- } else {
- cursor.par()->erase(cursor.pos());
-
- // refresh the positions
- RowList::iterator tmprow = row;
- while (boost::next(tmprow) != rows().end() &&
- boost::next(tmprow)->par() == row->par()) {
- ++tmprow;
- tmprow->pos(tmprow->pos() - 1);
- }
-
- // delete newlines at the beginning of paragraphs
- while (!cursor.par()->empty() &&
- cursor.pos() < cursor.par()->size() &&
- cursor.par()->isNewline(cursor.pos()) &&
- cursor.pos() == cursor.par()->beginningOfBody()) {
- cursor.par()->erase(cursor.pos());
- // refresh the positions
- tmprow = row;
- while (boost::next(tmprow) != rows().end() &&
- boost::next(tmprow)->par() == row->par()) {
- ++tmprow;
- tmprow->pos(tmprow->pos() - 1);
- }
- }
- }
-
- // is there a break one row above
- if (row != rows().begin() && boost::prior(row)->par() == row->par()) {
- z = rowBreakPoint(*boost::prior(row));
- if (z >= row->pos()) {
- row->pos(z + 1);
-
- RowList::iterator tmprow = boost::prior(row);
-
- // maybe the current row is now empty
- if (row->pos() >= row->par()->size()) {
- // remove it
- removeRow(row);
- need_break_row = rows().end();
- } else {
- breakAgainOneRow(row);
- if (boost::next(row) != rows().end() &&
- boost::next(row)->par() == row->par())
- need_break_row = boost::next(row);
- else
- need_break_row = rows().end();
- }
-
- // set the dimensions of the row above
- y -= tmprow->height();
- tmprow->fill(fill(tmprow, workWidth()));
- setHeightOfRow(tmprow);
- postPaint();
-
- setCursor(cursor.par(), cursor.pos(),
- false, cursor.boundary());
- //current_font = rawtmpfont;
- //real_current_font = realtmpfont;
- // check, whether the last character's font has changed.
- if (rawparfont !=
- cursor.par()->getFontSettings(bv()->buffer()->params,
- cursor.par()->size() - 1))
- redoHeightOfParagraph();
- return;
- }
- }
-
- // break the cursor row again
- if (boost::next(row) != rows().end() &&
- boost::next(row)->par() == row->par() &&
- (lastPos(*this, row) == row->par()->size() - 1 ||
- rowBreakPoint(*row) != lastPos(*this, row))) {
-
- // it can happen that a paragraph loses one row
- // without a real breakup. This is when a word
- // is to long to be broken. Well, I don t care this
- // hack ;-)
- if (lastPos(*this, row) == row->par()->size() - 1)
- removeRow(boost::next(row));
-
- postPaint();
-
- breakAgainOneRow(row);
- // will the cursor be in another row now?
- if (boost::next(row) != rows().end() &&
- boost::next(row)->par() == row->par() &&
- lastPos(*this, row) <= cursor.pos()) {
- ++row;
- breakAgainOneRow(row);
- }
-
- setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
-
- if (boost::next(row) != rows().end() &&
- boost::next(row)->par() == row->par())
- need_break_row = boost::next(row);
- else
- need_break_row = rows().end();
- } else {
- // set the dimensions of the row
- row->fill(fill(row, workWidth()));
- setHeightOfRow(row);
- postPaint();
- setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
- }
+ cursor.par()->erase(cursor.pos());
}
- // current_font = rawtmpfont;
- // real_current_font = realtmpfont;
-
- if (isBoundary(bv()->buffer(), *cursor.par(), cursor.pos())
- != cursor.boundary())
- setCursor(cursor.par(), cursor.pos(), false,
- !cursor.boundary());
-
lastpos = cursor.par()->size();
if (cursor.pos() == lastpos)
setCurrentFont();
- // check, whether the last characters font has changed.
- if (rawparfont !=
- cursor.par()->getFontSettings(bv()->buffer()->params, lastpos - 1)) {
- redoHeightOfParagraph();
- }
+ redoParagraph();
+ setCursor(cursor.par(), cursor.pos(), false, !cursor.boundary());
}
RowList::iterator
LyXText::getRow(ParagraphList::iterator pit, pos_type pos) const
{
- if (rows().empty())
- return rowlist_.end();
-
- // find the first row of the specified paragraph
- RowList::iterator rit = rowlist_.begin();
- RowList::iterator end = rowlist_.end();
- while (boost::next(rit) != end && rit->par() != pit) {
- ++rit;
- }
+ RowList::iterator rit = boost::prior(pit->rows.end());
+ RowList::iterator const begin = pit->rows.begin();
- // now find the wanted row
- while (rit->pos() < pos
- && boost::next(rit) != end
- && boost::next(rit)->par() == pit
- && boost::next(rit)->pos() <= pos) {
- ++rit;
- }
+ while (rit != begin && rit->pos() > pos)
+ --rit;
return rit;
}
-// returns pointer to a specified row
-RowList::iterator
-LyXText::getRow(ParagraphList::iterator pit, pos_type pos, int & y) const
+
+// returns pointer to some fancy row 'below' specified row
+RowList::iterator LyXText::cursorIRow() const
{
- y = 0;
+ return getRow(cursor.par(), cursor.pos());
+}
- if (rows().empty())
- return rowlist_.end();
- // find the first row of the specified paragraph
- RowList::iterator rit = rowlist_.begin();
- RowList::iterator end = rowlist_.end();
- while (boost::next(rit) != end && rit->par() != pit) {
- y += rit->height();
- ++rit;
- }
+RowList::iterator LyXText::getRowNearY(int y,
+ ParagraphList::iterator & pit) const
+{
+ //lyxerr << "getRowNearY: y " << y << endl;
- // now find the wanted row
- while (rit->pos() < pos
- && boost::next(rit) != end
- && boost::next(rit)->par() == pit
- && boost::next(rit)->pos() <= pos) {
- y += rit->height();
- ++rit;
- }
+ pit = boost::prior(ownerParagraphs().end());
+
+ RowList::iterator rit = lastRow();
+ RowList::iterator rbegin = firstRow();
+
+ while (rit != rbegin && static_cast<int>(rit->y()) > y)
+ previousRow(pit, rit);
return rit;
}
-// returns pointer to some fancy row 'below' specified row
-RowList::iterator LyXText::cursorIRow() const
+
+int LyXText::getDepth() const
{
- int y = 0;
- return getRow(cursor.par(), cursor.pos(), y);
+ return cursor.par()->getDepth();
}
-RowList::iterator LyXText::getRowNearY(int & y) const
+RowList::iterator LyXText::firstRow() const
{
- RowList::iterator rit = anchor_row_;
- RowList::iterator const beg = rows().begin();
- RowList::iterator const end = rows().end();
+ return ownerParagraphs().front().rows.begin();
+}
- if (rows().empty()) {
- y = 0;
- return end;
- }
- if (rit == end)
- rit = beg;
- int tmpy = rit->y();
+RowList::iterator LyXText::lastRow() const
+{
+ return boost::prior(endRow());
+}
- if (tmpy <= y) {
- while (rit != end && tmpy <= y) {
- tmpy += rit->height();
- ++rit;
- }
- if (rit != beg) {
- --rit;
- tmpy -= rit->height();
- }
- } else {
- while (rit != beg && tmpy > y) {
- --rit;
- tmpy -= rit->height();
- }
- }
- if (tmpy < 0 || rit == end) {
- tmpy = 0;
- rit = beg;
+
+RowList::iterator LyXText::endRow() const
+{
+ return ownerParagraphs().back().rows.end();
+}
+
+
+void LyXText::nextRow(ParagraphList::iterator & pit,
+ RowList::iterator & rit) const
+{
+ ++rit;
+ if (rit == pit->rows.end()) {
+ ++pit;
+ if (pit == ownerParagraphs().end())
+ --pit;
+ else
+ rit = pit->rows.begin();
}
+}
- // return the rel y
- y = tmpy;
- return rit;
+void LyXText::previousRow(ParagraphList::iterator & pit,
+ RowList::iterator & rit) const
+{
+ if (rit != pit->rows.begin())
+ --rit;
+ else {
+ Assert(pit != ownerParagraphs().begin());
+ --pit;
+ rit = boost::prior(pit->rows.end());
+ }
}
-int LyXText::getDepth() const
+bool LyXText::noRows() const
{
- return cursor.par()->getDepth();
+ return ownerParagraphs().begin()->rows.empty();
}
projects / lyx.git / blobdiff