-/* This file is part of
- * ======================================================
+/**
+ * \file src/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 "paragraph.h"
-#include "gettext.h"
-#include "bufferparams.h"
+
#include "buffer.h"
+#include "bufferparams.h"
+#include "BufferView.h"
#include "debug.h"
-#include "intl.h"
-#include "lyxrc.h"
#include "encoding.h"
-#include "frontends/LyXView.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
-#include "frontends/screen.h"
-#include "frontends/WorkArea.h"
-#include "bufferview_funcs.h"
-#include "BufferView.h"
+#include "funcrequest.h"
+#include "gettext.h"
#include "language.h"
+#include "LColor.h"
+#include "lyxlength.h"
+#include "lyxrc.h"
+#include "lyxrow.h"
+#include "lyxrow_funcs.h"
+#include "metricsinfo.h"
+#include "paragraph.h"
+#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
-#include "undo_funcs.h"
+#include "rowpainter.h"
#include "text_funcs.h"
+#include "undo.h"
+#include "vspace.h"
#include "WordLangTuple.h"
-#include "paragraph_funcs.h"
-#include "rowpainter.h"
-#include "lyxrow_funcs.h"
-#include "metricsinfo.h"
+
+#include "frontends/font_metrics.h"
+#include "frontends/LyXView.h"
#include "insets/insettext.h"
-#include "support/textutils.h"
-#include "support/LAssert.h"
#include "support/lstrings.h"
+#include "support/textutils.h"
-#include <algorithm>
+using bv_funcs::number;
+
+using lyx::pos_type;
+using lyx::word_location;
-using namespace lyx::support;
+using lyx::support::contains;
+using lyx::support::lowercase;
+using lyx::support::uppercase;
using std::max;
-using std::min;
using std::endl;
-using std::pair;
+using std::string;
-using lyx::pos_type;
-using lyx::word_location;
-
-using namespace bv_funcs;
/// top, right, bottom pixel margin
extern int const PAPER_MARGIN = 20;
/// left margin
extern int const LEFT_MARGIN = PAPER_MARGIN + CHANGEBAR_MARGIN;
+
+
int bibitemMaxWidth(BufferView *, LyXFont const &);
BufferView * LyXText::bv()
{
- Assert(bv_owner != 0);
+ BOOST_ASSERT(bv_owner != 0);
return bv_owner;
}
BufferView * LyXText::bv() const
{
- Assert(bv_owner != 0);
+ BOOST_ASSERT(bv_owner != 0);
return bv_owner;
}
{
ParagraphList::iterator pit = ownerParagraphs().begin();
ParagraphList::iterator end = ownerParagraphs().end();
- for (int y = 0; pit != end; ++pit) {
- RowList::iterator rit = pit->rows.begin();
- RowList::iterator rend = pit->rows.end();
- for ( ; rit != rend ; rit = ++rit) {
- rit->y(y);
- y += rit->height();
- }
+ for (height = 0; pit != end; ++pit) {
+ pit->y = height;
+ height += pit->height;
}
}
-int LyXText::top_y() const
-{
- return anchor_y_;
-}
-
-
-void LyXText::top_y(int newy)
-{
- anchor_y_ = newy;
- lyxerr[Debug::GUI] << "changing reference to offset: " << anchor_y_ << endl;
-}
-
-
int LyXText::workWidth() const
{
return inset_owner ? inset_owner->textWidth() : bv()->workWidth();
int LyXText::getRealCursorX() const
{
int x = cursor.x();
- if (the_locking_inset && (the_locking_inset->getLyXText(bv())!= this))
+ if (the_locking_inset && the_locking_inset->getLyXText(bv()) != this)
x = the_locking_inset->getLyXText(bv())->getRealCursorX();
return x;
}
// There are some issues in this file and I don't think they are
// really related to the FIX_DOUBLE_SPACE patch. I'd rather think that
// this is a problem that has been here almost from day one and that a
-// larger userbase with differenct access patters triggers the bad
+// larger userbase with different access patters triggers the bad
// behaviour. (segfaults.) What I think happen is: In several places
// we store the paragraph in the current cursor and then moves the
// cursor. This movement of the cursor will delete paragraph at the
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;
+ BOOST_ASSERT(false);
return 0;
+ }
- LyXFont const & font = getFont(pit, pos);
// The most common case is handled first (Asger)
if (IsPrintable(c)) {
- if (font.language()->RightToLeft()) {
+ if (!font.language()->RightToLeft()) {
if ((lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
lyxrc.font_norm_type == LyXRC::ISO_10646_1)
&& font.language()->lang() == "arabic") {
if (c == Paragraph::META_INSET) {
InsetOld * tmpinset = pit->getInset(pos);
- Assert(tmpinset);
+ BOOST_ASSERT(tmpinset);
if (tmpinset->lyxCode() == InsetOld::HFILL_CODE) {
// Because of the representation as vertical lines
return 3;
lyx::pos_type LyXText::log2vis(lyx::pos_type pos) const
{
- if (bidi_start == -1)
- return pos;
- else
- return log2vis_list[pos - bidi_start];
+ return (bidi_start == -1) ? pos : log2vis_list[pos - bidi_start];
}
lyx::pos_type LyXText::vis2log(lyx::pos_type pos) const
{
- if (bidi_start == -1)
- return pos;
- else
- return vis2log_list[pos - bidi_start];
+ return (bidi_start == -1) ? pos : vis2log_list[pos - bidi_start];
}
lyx::pos_type LyXText::bidi_level(lyx::pos_type pos) const
{
- if (bidi_start == -1)
- return 0;
- else
- return bidi_levels[pos - bidi_start];
+ return (bidi_start == -1) ? 0 : bidi_levels[pos - bidi_start];
}
bool LyXText::bidi_InRange(lyx::pos_type pos) const
{
- return bidi_start == -1 ||
- (bidi_start <= pos && pos <= bidi_end);
+ return bidi_start == -1 || (bidi_start <= pos && pos <= bidi_end);
}
-void LyXText::computeBidiTables(ParagraphList::iterator pit,
- Buffer const * buf, RowList::iterator row) const
+void LyXText::computeBidiTables(Paragraph const & par,
+ Buffer const & buf, Row & row) const
{
bidi_same_direction = true;
if (!lyxrc.rtl_support) {
return;
}
- InsetOld * inset = pit->inInset();
+ InsetOld * inset = par.inInset();
if (inset && inset->owner() &&
inset->owner()->lyxCode() == InsetOld::ERT_CODE) {
bidi_start = -1;
return;
}
- bidi_start = row->pos();
- bidi_end = lastPrintablePos(*pit, row);
+ bidi_start = row.pos();
+ bidi_end = lastPos(par, row);
if (bidi_start > bidi_end) {
bidi_start = -1;
vis2log_list[bidi_end + 1 - bidi_start] = -1;
log2vis_list[bidi_end + 1 - bidi_start] = -1;
+ BufferParams const & bufparams = buf.params();
pos_type stack[2];
- bool const rtl_par =
- pit->isRightToLeftPar(buf->params);
+ bool const rtl_par = par.isRightToLeftPar(bufparams);
int level = 0;
bool rtl = false;
bool rtl0 = false;
- pos_type const body_pos = pit->beginningOfBody();
+ pos_type const body_pos = par.beginningOfBody();
for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) {
- bool is_space = pit->isLineSeparator(lpos);
+ bool is_space = par.isLineSeparator(lpos);
pos_type const pos =
(is_space && lpos + 1 <= bidi_end &&
- !pit->isLineSeparator(lpos + 1) &&
- !pit->isNewline(lpos + 1))
+ !par.isLineSeparator(lpos + 1) &&
+ !par.isNewline(lpos + 1))
? lpos + 1 : lpos;
- LyXFont font = pit->getFontSettings(buf->params, pos);
+ LyXFont font = par.getFontSettings(bufparams, pos);
if (pos != lpos && 0 < lpos && rtl0 && font.isRightToLeft() &&
font.number() == LyXFont::ON &&
- pit->getFontSettings(buf->params, lpos - 1).number()
+ par.getFontSettings(bufparams, lpos - 1).number()
== LyXFont::ON) {
- font = pit->getFontSettings(buf->params, lpos);
+ font = par.getFontSettings(bufparams, lpos);
is_space = false;
}
-
bool new_rtl = font.isVisibleRightToLeft();
bool new_rtl0 = font.isRightToLeft();
int new_level;
if (lpos == body_pos - 1
- && row->pos() < body_pos - 1
+ && row.pos() < body_pos - 1
&& is_space) {
- new_level = (rtl_par) ? 1 : 0;
- new_rtl = new_rtl0 = rtl_par;
+ new_level = rtl_par ? 1 : 0;
+ new_rtl0 = rtl_par;
+ new_rtl = rtl_par;
} else if (new_rtl0)
- new_level = (new_rtl) ? 1 : 2;
+ new_level = new_rtl ? 1 : 2;
else
- new_level = (rtl_par) ? 2 : 0;
+ new_level = rtl_par ? 2 : 0;
if (is_space && new_level >= level) {
new_level = level;
if (level == new_level && rtl0 != new_rtl0) {
--new_level2;
- log2vis_list[lpos - bidi_start] = (rtl) ? 1 : -1;
+ log2vis_list[lpos - bidi_start] = rtl ? 1 : -1;
} else if (level < new_level) {
- log2vis_list[lpos - bidi_start] = (rtl) ? -1 : 1;
+ log2vis_list[lpos - bidi_start] = rtl ? -1 : 1;
if (new_level > rtl_par)
bidi_same_direction = false;
} else
- log2vis_list[lpos - bidi_start] = (new_rtl) ? -1 : 1;
+ log2vis_list[lpos - bidi_start] = new_rtl ? -1 : 1;
rtl = new_rtl;
rtl0 = new_rtl0;
bidi_levels[lpos - bidi_start] = new_level;
// 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)
return false;
if (!bidi_InRange(pos - 1)) {
- /// This can happen if pos is the first char of a row.
- /// Returning false in this case is incorrect!
+ // This can happen if pos is the first char of a row.
+ // Returning false in this case is incorrect!
return false;
}
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(ParagraphList::iterator pit, Row const & row) const
-{
- InsetOld * ins;
-
- if (row.pos() < pit->size())
- if (pit->getChar(row.pos()) == Paragraph::META_INSET &&
- (ins = pit->getInset(row.pos())) &&
- (ins->needFullRow() || ins->display()))
- return LEFT_MARGIN;
-
+{
LyXTextClass const & tclass =
- bv()->buffer()->params.getLyXTextClass();
+ bv()->buffer()->params().getLyXTextClass();
LyXLayout_ptr const & layout = pit->layout();
string parindent = layout->parindent;
case MARGIN_RIGHT_ADDRESS_BOX:
{
// ok, a terrible hack. The left margin depends on the widest
- // row in this paragraph. Do not care about footnotes, they
- // are *NOT* allowed in the LaTeX realisation of this layout.
-
- // find the first row of this paragraph
+ // row in this paragraph.
RowList::iterator rit = pit->rows.begin();
RowList::iterator end = pit->rows.end();
int minfill = rit->fill();
(pit->inInset()->owner()->lyxCode() != InsetOld::TABULAR_CODE &&
pit->inInset()->owner()->lyxCode() != InsetOld::ERT_CODE))
&& (pit->layout() != tclass.defaultLayout() ||
- bv()->buffer()->params.paragraph_separation ==
+ bv()->buffer()->params().paragraph_separation ==
BufferParams::PARSEP_INDENT)) {
x += font_metrics::signedWidth(parindent,
tclass.defaultfont());
}
-int LyXText::rightMargin(ParagraphList::iterator pit,
- Buffer const & buf, Row const & row) const
+int LyXText::rightMargin(Paragraph const & par,
+ Buffer const & buf, Row const &) const
{
- InsetOld * ins;
-
- if (row.pos() < pit->size())
- if ((pit->getChar(row.pos()) == Paragraph::META_INSET) &&
- (ins = pit->getInset(row.pos())) &&
- (ins->needFullRow() || ins->display()))
- return PAPER_MARGIN;
-
- LyXTextClass const & tclass = buf.params.getLyXTextClass();
- LyXLayout_ptr const & layout = pit->layout();
+ LyXTextClass const & tclass = buf.params().getLyXTextClass();
+ LyXLayout_ptr const & layout = par.layout();
return PAPER_MARGIN
+ font_metrics::signedWidth(tclass.rightmargin(),
- tclass.defaultfont());
+ tclass.defaultfont())
+ font_metrics::signedWidth(layout->rightmargin,
tclass.defaultfont())
- * 4 / (pit->getDepth() + 4);
+ * 4 / (par.getDepth() + 4);
}
// this needs special handling - only newlines count as a break point
pos_type addressBreakPoint(pos_type i, Paragraph const & par)
{
- for (; i < par.size(); ++i) {
+ for (; i < par.size(); ++i)
if (par.isNewline(i))
return i;
- }
return par.size();
}
Row const & row) const
{
// maximum pixel width of a row.
- int width = workWidth() - rightMargin(pit, *bv()->buffer(), row);
+ int width = workWidth() - rightMargin(*pit, *bv()->buffer(), row);
// inset->textWidth() returns -1 via workWidth(),
// but why ?
// pixel width since last breakpoint
int chunkwidth = 0;
- bool fullrow = false;
pos_type i = pos;
point = i;
break;
}
+ // Break before...
+ if (i + 1 < last) {
+ InsetOld * in = pit->getInset(i + 1);
+ if (in && in->display()) {
+ point = i;
+ break;
+ }
+ // ...and after.
+ in = pit->getInset(i);
+ if (in && in->display()) {
+ point = i;
+ break;
+ }
+ }
char const c = pit->getChar(i);
+ if (i > endPosOfFontSpan) {
+ font = getFont(pit, i);
+ endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
+ }
int thiswidth;
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 {
- // Manual inlined optimised version of common case of "thiswidth = singleWidth(pit, i, c);"
- if (IsPrintable(c)) {
- if (pos > endPosOfFontSpan) {
- // We need to get the next font
- font = getFont(pit, i);
- endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
- }
- if (! font.language()->RightToLeft()) {
- thiswidth = font_metrics::width(c, font);
- } else {
- // Fall-back to normal case
- thiswidth = singleWidth(pit, i, c);
- // And flush font cache
- endPosOfFontSpan = 0;
- }
- } else {
- // Fall-back to normal case
- thiswidth = singleWidth(pit, i, c);
- // And flush font cache
- endPosOfFontSpan = 0;
- }
+ thiswidth = singleWidth(pit, i, c, font);
}
x += thiswidth;
chunkwidth += thiswidth;
- InsetOld * in = pit->isInset(i) ? pit->getInset(i) : 0;
- fullrow = in && (in->display() || in->needFullRow());
+ InsetOld * in = pit->getInset(i);
// 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 (pos < i)
+ // if no break before, break here
+ if (point == last || chunkwidth >= width - left) {
+ if (pos < i) {
point = i - 1;
- else
- point = i;
+ break;
+ }
}
- break;
}
if (!in || in->isChar()) {
point = i;
chunkwidth = 0;
}
- 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;
}
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(ParagraphList::iterator pit,
- RowList::iterator row, int paper_width) const
+int LyXText::fill(ParagraphList::iterator pit, Row & row, int paper_width) const
{
if (paper_width < 0)
return 0;
int w;
// get the pure distance
- pos_type const last = lastPrintablePos(*pit, row);
+ pos_type const last = lastPos(*pit, row);
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(pit, *row);
- row->fill(tmpfill);
+ int const tmpfill = row.fill();
+ row.fill(0); // the minfill in MarginLeft()
+ w = leftMargin(pit, row);
+ row.fill(tmpfill);
} else
- w = leftMargin(pit, *row);
+ w = leftMargin(pit, row);
pos_type const body_pos = pit->beginningOfBody();
- pos_type i = row->pos();
+ pos_type i = row.pos();
if (! pit->empty() && i <= last) {
// We re-use the font resolution for the entire span when possible
w += font_metrics::width(layout->labelsep, getLabelFont(pit));
if (pit->isLineSeparator(i - 1))
w -= singleWidth(pit, i - 1);
- int left_margin = labelEnd(pit, *row);
+ int left_margin = labelEnd(pit, row);
if (w < left_margin)
w = left_margin;
}
- { // Manual inlined an optimised version of the common case of "w += singleWidth(pit, i);"
- char const c = pit->getChar(i);
-
- if (IsPrintable(c)) {
- if (i > endPosOfFontSpan) {
- // We need to get the next font
- font = getFont(pit, i);
- endPosOfFontSpan = pit->getEndPosOfFontSpan(i);
- }
- if (!font.language()->RightToLeft()) {
- w += font_metrics::width(c, font);
- } else {
- // Fall-back to the normal case
- w += singleWidth(pit, i, c);
- // And flush font cache
- endPosOfFontSpan = 0;
- }
- } else {
- // Fall-back to the normal case
- w += singleWidth(pit, i, c);
- // And flush font cache
- endPosOfFontSpan = 0;
- }
+ 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 += font_metrics::width(layout->labelsep, getLabelFont(pit));
if (last >= 0 && pit->isLineSeparator(last))
w -= singleWidth(pit, last);
- int const left_margin = labelEnd(pit, *row);
+ int const left_margin = labelEnd(pit, row);
if (w < left_margin)
w = left_margin;
}
- int const fill = paper_width - w - rightMargin(pit, *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(pit, *bv()->buffer(), *row) << endl;
+ << " right margin " << rightMargin(*pit, *bv()->buffer(), row) << endl;
}
return fill;
}
{
pos_type last = pit->beginningOfBody();
- Assert(last > 0);
+ BOOST_ASSERT(last > 0);
// -1 because a label ends either with a space that is in the label,
// or with the beginning of a footnote that is outside the label.
}
-LColor::color LyXText::backgroundColor() const
+LColor_color LyXText::backgroundColor() const
{
if (inset_owner)
return inset_owner->backgroundColor();
}
-void LyXText::setHeightOfRow(ParagraphList::iterator pit, RowList::iterator rit)
+void LyXText::setHeightOfRow(ParagraphList::iterator pit, Row & row)
{
// get the maximum ascent and the maximum descent
double layoutasc = 0;
// 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(pit, rit->pos());
+ LyXFont font = getFont(pit, row.pos());
LyXFont::FONT_SIZE const tmpsize = font.size();
font = getLayoutFont(pit);
LyXFont::FONT_SIZE const size = font.size();
if (!pit->params().spacing().isDefault())
spacing_val = pit->params().spacing().getValue();
else
- spacing_val = bv()->buffer()->params.spacing.getValue();
+ spacing_val = bv()->buffer()->params().spacing().getValue();
//lyxerr << "spacing_val = " << spacing_val << endl;
int maxasc = int(font_metrics::maxAscent(font) *
int maxdesc = int(font_metrics::maxDescent(font) *
layout->spacing.getValue() * spacing_val);
- pos_type const pos_end = lastPos(*pit, rit);
+ pos_type const pos_end = lastPos(*pit, row);
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());
+ LyXFont font = getFont(pit, row.pos());
+ lyx::pos_type endPosOfFontSpan = pit->getEndPosOfFontSpan(row.pos());
// Optimisation
Paragraph const & par = *pit;
// Check if any insets are larger
- for (pos_type pos = rit->pos(); pos <= pos_end; ++pos) {
+ for (pos_type pos = row.pos(); pos <= pos_end; ++pos) {
// Manual inlined optimised version of common case of
// "maxwidth += singleWidth(pit, pos);"
char const c = par.getChar(pos);
maxwidth += font_metrics::width(c, font);
} else {
// Fall-back to normal case
- maxwidth += singleWidth(pit, pos, c);
+ maxwidth += singleWidth(pit, pos, c, font);
// And flush font cache
endPosOfFontSpan = 0;
}
if (par.isInset(pos)) {
InsetOld const * tmpinset = par.getInset(pos);
if (tmpinset) {
-#if 1 // this is needed for deep update on initialitation
-#warning inset->update FIXME
- //tmpinset->update(bv());
- LyXFont const tmpfont = getFont(pit, pos);
- Dimension dim;
- MetricsInfo mi(bv(), tmpfont, workWidth());
- tmpinset->metrics(mi, dim);
- maxwidth += dim.wid;
- maxasc = max(maxasc, dim.asc);
- maxdesc = max(maxdesc, dim.des);
-#else
maxwidth += tmpinset->width();
maxasc = max(maxasc, tmpinset->ascent());
maxdesc = max(maxdesc, tmpinset->descent());
-#endif
}
} else {
// Fall-back to normal case
- maxwidth += singleWidth(pit, pos, c);
+ maxwidth += singleWidth(pit, pos, c, font);
// And flush font cache
endPosOfFontSpan = 0;
}
// This is not completely correct, but we can live with the small,
// cosmetic error for now.
LyXFont::FONT_SIZE maxsize =
- pit->highestFontInRange(rit->pos(), pos_end, size);
+ pit->highestFontInRange(row.pos(), pos_end, size);
if (maxsize > font.size()) {
font.setSize(maxsize);
maxasc = max(maxasc, font_metrics::maxAscent(font));
++maxasc;
++maxdesc;
- rit->ascent_of_text(maxasc);
+ row.ascent_of_text(maxasc);
// is it a top line?
- if (!rit->pos()) {
-
+ if (!row.pos()) {
+ BufferParams const & bufparams = bv()->buffer()->params();
// some parksips VERY EASY IMPLEMENTATION
- if (bv()->buffer()->params.paragraph_separation ==
+ if (bv()->buffer()->params().paragraph_separation ==
BufferParams::PARSEP_SKIP)
{
if (layout->isParagraph()
&& pit->getDepth() == 0
&& pit != ownerParagraphs().begin())
{
- maxasc += bv()->buffer()->params.getDefSkip().inPixels(*bv());
+ maxasc += bufparams.getDefSkip().inPixels(*bv());
} else if (pit != ownerParagraphs().begin() &&
boost::prior(pit)->layout()->isParagraph() &&
boost::prior(pit)->getDepth() == 0)
{
// is it right to use defskip here too? (AS)
- maxasc += bv()->buffer()->params.getDefSkip().inPixels(*bv());
+ maxasc += bufparams.getDefSkip().inPixels(*bv());
}
}
// This is special code for the chapter, since the label of this
// layout is printed in an extra row
- if (layout->labeltype == LABEL_COUNTER_CHAPTER
- && bv()->buffer()->params.secnumdepth >= 0)
- {
+ if (layout->counter == "chapter" && bufparams.secnumdepth >= 0) {
float spacing_val = 1.0;
if (!pit->params().spacing().isDefault()) {
spacing_val = pit->params().spacing().getValue();
} else {
- spacing_val = bv()->buffer()->params.spacing.getValue();
+ spacing_val = bufparams.spacing().getValue();
}
labeladdon = int(font_metrics::maxDescent(labelfont) *
if (!pit->params().spacing().isDefault()) {
spacing_val = pit->params().spacing().getValue();
} else {
- spacing_val = bv()->buffer()->params.spacing.getValue();
+ spacing_val = bufparams.spacing().getValue();
}
labeladdon = int(
prev->getLabelWidthString() == pit->getLabelWidthString())
{
layoutasc = (layout->itemsep * defaultRowHeight());
- } else if (rit != firstRow()) {
+ } else if (pit != ownerParagraphs().begin() || row.pos() != 0) {
tmptop = layout->topsep;
- //if (boost::prior(pit)->getDepth() >= pit->getDepth())
- // tmptop -= getPar(previousRow(rit))->layout()->bottomsep;
-
if (tmptop > 0)
layoutasc = (tmptop * defaultRowHeight());
} else if (pit->params().lineTop()) {
}
// is it a bottom line?
- if (boost::next(rit) == pit->rows.end()) {
+ if (row.end() == pit->size()) {
// the bottom margin
ParagraphList::iterator nextpit = boost::next(pit);
if (nextpit == ownerParagraphs().end() && !isInInset())
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();
+ row.height(maxasc + maxdesc + labeladdon);
+ row.baseline(maxasc + labeladdon);
+ row.top_of_text(row.baseline() - font_metrics::maxAscent(font));
- rit->top_of_text(rit->baseline() - font_metrics::maxAscent(font));
-
- double x = 0;
- if (layout->margintype != MARGIN_RIGHT_ADDRESS_BOX) {
- // this IS needed
- rit->width(maxwidth);
- double dummy;
- prepareToPrint(pit, rit, x, dummy, dummy, dummy, false);
- }
- rit->width(int(maxwidth + x));
+ row.width(maxwidth);
if (inset_owner) {
width = max(0, workWidth());
RowList::iterator rit = firstRow();
void LyXText::breakParagraph(ParagraphList & paragraphs, char keep_layout)
{
// allow only if at start or end, or all previous is new text
- if (cursor.pos() && cursor.pos() != cursor.par()->size()
- && cursor.par()->isChangeEdited(0, cursor.pos()))
+ if (cursor.pos() && cursor.pos() != cursorPar()->size()
+ && cursorPar()->isChangeEdited(0, cursor.pos()))
return;
LyXTextClass const & tclass =
- bv()->buffer()->params.getLyXTextClass();
- LyXLayout_ptr const & layout = cursor.par()->layout();
+ bv()->buffer()->params().getLyXTextClass();
+ LyXLayout_ptr const & layout = cursorPar()->layout();
// this is only allowed, if the current paragraph is not empty or caption
// and if it has not the keepempty flag active
- if (cursor.par()->empty() && !cursor.par()->allowEmpty()
+ if (cursorPar()->empty() && !cursorPar()->allowEmpty()
&& layout->labeltype != LABEL_SENSITIVE)
return;
- recordUndo(bv(), Undo::ATOMIC, cursor.par());
+ recUndo(cursor.par());
// Always break behind a space
//
// It is better to erase the space (Dekel)
- if (cursor.pos() < cursor.par()->size()
- && cursor.par()->isLineSeparator(cursor.pos()))
- cursor.par()->erase(cursor.pos());
+ if (cursor.pos() < cursorPar()->size()
+ && cursorPar()->isLineSeparator(cursor.pos()))
+ cursorPar()->erase(cursor.pos());
// break the paragraph
if (keep_layout)
// breakParagraph call should return a bool if it inserts the
// 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(),
+ bool const isempty = (cursorPar()->allowEmpty() && cursorPar()->empty());
+ ::breakParagraph(bv()->buffer()->params(), paragraphs, cursorPar(),
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());
+ ParagraphList::iterator next_par = boost::next(cursorPar());
// well this is the caption hack since one caption is really enough
if (layout->labeltype == LABEL_SENSITIVE) {
if (!cursor.pos())
// set to standard-layout
- cursor.par()->applyLayout(tclass.defaultLayout());
+ cursorPar()->applyLayout(tclass.defaultLayout());
else
// set to standard-layout
next_par->applyLayout(tclass.defaultLayout());
// This touches only the screen-update. Otherwise we would may have
// an empty row on the screen
if (cursor.pos() && cursorRow()->pos() == cursor.pos()
- && !cursor.par()->isNewline(cursor.pos() - 1))
+ && !cursorPar()->isNewline(cursor.pos() - 1))
{
cursorLeft(bv());
}
next_par->erase(0);
updateCounters();
- redoParagraph(cursor.par());
+ redoParagraph(cursorPar());
redoParagraph(next_par);
// This check is necessary. Otherwise the new empty paragraph will
if (cursor.pos() || isempty)
setCursor(next_par, 0);
else
- setCursor(cursor.par(), 0);
+ setCursor(cursorPar(), 0);
}
void LyXText::redoParagraph()
{
clearSelection();
- redoParagraph(cursor.par());
+ redoParagraph(cursorPar());
setCursorIntern(cursor.par(), cursor.pos());
}
// same Paragraph one to the right and make a rebreak
void LyXText::insertChar(char c)
{
- recordUndo(bv(), Undo::INSERT, cursor.par());
+ recordUndo(Undo::INSERT, this, cursor.par(), cursor.par());
// When the free-spacing option is set for the current layout,
// disable the double-space checking
- bool const freeSpacing = cursor.par()->layout()->free_spacing ||
- cursor.par()->isFreeSpacing();
+ bool const freeSpacing = cursorPar()->layout()->free_spacing ||
+ cursorPar()->isFreeSpacing();
if (lyxrc.auto_number) {
static string const number_operators = "+-/*";
if (!IsDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
cursor.pos() >= 1 &&
- cursor.pos() < cursor.par()->size() &&
- getFont(cursor.par(), cursor.pos()).number() == LyXFont::ON &&
- getFont(cursor.par(), cursor.pos() - 1).number() == LyXFont::ON)
+ cursor.pos() < cursorPar()->size() &&
+ getFont(cursorPar(), cursor.pos()).number() == LyXFont::ON &&
+ getFont(cursorPar(), cursor.pos() - 1).number() == LyXFont::ON)
)
number(bv()); // Set current_font.number to OFF
} else if (IsDigit(c) &&
number(bv()); // Set current_font.number to ON
if (cursor.pos() > 0) {
- char const c = cursor.par()->getChar(cursor.pos() - 1);
+ char const c = cursorPar()->getChar(cursor.pos() - 1);
if (contains(number_unary_operators, c) &&
(cursor.pos() == 1 ||
- cursor.par()->isSeparator(cursor.pos() - 2) ||
- cursor.par()->isNewline(cursor.pos() - 2))
+ cursorPar()->isSeparator(cursor.pos() - 2) ||
+ cursorPar()->isNewline(cursor.pos() - 2))
) {
setCharFont(
- cursor.par(),
+ cursorPar(),
cursor.pos() - 1,
current_font);
} else if (contains(number_seperators, c) &&
cursor.pos() >= 2 &&
getFont(
- cursor.par(),
+ cursorPar(),
cursor.pos() - 2).number() == LyXFont::ON) {
setCharFont(
- cursor.par(),
+ cursorPar(),
cursor.pos() - 1,
current_font);
}
if (!freeSpacing && IsLineSeparatorChar(c)) {
if ((cursor.pos() > 0
- && cursor.par()->isLineSeparator(cursor.pos() - 1))
+ && cursorPar()->isLineSeparator(cursor.pos() - 1))
|| (cursor.pos() > 0
- && cursor.par()->isNewline(cursor.pos() - 1))
+ && cursorPar()->isNewline(cursor.pos() - 1))
|| (cursor.pos() == 0)) {
static bool sent_space_message = false;
if (!sent_space_message) {
// Here case LyXText::InsertInset already inserted the character
if (c != Paragraph::META_INSET)
- cursor.par()->insertChar(cursor.pos(), c);
+ cursorPar()->insertChar(cursor.pos(), c);
- setCharFont(cursor.par(), cursor.pos(), rawtmpfont);
+ setCharFont(cursorPar(), cursor.pos(), rawtmpfont);
current_font = rawtmpfont;
real_current_font = realtmpfont;
- redoParagraph(cursor.par());
+ redoParagraph(cursorPar());
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(ParagraphList::iterator pit,
- RowList::iterator rit, double & x,
- double & fill_separator,
- double & fill_hfill,
- double & fill_label_hfill,
- bool bidi) const
+ RowList::iterator const rit) const
{
double w = rit->fill();
- fill_hfill = 0;
- fill_label_hfill = 0;
- fill_separator = 0;
- fill_label_hfill = 0;
+ 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);
+ pit->isRightToLeftPar(bv()->buffer()->params());
if (is_rtl)
- x = workWidth() > 0 ? rightMargin(pit, *bv()->buffer(), *rit) : 0;
+ x = workWidth() > 0 ? rightMargin(*pit, *bv()->buffer(), *rit) : 0;
else
x = workWidth() > 0 ? leftMargin(pit, *rit) : 0;
if (layout->margintype == MARGIN_MANUAL
&& layout->labeltype == LABEL_MANUAL) {
/// We might have real hfills in the label part
- int nlh = numberOfLabelHfills(*pit, 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
}
// are there any hfills in the row?
- int const nh = numberOfHfills(*pit, rit);
+ int const nh = numberOfHfills(*pit, *rit);
if (nh) {
if (w > 0)
} else {
align = pit->params().align();
}
-
- // center displayed insets
InsetOld * inset = 0;
- if (rit->pos() < pit->size()
- && pit->isInset(rit->pos())
- && (inset = pit->getInset(rit->pos()))
- && (inset->display())) // || (inset->scroll() < 0)))
- align = (inset->lyxCode() == InsetOld::MATHMACRO_CODE)
- ? LYX_ALIGN_BLOCK : LYX_ALIGN_CENTER;
// ERT insets should always be LEFT ALIGNED on screen
inset = pit->inInset();
if (inset && inset->owner() &&
align = LYX_ALIGN_LEFT;
}
+ // Display-style insets should always be on a centred row
+ // The test on pit->size() is to catch zero-size pars, which
+ // would trigger the assert in Paragraph::getInset().
+ inset = pit->size() ? pit->getInset(rit->pos()) : 0;
+ if (inset && inset->display()) {
+ align = LYX_ALIGN_CENTER;
+ }
+
switch (align) {
case LYX_ALIGN_BLOCK:
- {
- int const ns = numberOfSeparators(*pit, rit);
+ {
+ int const ns = numberOfSeparators(*pit, *rit);
RowList::iterator next_row = boost::next(rit);
+ bool disp_inset = false;
+ if (next_row != pit->rows.end()) {
+ InsetOld * in = pit->getInset(next_row->pos());
+ if (in)
+ disp_inset = in->display();
+ }
+ // If we have separators, this is not the last row of a
+ // par, does not end in newline, and is not row above a
+ // display inset... then stretch it
if (ns
- && next_row != pit->rows.end()
+ && rit->end() < pit->size()
&& !pit->isNewline(next_row->pos() - 1)
- && !(pit->isInset(next_row->pos())
- && pit->getInset(next_row->pos())
- && pit->getInset(next_row->pos())->display())
+ && !disp_inset
) {
- fill_separator = w / ns;
+ fill_separator = w / ns;
} else if (is_rtl) {
x += w;
}
break;
}
}
- if (!bidi)
- return;
- computeBidiTables(pit, bv()->buffer(), rit);
+ computeBidiTables(*pit, *bv()->buffer(), *rit);
if (is_rtl) {
pos_type body_pos = pit->beginningOfBody();
- pos_type last = lastPos(*pit, rit);
+ pos_type last = lastPos(*pit, *rit);
if (body_pos > 0 &&
- (body_pos - 1 > last ||
- !pit->isLineSeparator(body_pos - 1))) {
+ (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);
}
void LyXText::cursorRightOneWord()
{
- ::cursorRightOneWord(cursor, ownerParagraphs());
- setCursor(cursor.par(), cursor.pos());
+ ::cursorRightOneWord(*this, cursor, ownerParagraphs());
+ setCursor(cursorPar(), cursor.pos());
}
void LyXText::cursorLeftOneWord()
{
LyXCursor tmpcursor = cursor;
- ::cursorLeftOneWord(tmpcursor, ownerParagraphs());
- setCursor(tmpcursor.par(), tmpcursor.pos());
+ ::cursorLeftOneWord(*this, tmpcursor, ownerParagraphs());
+ setCursor(getPar(tmpcursor), tmpcursor.pos());
}
void LyXText::selectWord(word_location loc)
{
LyXCursor from = cursor;
- LyXCursor to;
- ::getWord(from, to, loc, ownerParagraphs());
+ LyXCursor to = cursor;
+ ::getWord(*this, from, to, loc, ownerParagraphs());
if (cursor != from)
setCursor(from.par(), from.pos());
if (to == from)
void LyXText::acceptChange()
{
- if (!selection.set() && cursor.par()->size())
+ if (!selection.set() && cursorPar()->size())
return;
if (selection.start.par() == selection.end.par()) {
LyXCursor & startc = selection.start;
LyXCursor & endc = selection.end;
- recordUndo(bv(), Undo::INSERT, startc.par());
- startc.par()->acceptChange(startc.pos(), endc.pos());
+ recordUndo(Undo::INSERT, this, startc.par());
+ getPar(startc)->acceptChange(startc.pos(), endc.pos());
finishUndo();
clearSelection();
- redoParagraph(startc.par());
+ redoParagraph(getPar(startc));
setCursorIntern(startc.par(), 0);
}
#warning handle multi par selection
void LyXText::rejectChange()
{
- if (!selection.set() && cursor.par()->size())
+ if (!selection.set() && cursorPar()->size())
return;
if (selection.start.par() == selection.end.par()) {
LyXCursor & startc = selection.start;
LyXCursor & endc = selection.end;
- recordUndo(bv(), Undo::INSERT, startc.par());
- startc.par()->rejectChange(startc.pos(), endc.pos());
+ recordUndo(Undo::INSERT, this, startc.par());
+ getPar(startc)->rejectChange(startc.pos(), endc.pos());
finishUndo();
clearSelection();
- redoParagraph(startc.par());
+ redoParagraph(getPar(startc));
setCursorIntern(startc.par(), 0);
}
#warning handle multi par selection
// This function is only used by the spellchecker for NextWord().
// It doesn't handle LYX_ACCENTs and probably never will.
-WordLangTuple const
-LyXText::selectNextWordToSpellcheck(float & value)
+WordLangTuple const LyXText::selectNextWordToSpellcheck(float & value)
{
if (the_locking_inset) {
- WordLangTuple word = the_locking_inset->selectNextWordToSpellcheck(bv(), value);
+ WordLangTuple word =
+ the_locking_inset->selectNextWordToSpellcheck(bv(), value);
if (!word.word().empty()) {
value += float(cursor.y());
value /= float(height);
return word;
}
// we have to go on checking so move cursor to the next char
- if (cursor.pos() == cursor.par()->size()) {
- if (boost::next(cursor.par()) == ownerParagraphs().end())
+ if (cursor.pos() == cursorPar()->size()) {
+ if (cursor.par() + 1 == int(ownerParagraphs().size()))
return word;
- cursor.par(boost::next(cursor.par()));
+ cursor.par(cursor.par() + 1);
cursor.pos(0);
} else
- cursor.pos(cursor.pos() + 1);
+ cursor.pos(cursor.pos() + 1);
}
- ParagraphList::iterator tmppit = cursor.par();
+ int const tmppar = cursor.par();
// If this is not the very first word, skip rest of
// current word because we are probably in the middle
// of a word if there is text here.
- if (cursor.pos() || cursor.par() != ownerParagraphs().begin()) {
- while (cursor.pos() < cursor.par()->size()
- && cursor.par()->isLetter(cursor.pos()))
+ if (cursor.pos() || cursor.par() != 0) {
+ while (cursor.pos() < cursorPar()->size()
+ && cursorPar()->isLetter(cursor.pos()))
cursor.pos(cursor.pos() + 1);
}
// Now, skip until we have real text (will jump paragraphs)
while (true) {
- ParagraphList::iterator cpit = cursor.par();
- pos_type const cpos(cursor.pos());
+ ParagraphList::iterator cpit = cursorPar();
+ pos_type const cpos = cursor.pos();
if (cpos == cpit->size()) {
- if (boost::next(cpit) != ownerParagraphs().end()) {
- cursor.par(boost::next(cpit));
+ if (cursor.par() + 1 != int(ownerParagraphs().size())) {
+ cursor.par(cursor.par() + 1);
cursor.pos(0);
continue;
}
}
// now check if we hit an inset so it has to be a inset containing text!
- if (cursor.pos() < cursor.par()->size() &&
- cursor.par()->isInset(cursor.pos())) {
+ if (cursor.pos() < cursorPar()->size() &&
+ cursorPar()->isInset(cursor.pos())) {
// lock the inset!
FuncRequest cmd(bv(), LFUN_INSET_EDIT, "left");
- cursor.par()->getInset(cursor.pos())->localDispatch(cmd);
+ cursorPar()->getInset(cursor.pos())->dispatch(cmd);
// now call us again to do the above trick
// but obviously we have to start from down below ;)
return bv()->text->selectNextWordToSpellcheck(value);
}
// Update the value if we changed paragraphs
- if (cursor.par() != tmppit) {
+ if (cursor.par() != tmppar) {
setCursor(cursor.par(), cursor.pos());
value = float(cursor.y())/float(height);
}
// Start the selection from here
selection.cursor = cursor;
- string lang_code = getFont(cursor.par(), cursor.pos()).language()->code();
+ string lang_code = getFont(cursorPar(), 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()
- && cursor.par()->isLetter(cursor.pos())
- && !isDeletedText(*cursor.par(), cursor.pos()))
+ while (cursor.pos() < cursorPar()->size()
+ && cursorPar()->isLetter(cursor.pos())
+ && !isDeletedText(*cursorPar(), cursor.pos()))
cursor.pos(cursor.pos() + 1);
// Finally, we copy the word to a string and return it
string str;
if (selection.cursor.pos() < cursor.pos()) {
- pos_type i;
- for (i = selection.cursor.pos(); i < cursor.pos(); ++i) {
- if (!cursor.par()->isInset(i))
- str += cursor.par()->getChar(i);
+ for (pos_type i = selection.cursor.pos(); i < cursor.pos(); ++i) {
+ if (!cursorPar()->isInset(i))
+ str += cursorPar()->getChar(i);
}
}
return WordLangTuple(str, lang_code);
selection.cursor = cursor;
// now find the end of the word
- while (cursor.pos() < cursor.par()->size()
- && cursor.par()->isLetter(cursor.pos()))
+ while (cursor.pos() < cursorPar()->size()
+ && cursorPar()->isLetter(cursor.pos()))
cursor.pos(cursor.pos() + 1);
- setCursor(cursor.par(), cursor.pos());
+ setCursor(cursorPar(), cursor.pos());
// finally set the selection
setSelection();
// Delete from cursor up to the end of the current or next word.
void LyXText::deleteWordForward()
{
- if (cursor.par()->empty())
+ if (cursorPar()->empty())
cursorRight(bv());
else {
LyXCursor tmpcursor = cursor;
selection.cursor = cursor;
cursor = tmpcursor;
setSelection();
-
- // Great, CutSelection() gets rid of multiple spaces.
cutSelection(true, false);
}
}
// Delete from cursor to start of current or prior word.
void LyXText::deleteWordBackward()
{
- if (cursor.par()->empty())
+ if (cursorPar()->empty())
cursorLeft(bv());
else {
LyXCursor tmpcursor = cursor;
// Kill to end of line.
void LyXText::deleteLineForward()
{
- if (cursor.par()->empty())
+ if (cursorPar()->empty())
// Paragraph is empty, so we just go to the right
cursorRight(bv());
else {
to = selection.end;
} else {
from = cursor;
- ::getWord(from, to, lyx::PARTIAL_WORD, ownerParagraphs());
+ ::getWord(*this, from, to, lyx::PARTIAL_WORD, ownerParagraphs());
setCursor(to.par(), to.pos() + 1);
}
- recordUndo(bv(), Undo::ATOMIC, from.par(), to.par());
+ recordUndo(Undo::ATOMIC, this, from.par(), to.par());
pos_type pos = from.pos();
- ParagraphList::iterator pit = from.par();
+ int par = from.par();
- while (pit != ownerParagraphs().end() &&
- (pos != to.pos() || pit != to.par())) {
+ while (par != int(ownerParagraphs().size()) &&
+ (pos != to.pos() || par != to.par())) {
+ ParagraphList::iterator pit = getPar(par);
if (pos == pit->size()) {
- ++pit;
+ ++par;
pos = 0;
continue;
}
unsigned char c = pit->getChar(pos);
- if (!IsInsetChar(c)) {
+ if (c != Paragraph::META_INSET) {
switch (action) {
case text_lowercase:
c = lowercase(c);
// this is a very easy implementation
LyXCursor old_cursor = cursor;
- int const old_cur_par_id = old_cursor.par()->id();
+ int const old_cur_par_id = cursorPar()->id();
int const old_cur_par_prev_id =
- (old_cursor.par() != ownerParagraphs().begin() ?
- boost::prior(old_cursor.par())->id() : -1);
+ old_cursor.par() ? getPar(old_cursor.par() - 1)->id() : -1;
// just move to the right
cursorRight(bv());
// CHECK Look at the comment here.
// This check is not very good...
- // The cursorRightIntern calls DeleteEmptyParagrapgMechanism
+ // The cursorRightIntern calls DeleteEmptyParagraphMechanism
// and that can very well delete the par or par->previous in
// old_cursor. Will a solution where we compare paragraph id's
//work better?
- if ((cursor.par() != ownerParagraphs().begin() ? boost::prior(cursor.par())->id() : -1)
- == old_cur_par_prev_id
- && cursor.par()->id() != old_cur_par_id) {
+ int iid = cursor.par() ? getPar(cursor.par() - 1)->id() : -1;
+ if (iid == old_cur_par_prev_id && cursorPar()->id() != old_cur_par_id) {
// delete-empty-paragraph-mechanism has done it
return;
}
// if you had success make a backspace
if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) {
- LyXCursor tmpcursor = cursor;
- // to make sure undo gets the right cursor position
- cursor = old_cursor;
- recordUndo(bv(), Undo::DELETE, cursor.par());
- cursor = tmpcursor;
+ recordUndo(Undo::DELETE, this, old_cursor.par());
backspace();
}
}
void LyXText::backspace()
{
// Get the font that is used to calculate the baselineskip
- pos_type lastpos = cursor.par()->size();
+ ParagraphList::iterator pit = cursorPar();
+ pos_type lastpos = pit->size();
if (cursor.pos() == 0) {
// The cursor is at the beginning of a paragraph,
// so the the backspace will collapse two paragraphs into one.
// but it's not allowed unless it's new
- if (cursor.par()->isChangeEdited(0, cursor.par()->size()))
+ if (pit->isChangeEdited(0, pit->size()))
return;
// we may paste some paragraphs
// is it an empty paragraph?
- if (lastpos == 0
- || (lastpos == 1 && cursor.par()->isSeparator(0))) {
+ if (lastpos == 0 || (lastpos == 1 && pit->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());
- if (cursor.par()->layout() == tmppit->layout()
- && cursor.par()->getAlign() == tmppit->getAlign()) {
+ if (cursor.par()) {
+ ParagraphList::iterator tmppit = getPar(cursor.par() - 1);
+ if (cursorPar()->layout() == tmppit->layout()
+ && cursorPar()->getAlign() == tmppit->getAlign()) {
// Inherit bottom DTD from the paragraph below.
// (the one we are deleting)
- tmppit->params().lineBottom(cursor.par()->params().lineBottom());
- tmppit->params().spaceBottom(cursor.par()->params().spaceBottom());
- tmppit->params().pagebreakBottom(cursor.par()->params().pagebreakBottom());
+ tmppit->params().lineBottom(cursorPar()->params().lineBottom());
+ tmppit->params().spaceBottom(cursorPar()->params().spaceBottom());
+ tmppit->params().pagebreakBottom(cursorPar()->params().pagebreakBottom());
}
cursorLeft(bv());
// the layout things can change the height of a row !
- setHeightOfRow(cursor.par(), cursorRow());
+ redoParagraph();
return;
}
}
- if (cursor.par() != ownerParagraphs().begin()) {
- recordUndo(bv(), Undo::DELETE,
- boost::prior(cursor.par()),
- cursor.par());
- }
+ if (cursor.par() != 0)
+ recordUndo(Undo::DELETE, this, cursor.par() - 1, cursor.par());
- ParagraphList::iterator tmppit = cursor.par();
+ ParagraphList::iterator tmppit = cursorPar();
// 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)
- if (cursor.par() != ownerParagraphs().begin()) {
+ if (cursor.par() != 0) {
// steps into the above paragraph.
- setCursorIntern(boost::prior(cursor.par()),
- boost::prior(cursor.par())->size(),
+ setCursorIntern(cursor.par() - 1,
+ getPar(cursor.par() - 1)->size(),
false);
}
// 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.
- //Correction: Pasting is always allowed with standard-layout
- LyXTextClass const & tclass =
- bv()->buffer()->params.getLyXTextClass();
+ // Correction: Pasting is always allowed with standard-layout
+ Buffer & buf = *bv()->buffer();
+ BufferParams const & bufparams = buf.params();
+ LyXTextClass const & tclass = bufparams.getLyXTextClass();
- if (cursor.par() != tmppit
- && (cursor.par()->layout() == tmppit->layout()
+ if (cursorPar() != tmppit
+ && (cursorPar()->layout() == tmppit->layout()
|| tmppit->layout() == tclass.defaultLayout())
- && cursor.par()->getAlign() == tmppit->getAlign()) {
- mergeParagraph(bv()->buffer()->params,
- bv()->buffer()->paragraphs, cursor.par());
+ && cursorPar()->getAlign() == tmppit->getAlign()) {
+ mergeParagraph(bufparams,
+ buf.paragraphs(), cursorPar());
- if (cursor.pos() && cursor.par()->isSeparator(cursor.pos() - 1))
+ if (cursor.pos() && cursorPar()->isSeparator(cursor.pos() - 1))
cursor.pos(cursor.pos() - 1);
// the row may have changed, block, hfills etc.
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
- recordUndo(bv(), Undo::DELETE, cursor.par());
+ recordUndo(Undo::DELETE, this, 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,
false, cursor.boundary());
- cursor.par()->erase(cursor.pos());
+ cursorPar()->erase(cursor.pos());
}
- lastpos = cursor.par()->size();
+ lastpos = cursorPar()->size();
if (cursor.pos() == lastpos)
setCurrentFont();
}
-RowList::iterator LyXText::cursorRow() const
+ParagraphList::iterator LyXText::cursorPar() const
{
- return getRow(cursor.par(), cursor.pos());
+ return getPar(cursor.par());
}
-RowList::iterator LyXText::getRow(LyXCursor const & cur) const
+ParagraphList::iterator LyXText::getPar(LyXCursor const & cur) const
{
- return getRow(cur.par(), cur.pos());
+ return getPar(cur.par());
}
-RowList::iterator
-LyXText::getRow(ParagraphList::iterator pit, pos_type pos) const
+ParagraphList::iterator LyXText::getPar(int par) const
{
- RowList::iterator rit = pit->rows.begin();
- RowList::iterator end = pit->rows.end();
+ BOOST_ASSERT(par >= 0);
+ BOOST_ASSERT(par < int(ownerParagraphs().size()));
+ ParagraphList::iterator pit = ownerParagraphs().begin();
+ std::advance(pit, par);
+ return pit;
+}
-#warning Why is this next thing needed? (Andre)
- while (rit != end
- && rit->pos() < pos
- && boost::next(rit) != end
- && boost::next(rit)->pos() <= pos)
- ++rit;
- return rit;
+
+RowList::iterator LyXText::cursorRow() const
+{
+ return getRow(*cursorPar(), cursor.pos());
}
-// returns pointer to a specified row
-RowList::iterator
-LyXText::getRow(ParagraphList::iterator pit, pos_type pos, int & y) const
+RowList::iterator LyXText::getRow(LyXCursor const & cur) const
{
- y = 0;
+ return getRow(*getPar(cur), cur.pos());
+}
- if (noRows())
- return firstRow();
- ParagraphList::iterator it = ownerParagraphs().begin();
- for ( ; it != pit; ++it) {
- RowList::iterator beg = it->rows.begin();
- RowList::iterator end = it->rows.end();
- for (RowList::iterator rit = beg; rit != end; ++rit)
- y += rit->height();
- }
+RowList::iterator LyXText::getRow(Paragraph & par, pos_type pos) const
+{
+ RowList::iterator rit = boost::prior(par.rows.end());
+ RowList::iterator const begin = par.rows.begin();
- RowList::iterator rit = pit->rows.begin();
- RowList::iterator end = pit->rows.end();
- while (rit != end
- && rit->pos() < pos
- && boost::next(rit) != end
- && boost::next(rit)->pos() <= pos) {
- y += rit->height();
- ++rit;
- }
+ while (rit != begin && rit->pos() > pos)
+ --rit;
return rit;
}
-// returns pointer to some fancy row 'below' specified row
-RowList::iterator LyXText::cursorIRow() const
+RowList::iterator
+LyXText::getRowNearY(int y, ParagraphList::iterator & pit) const
{
- int y = 0;
- return getRow(cursor.par(), cursor.pos(), y);
-}
+ //lyxerr << "getRowNearY: y " << y << endl;
+ pit = boost::prior(ownerParagraphs().end());
-RowList::iterator LyXText::getRowNearY(int & y,
- ParagraphList::iterator & pit) const
-{
- ParagraphList::iterator const end = ownerParagraphs().end();
- //lyxerr << "getRowNearY: y " << y << endl;
+ RowList::iterator rit = lastRow();
+ RowList::iterator rbegin = firstRow();
- for (pit = ownerParagraphs().begin(); pit != end; ++pit) {
- RowList::iterator rit = pit->rows.begin();
- RowList::iterator rend = pit->rows.end();
-
- for ( ; rit != rend; ++rit) {
- //rit->dump();
- if (rit->y() >= y) {
- if (rit != firstRow())
- previousRow(pit, rit);
- y = rit->y();
- return rit;
- }
- }
- }
+ while (rit != rbegin && int(pit->y + rit->y_offset()) > y)
+ previousRow(pit, rit);
-#if 1
- pit = ownerParagraphs().begin();
- y = 0;
- lyxerr << "row not found near " << y << " pit: " << &*pit << endl;
- return firstRow();
-#else
- pit = boost::prior(ownerParagraphs().end());
- lyxerr << "row not found near " << y << " pit: " << &*pit << endl;
- return lastRow();
-#endif
+ return rit;
}
int LyXText::getDepth() const
{
- return cursor.par()->getDepth();
+ return cursorPar()->getDepth();
}
void LyXText::nextRow(ParagraphList::iterator & pit,
RowList::iterator & rit) const
{
- if (boost::next(rit) != pit->rows.end()) {
- rit = boost::next(rit);
- } else {
+ ++rit;
+ if (rit == pit->rows.end()) {
++pit;
if (pit == ownerParagraphs().end())
- rit = boost::next(rit);
+ --pit;
else
rit = pit->rows.begin();
}
RowList::iterator & rit) const
{
if (rit != pit->rows.begin())
- rit = boost::prior(rit);
+ --rit;
else {
- Assert(pit != ownerParagraphs().begin());
+ BOOST_ASSERT(pit != ownerParagraphs().begin());
--pit;
rit = boost::prior(pit->rows.end());
}
}
-bool LyXText::noRows() const
+string LyXText::selectionAsString(Buffer const & buffer, bool label) const
{
- return ownerParagraphs().begin()->rows.empty();
+ if (!selection.set())
+ return string();
+
+ // should be const ...
+ ParagraphList::iterator startpit = getPar(selection.start);
+ ParagraphList::iterator endpit = getPar(selection.end);
+ size_t const startpos = selection.start.pos();
+ size_t const endpos = selection.end.pos();
+
+ if (startpit == endpit)
+ return startpit->asString(buffer, startpos, endpos, label);
+
+ // First paragraph in selection
+ string result =
+ startpit->asString(buffer, startpos, startpit->size(), label) + "\n\n";
+
+ // The paragraphs in between (if any)
+ ParagraphList::iterator pit = startpit;
+ for (++pit; pit != endpit; ++pit)
+ result += pit->asString(buffer, 0, pit->size(), label) + "\n\n";
+
+ // Last paragraph in selection
+ result += endpit->asString(buffer, 0, endpos, label);
+
+ return result;
+}
+
+
+int LyXText::parOffset(ParagraphList::iterator pit) const
+{
+ return std::distance(ownerParagraphs().begin(), pit);
+}
+
+
+int LyXText::redoParagraphInternal(ParagraphList::iterator pit)
+{
+ // remove rows of paragraph, keep track of height changes
+ height -= pit->height;
+ pit->rows.clear();
+
+ // redo insets
+ InsetList::iterator ii = pit->insetlist.begin();
+ InsetList::iterator iend = pit->insetlist.end();
+ for (; ii != iend; ++ii) {
+ Dimension dim;
+ MetricsInfo mi(bv(), getFont(pit, ii->pos), workWidth());
+ ii->inset->metrics(mi, dim);
+ }
+
+ // rebreak the paragraph
+ int par_width = 0;
+ int const ww = workWidth();
+ pit->height = 0;
+
+ for (pos_type z = 0; z < pit->size() + 1; ) {
+ Row row(z);
+ z = rowBreakPoint(pit, row) + 1;
+ row.end(z);
+ pit->rows.push_back(row);
+ RowList::iterator rit = boost::prior(pit->rows.end());
+ int const f = fill(pit, *rit, ww);
+ int const w = ww - f;
+ par_width = std::max(par_width, w);
+ rit->fill(f);
+ rit->width(w);
+ prepareToPrint(pit, rit);
+ setHeightOfRow(pit, *rit);
+ rit->y_offset(pit->height);
+ pit->height += rit->height();
+ }
+ height += pit->height;
+
+ //lyxerr << "redoParagraph: " << pit->rows.size() << " rows\n";
+ return par_width;
+}
+
+
+int LyXText::redoParagraphs(ParagraphList::iterator start,
+ ParagraphList::iterator end)
+{
+ int pars_width = 0;
+ for ( ; start != end; ++start) {
+ int par_width = redoParagraphInternal(start);
+ pars_width = std::max(par_width, pars_width);
+ }
+ updateRowPositions();
+ return pars_width;
+}
+
+
+void LyXText::redoParagraph(ParagraphList::iterator pit)
+{
+ redoParagraphInternal(pit);
+ updateRowPositions();
+}
+
+
+void LyXText::fullRebreak()
+{
+ redoParagraphs(ownerParagraphs().begin(), ownerParagraphs().end());
+ redoCursor();
+ selection.cursor = cursor;
+}
+
+
+void LyXText::metrics(MetricsInfo & mi, Dimension & dim)
+{
+ lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+ << " workWidth: " << workWidth() << "\nfont: " << mi.base.font << endl;
+ //BOOST_ASSERT(mi.base.textwidth);
+
+ // rebuild row cache
+ width = 0;
+ ///height = 0;
+
+ //anchor_y_ = 0;
+ width = redoParagraphs(ownerParagraphs().begin(), ownerParagraphs().end());
+
+ // final dimension
+ dim.asc = firstRow()->ascent_of_text();
+ dim.des = height - dim.asc;
+ dim.wid = std::max(mi.base.textwidth, int(width));
}
projects / lyx.git / blobdiff