#include "lyxtext.h"
#include "lyxrow.h"
-#include "lyxtextclasslist.h"
#include "paragraph.h"
#include "gettext.h"
#include "bufferparams.h"
#include "buffer.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 "language.h"
#include "ParagraphParameters.h"
#include "undo_funcs.h"
+#include "WordLangTuple.h"
+#include "paragraph_funcs.h"
+#include "rowpainter.h"
-#include "insets/insetbib.h"
#include "insets/insettext.h"
#include "support/textutils.h"
using std::pair;
using lyx::pos_type;
-namespace {
-
-int const LYX_PAPER_MARGIN = 20;
-
-} // namespace anon
+/// top, right, bottom pixel margin
+extern int const PAPER_MARGIN = 20;
+/// margin for changebar
+extern int const CHANGEBAR_MARGIN = 10;
+/// left margin
+extern int const LEFT_MARGIN = PAPER_MARGIN + CHANGEBAR_MARGIN;
extern int bibitemMaxWidth(BufferView *, LyXFont const &);
-int LyXText::workWidth(BufferView * bview) const
+int LyXText::workWidth(BufferView & bview) const
{
if (inset_owner) {
- return inset_owner->textWidth(bview);
+ // FIXME: pass (const ?) ref
+ return inset_owner->textWidth(&bview);
}
- return bview->workWidth();
+ return bview.workWidth();
}
-int LyXText::workWidth(BufferView * bview, Inset * inset) const
+int LyXText::workWidth(BufferView & bview, Inset * inset) const
{
- Paragraph * par = 0;
- pos_type pos = -1;
-
- par = inset->parOwner();
- if (par)
- pos = par->getPositionOfInset(inset);
-
- if (!par || pos == -1) {
- lyxerr << "LyXText::workWidth: something is wrong,"
- " fall back to the brute force method" << endl;
- Buffer::inset_iterator it = bview->buffer()->inset_iterator_begin();
- Buffer::inset_iterator end = bview->buffer()->inset_iterator_end();
- for (; it != end; ++it) {
- if (*it == inset) {
- par = it.getPar();
- pos = it.getPos();
- break;
- }
- }
- }
+ Paragraph * par = inset->parOwner();
+ lyx::Assert(par);
- if (!par) {
- return workWidth(bview);
- }
+ pos_type pos = par->getPositionOfInset(inset);
+ lyx::Assert(pos != -1);
- LyXLayout const & layout =
- textclasslist[bview->buffer()->params.textclass][par->layout()];
+ LyXLayout_ptr const & layout = par->layout();
- if (layout.margintype != MARGIN_RIGHT_ADDRESS_BOX) {
+ 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(bview) - leftMargin(bview, &dummyrow);
+ return workWidth(bview) - leftMargin(&bview, &dummyrow);
} else {
int dummy_y;
Row * row = getRow(par, pos, dummy_y);
Row * frow = row;
while (frow->previous() && frow->par() == frow->previous()->par())
frow = frow->previous();
+
+ // FIXME: I don't understand this code - jbl
+
unsigned int maxw = 0;
- while (frow->next() && frow->par() == frow->next()->par()) {
+ while (!frow->isParEnd()) {
if ((frow != row) && (maxw < frow->width()))
maxw = frow->width();
frow = frow->next();
}
if (maxw)
return maxw;
+
}
return workWidth(bview);
}
}
if (Encodings::is_arabic(next_char)) {
- if (Encodings::is_arabic(prev_char))
+ if (Encodings::is_arabic(prev_char) &&
+ !Encodings::is_arabic_special(prev_char))
return Encodings::TransformChar(c, Encodings::FORM_MEDIAL);
else
return Encodings::TransformChar(c, Encodings::FORM_INITIAL);
} else {
- if (Encodings::is_arabic(prev_char))
+ if (Encodings::is_arabic(prev_char) &&
+ !Encodings::is_arabic_special(prev_char))
return Encodings::TransformChar(c, Encodings::FORM_FINAL);
else
return Encodings::TransformChar(c, Encodings::FORM_ISOLATED);
return font_metrics::width(c, font);
} else if (IsHfillChar(c)) {
- // Because of the representation as vertical lines
+ // Because of the representation as vertical lines
return 3;
} else if (c == Paragraph::META_INSET) {
Inset * tmpinset = par->getInset(pos);
}
-// Returns the paragraph position of the last character in the specified row
-pos_type LyXText::rowLast(Row const * row) const
-{
- if (!row->next() || row->next()->par() != row->par()) {
- return row->par()->size() - 1;
- } else {
- return row->next()->pos() - 1;
- }
-}
-
-
-pos_type LyXText::rowLastPrintable(Row const * row) const
-{
- pos_type const last = rowLast(row);
- bool ignore_the_space_on_the_last_position = true;
- Inset * ins;
- // we have to consider a space on the last position in this case!
- if (row->next() && row->par() == row->next()->par() &&
- row->next()->par()->getChar(last+1) == Paragraph::META_INSET &&
- (ins=row->next()->par()->getInset(last+1)) &&
- (ins->needFullRow() || ins->display()))
- {
- ignore_the_space_on_the_last_position = false;
- }
- if (last >= row->pos()
- && row->next()
- && row->next()->par() == row->par()
- && row->par()->isSeparator(last)
- && ignore_the_space_on_the_last_position)
- return last - 1;
- else
- return last;
-}
-
-
void LyXText::computeBidiTables(Buffer const * buf, Row * row) const
{
bidi_same_direction = true;
}
bidi_start = row->pos();
- bidi_end = rowLastPrintable(row);
+ bidi_end = row->lastPrintablePos();
if (bidi_start > bidi_end) {
bidi_start = -1;
int level = 0;
bool rtl = false;
bool rtl0 = false;
- pos_type const main_body = beginningOfMainBody(buf, row->par());
+ pos_type const main_body = row->par()->beginningOfMainBody();
for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) {
bool is_space = row->par()->isLineSeparator(lpos);
}
-void LyXText::drawNewline(DrawRowParams & p, pos_type const pos)
-{
- // Draw end-of-line marker
- LyXFont const font = getFont(p.bv->buffer(), p.row->par(), pos);
- int const wid = font_metrics::width('n', font);
- int const asc = font_metrics::maxAscent(font);
- int const y = p.yo + p.row->baseline();
- int xp[3];
- int yp[3];
-
- yp[0] = int(y - 0.875 * asc * 0.75);
- yp[1] = int(y - 0.500 * asc * 0.75);
- yp[2] = int(y - 0.125 * asc * 0.75);
-
- if (bidi_level(pos) % 2 == 0) {
- xp[0] = int(p.x + wid * 0.375);
- xp[1] = int(p.x);
- xp[2] = int(p.x + wid * 0.375);
- } else {
- xp[0] = int(p.x + wid * 0.625);
- xp[1] = int(p.x + wid);
- xp[2] = int(p.x + wid * 0.625);
- }
-
- p.pain->lines(xp, yp, 3, LColor::eolmarker);
-
- yp[0] = int(y - 0.500 * asc * 0.75);
- yp[1] = int(y - 0.500 * asc * 0.75);
- yp[2] = int(y - asc * 0.75);
-
- if (bidi_level(pos) % 2 == 0) {
- xp[0] = int(p.x);
- xp[1] = int(p.x + wid);
- xp[2] = int(p.x + wid);
- } else {
- xp[0] = int(p.x + wid);
- xp[1] = int(p.x);
- xp[2] = int(p.x);
- }
-
- p.pain->lines(xp, yp, 3, LColor::eolmarker);
-
- p.x += wid;
-}
-
-
-bool LyXText::drawInset(DrawRowParams & p, pos_type const pos)
-{
- Inset * inset = p.row->par()->getInset(pos);
-
- // FIXME: shouldn't happen
- if (!inset) {
- return true;
- }
-
- LyXFont const & font = getFont(p.bv->buffer(), p.row->par(), pos);
- // we need this here as the row pointer may be illegal
- // at a later time (Jug20020502)
- Row * prev = p.row->previous();
-
- inset->update(p.bv, font, false);
- inset->draw(p.bv, font, p.yo + p.row->baseline(), p.x, p.cleared);
-
- if (!need_break_row && !inset_owner
- && p.bv->text->status() == CHANGED_IN_DRAW) {
- if (prev && prev->par() == p.row->par()) {
- breakAgainOneRow(p.bv, prev);
- if (prev->next() != p.row) {
- // breakAgainOneRow() has removed p.row
- p.row = 0; // see what this breaks
- need_break_row = prev;
- } else {
- need_break_row = p.row;
- }
- } else if (!prev) {
- need_break_row = firstrow;
- } else {
- need_break_row = prev->next();
- }
- setCursor(p.bv, cursor.par(), cursor.pos());
- return false;
- }
- return true;
-}
-
-
-void LyXText::drawForeignMark(DrawRowParams & p, float const orig_x, LyXFont const & orig_font)
-{
- if (!lyxrc.mark_foreign_language)
- return;
- if (orig_font.language() == latex_language)
- return;
- if (orig_font.language() == p.bv->buffer()->params.language)
- return;
-
- int const y = p.yo + p.row->height() - 1;
- p.pain->line(int(orig_x), y, int(p.x), y, LColor::language);
-}
-
-
-void LyXText::drawHebrewComposeChar(DrawRowParams & p, pos_type & vpos)
-{
- pos_type pos = vis2log(vpos);
-
- string str;
-
- // first char
- char c = p.row->par()->getChar(pos);
- str += c;
- ++vpos;
-
- LyXFont const & font = getFont(p.bv->buffer(), p.row->par(), pos);
- int const width = font_metrics::width(c, font);
- int dx = 0;
-
- for (pos_type i = pos-1; i >= 0; --i) {
- c = p.row->par()->getChar(i);
- if (!Encodings::IsComposeChar_hebrew(c)) {
- if (IsPrintableNonspace(c)) {
- int const width2 =
- singleWidth(p.bv, p.row->par(), i, c);
- // dalet / resh
- dx = (c == 'ø' || c == 'ã')
- ? width2 - width
- : (width2 - width) / 2;
- }
- break;
- }
- }
-
- // Draw nikud
- p.pain->text(int(p.x) + dx, p.yo + p.row->baseline(), str, font);
-}
-
-
-void LyXText::drawArabicComposeChar(DrawRowParams & p, pos_type & vpos)
-{
- pos_type pos = vis2log(vpos);
- string str;
-
- // first char
- char c = p.row->par()->getChar(pos);
- c = transformChar(c, p.row->par(), pos);
- str +=c;
- ++vpos;
-
- LyXFont const & font = getFont(p.bv->buffer(), p.row->par(), pos);
- int const width = font_metrics::width(c, font);
- int dx = 0;
-
- for (pos_type i = pos-1; i >= 0; --i) {
- c = p.row->par()->getChar(i);
- if (!Encodings::IsComposeChar_arabic(c)) {
- if (IsPrintableNonspace(c)) {
- int const width2 =
- singleWidth(p.bv, p.row->par(), i, c);
- dx = (width2 - width) / 2;
- }
- break;
- }
- }
- // Draw nikud
- p.pain->text(int(p.x) + dx, p.yo + p.row->baseline(), str, font);
-}
-
-
-void LyXText::drawChars(DrawRowParams & p, pos_type & vpos,
- bool hebrew, bool arabic)
-{
- pos_type pos = vis2log(vpos);
- pos_type const last = rowLastPrintable(p.row);
- LyXFont const & orig_font = getFont(p.bv->buffer(), p.row->par(), pos);
-
- // first character
- string str;
- str += p.row->par()->getChar(pos);
- if (arabic) {
- unsigned char c = str[0];
- str[0] = transformChar(c, p.row->par(), pos);
- }
- ++vpos;
-
- // collect as much similar chars as we can
- while (vpos <= last && (pos = vis2log(vpos)) >= 0) {
- char c = p.row->par()->getChar(pos);
-
- if (!IsPrintableNonspace(c))
- break;
-
- if (arabic && Encodings::IsComposeChar_arabic(c))
- break;
- if (hebrew && Encodings::IsComposeChar_hebrew(c))
- break;
-
- if (orig_font != getFont(p.bv->buffer(), p.row->par(), pos))
- break;
-
- str += c;
- ++vpos;
- }
-
- // Draw text and set the new x position
- p.pain->text(int(p.x), p.yo + p.row->baseline(), str, orig_font);
- p.x += font_metrics::width(str, orig_font);
-}
-
-
-bool LyXText::draw(DrawRowParams & p, pos_type & vpos)
-{
- pos_type const pos = vis2log(vpos);
- Paragraph * par = p.row->par();
-
- LyXFont const & orig_font = getFont(p.bv->buffer(), par, pos);
-
- float const orig_x = p.x;
-
- char const c = par->getChar(pos);
-
- if (IsNewlineChar(c)) {
- ++vpos;
- drawNewline(p, pos);
- return true;
- } else if (IsInsetChar(c)) {
- if (!drawInset(p, pos))
- return false;
- ++vpos;
- drawForeignMark(p, orig_x, orig_font);
- return true;
- }
-
- // usual characters, no insets
-
- // special case languages
- bool const hebrew = (orig_font.language()->lang() == "hebrew");
- bool const arabic =
- orig_font.language()->lang() == "arabic" &&
- (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 ||
- lyxrc.font_norm_type == LyXRC::ISO_10646_1);
-
- // draw as many chars as we can
- if ((!hebrew && !arabic)
- || (hebrew && !Encodings::IsComposeChar_hebrew(c))
- || (arabic && !Encodings::IsComposeChar_arabic(c))) {
- drawChars(p, vpos, true, false);
- } else if (hebrew) {
- drawHebrewComposeChar(p, vpos);
- } else if (arabic) {
- drawArabicComposeChar(p, vpos);
- }
-
- drawForeignMark(p, orig_x, orig_font);
-
-#ifdef INHERIT_LANGUAGE
-#ifdef WITH_WARNINGS
- if ((font.language() == inherit_language) ||
- (font.language() == ignore_language))
- lyxerr << "No this shouldn't happen!\n";
-#endif
-#endif
- return true;
-}
-
-
int LyXText::leftMargin(BufferView * bview, Row const * row) const
{
Inset * ins;
if ((row->par()->getChar(row->pos()) == Paragraph::META_INSET) &&
(ins=row->par()->getInset(row->pos())) &&
(ins->needFullRow() || ins->display()))
- return LYX_PAPER_MARGIN;
+ return LEFT_MARGIN;
LyXTextClass const & tclass =
- textclasslist[bview->buffer()->params.textclass];
- LyXLayout const & layout = tclass[row->par()->layout()];
+ bview->buffer()->params.getLyXTextClass();
+ LyXLayout_ptr const & layout = row->par()->layout();
- string parindent = layout.parindent;
+ string parindent = layout->parindent;
+
+ int x = LEFT_MARGIN;
- int x = LYX_PAPER_MARGIN;
-
x += font_metrics::signedWidth(tclass.leftmargin(), tclass.defaultfont());
// 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.defaultLayoutName()) {
+ if (row->par()->layout() == tclass.defaultLayout()) {
// find the previous same level paragraph
if (row->par()->previous()) {
Paragraph * newpar = row->par()
->depthHook(row->par()->getDepth());
if (newpar &&
- tclass[newpar->layout()].nextnoindent)
+ newpar->layout()->nextnoindent)
parindent.erase();
}
}
} else {
// find the next level paragraph
- Paragraph * newpar =
- row->par()->outerHook();
+ Paragraph * newpar = row->par()->outerHook();
// make a corresponding row. Needed to call LeftMargin()
// check wether it is a sufficent paragraph
- if (newpar && tclass[newpar->layout()].isEnvironment()) {
+ if (newpar && newpar->layout()->isEnvironment()) {
Row dummyrow;
dummyrow.par(newpar);
dummyrow.pos(newpar->size());
row->par()->params().depth(0);
}
- if (newpar && row->par()->layout() == tclass.defaultLayoutName()) {
+ if (newpar && row->par()->layout() == tclass.defaultLayout()) {
if (newpar->params().noindent())
parindent.erase();
- else
- parindent = tclass[newpar->layout()].parindent;
+ else {
+ parindent = newpar->layout()->parindent;
+ }
+
}
}
LyXFont const labelfont = getLabelFont(bview->buffer(), row->par());
- switch (layout.margintype) {
+ switch (layout->margintype) {
case MARGIN_DYNAMIC:
- if (!layout.leftmargin.empty()) {
- x += font_metrics::signedWidth(layout.leftmargin,
+ if (!layout->leftmargin.empty()) {
+ x += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
}
if (!row->par()->getLabelstring().empty()) {
- x += font_metrics::signedWidth(layout.labelindent,
+ x += font_metrics::signedWidth(layout->labelindent,
labelfont);
x += font_metrics::width(row->par()->getLabelstring(),
labelfont);
- x += font_metrics::width(layout.labelsep, labelfont);
+ x += font_metrics::width(layout->labelsep, labelfont);
}
break;
case MARGIN_MANUAL:
- x += font_metrics::signedWidth(layout.labelindent, labelfont);
- if (row->pos() >= beginningOfMainBody(bview->buffer(), row->par())) {
+ x += font_metrics::signedWidth(layout->labelindent, labelfont);
+ if (row->pos() >= row->par()->beginningOfMainBody()) {
if (!row->par()->getLabelWidthString().empty()) {
x += font_metrics::width(row->par()->getLabelWidthString(),
labelfont);
- x += font_metrics::width(layout.labelsep, labelfont);
+ x += font_metrics::width(layout->labelsep, labelfont);
}
}
break;
case MARGIN_STATIC:
- x += font_metrics::signedWidth(layout.leftmargin, tclass.defaultfont()) * 4
+ x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()) * 4
/ (row->par()->getDepth() + 4);
break;
case MARGIN_FIRST_DYNAMIC:
- if (layout.labeltype == LABEL_MANUAL) {
- if (row->pos() >= beginningOfMainBody(bview->buffer(), row->par())) {
- x += font_metrics::signedWidth(layout.leftmargin,
+ if (layout->labeltype == LABEL_MANUAL) {
+ if (row->pos() >= row->par()->beginningOfMainBody()) {
+ x += font_metrics::signedWidth(layout->leftmargin,
labelfont);
} else {
- x += font_metrics::signedWidth(layout.labelindent,
+ x += font_metrics::signedWidth(layout->labelindent,
labelfont);
}
} else if (row->pos()
// Special case to fix problems with
// theorems (JMarc)
- || (layout.labeltype == LABEL_STATIC
- && layout.latextype == LATEX_ENVIRONMENT
+ || (layout->labeltype == LABEL_STATIC
+ && layout->latextype == LATEX_ENVIRONMENT
&& ! row->par()->isFirstInSequence())) {
- x += font_metrics::signedWidth(layout.leftmargin,
+ x += font_metrics::signedWidth(layout->leftmargin,
labelfont);
- } else if (layout.labeltype != LABEL_TOP_ENVIRONMENT
- && layout.labeltype != LABEL_BIBLIO
- && layout.labeltype !=
+ } else if (layout->labeltype != LABEL_TOP_ENVIRONMENT
+ && layout->labeltype != LABEL_BIBLIO
+ && layout->labeltype !=
LABEL_CENTERED_TOP_ENVIRONMENT) {
- x += font_metrics::signedWidth(layout.labelindent,
+ x += font_metrics::signedWidth(layout->labelindent,
labelfont);
- x += font_metrics::width(layout.labelsep, labelfont);
+ x += font_metrics::width(layout->labelsep, labelfont);
x += font_metrics::width(row->par()->getLabelstring(),
labelfont);
}
if (tmprow->fill() < minfill)
minfill = tmprow->fill();
}
-
- x += font_metrics::signedWidth(layout.leftmargin,
+
+ x += font_metrics::signedWidth(layout->leftmargin,
tclass.defaultfont());
x += minfill;
}
break;
}
- if ((workWidth(bview) > 0) &&
+ if ((workWidth(*bview) > 0) &&
!row->par()->params().leftIndent().zero())
{
LyXLength const len = row->par()->params().leftIndent();
int const tw = inset_owner ?
- inset_owner->latexTextWidth(bview) : workWidth(bview);
- x += len.inPixels(tw, bview->text->defaultHeight());
+ inset_owner->latexTextWidth(bview) : workWidth(*bview);
+ x += len.inPixels(tw);
}
LyXAlignment align; // wrong type
if (row->par()->params().align() == LYX_ALIGN_LAYOUT)
- align = layout.align;
+ align = layout->align;
else
align = row->par()->params().align();
// set the correct parindent
if (row->pos() == 0) {
- if ((layout.labeltype == LABEL_NO_LABEL
- || layout.labeltype == LABEL_TOP_ENVIRONMENT
- || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
- || (layout.labeltype == LABEL_STATIC
- && layout.latextype == LATEX_ENVIRONMENT
+ if ((layout->labeltype == LABEL_NO_LABEL
+ || layout->labeltype == LABEL_TOP_ENVIRONMENT
+ || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
+ || (layout->labeltype == LABEL_STATIC
+ && layout->latextype == LATEX_ENVIRONMENT
&& ! row->par()->isFirstInSequence()))
&& align == LYX_ALIGN_BLOCK
&& !row->par()->params().noindent()
&& (!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.defaultLayoutName() ||
+ && (row->par()->layout() != tclass.defaultLayout() ||
bview->buffer()->params.paragraph_separation ==
BufferParams::PARSEP_INDENT)) {
x += font_metrics::signedWidth(parindent,
tclass.defaultfont());
- } else if (layout.labeltype == LABEL_BIBLIO) {
+ } else if (layout->labeltype == LABEL_BIBLIO) {
// ale970405 Right width for bibitems
x += bibitemMaxWidth(bview, tclass.defaultfont());
}
}
-int LyXText::rightMargin(Buffer const * buf, Row const * row) const
+int LyXText::rightMargin(Buffer const & buf, Row const & row) const
{
Inset * ins;
- if ((row->par()->getChar(row->pos()) == Paragraph::META_INSET) &&
- (ins=row->par()->getInset(row->pos())) &&
+ if ((row.par()->getChar(row.pos()) == Paragraph::META_INSET) &&
+ (ins=row.par()->getInset(row.pos())) &&
(ins->needFullRow() || ins->display()))
- return LYX_PAPER_MARGIN;
+ return PAPER_MARGIN;
- LyXTextClass const & tclass = textclasslist[buf->params.textclass];
- LyXLayout const & layout = tclass[row->par()->layout()];
+ LyXTextClass const & tclass = buf.params.getLyXTextClass();
+ LyXLayout_ptr const & layout = row.par()->layout();
- int x = LYX_PAPER_MARGIN
+ int x = PAPER_MARGIN
+ font_metrics::signedWidth(tclass.rightmargin(),
tclass.defaultfont());
// 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()->getDepth()) {
// find the next level paragraph
- Paragraph * newpar = row->par();
+ Paragraph const * newpar = row.par();
do {
newpar = newpar->previous();
} while (newpar
- && newpar->getDepth() >= row->par()->getDepth());
+ && newpar->getDepth() >= row.par()->getDepth());
// make a corresponding row. Needed to call LeftMargin()
// check wether it is a sufficent paragraph
- if (newpar && tclass[newpar->layout()].isEnvironment()) {
+ if (newpar && newpar->layout()->isEnvironment()) {
Row dummyrow;
- dummyrow.par(newpar);
+ dummyrow.par(const_cast<Paragraph *>(newpar));
dummyrow.pos(0);
- x = rightMargin(buf, &dummyrow);
+ x = rightMargin(buf, dummyrow);
} else {
// this is no longer an error, because this function
// is used to clear impossible depths after changing
// a layout. Since there is always a redo,
// LeftMargin() is always called
- row->par()->params().depth(0);
+ row.par()->params().depth(0);
}
}
//lyxerr << "rightmargin: " << layout->rightmargin << endl;
- x += font_metrics::signedWidth(layout.rightmargin, tclass.defaultfont())
- * 4 / (row->par()->getDepth() + 4);
+ x += font_metrics::signedWidth(layout->rightmargin,
+ tclass.defaultfont())
+ * 4 / (row.par()->getDepth() + 4);
return x;
}
-int LyXText::labelEnd(BufferView * bview, Row const * row) const
+int LyXText::labelEnd(BufferView & bview, Row const & row) const
{
- if (textclasslist[bview->buffer()->params.textclass][row->par()->layout()].margintype
- == MARGIN_MANUAL) {
- Row tmprow;
- tmprow = *row;
- tmprow.pos(row->par()->size());
- // just the beginning of the main body
- return leftMargin(bview, &tmprow);
- } else {
- // LabelEnd is only needed,
- // if the layout fills a flushleft label.
- return 0;
+ if (row.par()->layout()->margintype == MARGIN_MANUAL) {
+ Row tmprow = row;
+ tmprow.pos(row.par()->size());
+ // just the beginning of the main body
+ return leftMargin(&bview, &tmprow);
}
+
+ // LabelEnd is only needed if the layout
+ // fills a flushleft label.
+ return 0;
}
// position of the last possible breakpoint
// -1 isn't a suitable value, but a flag
pos_type last_separator = -1;
- width -= rightMargin(bview->buffer(), row);
+ width -= rightMargin(*bview->buffer(), *row);
+
+ pos_type const main_body = par->beginningOfMainBody();
+ LyXLayout_ptr const & layout = par->layout();
- pos_type const main_body =
- beginningOfMainBody(bview->buffer(), par);
- LyXLayout const & layout =
- textclasslist[bview->buffer()->params.textclass][par->layout()];
pos_type i = pos;
- if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX) {
+ if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
// special code for right address boxes, only newlines count
while (i < par->size()) {
if (par->isNewline(i)) {
// valid here. if not, change it to
// non-display
if (in->display() &&
- (layout.isCommand() ||
- (layout.labeltype == LABEL_MANUAL
- && i < beginningOfMainBody(bview->buffer(), par))))
+ (layout->isCommand() ||
+ (layout->labeltype == LABEL_MANUAL
+ && i < par->beginningOfMainBody())))
{
// display istn't allowd
in->display(false);
}
++i;
if (i == main_body) {
- x += font_metrics::width(layout.labelsep,
+ x += font_metrics::width(layout->labelsep,
getLabelFont(bview->buffer(), par));
if (par->isLineSeparator(i - 1))
x-= singleWidth(bview, par, i - 1);
- int left_margin = labelEnd(bview, row);
+ int left_margin = labelEnd(*bview, *row);
if (x < left_margin)
x = left_margin;
}
// returns the minimum space a row needs on the screen in pixel
-int LyXText::fill(BufferView * bview, Row * row, int paper_width) const
+int LyXText::fill(BufferView & bview, Row & row, int paper_width) const
{
if (paper_width < 0)
return 0;
int w;
// get the pure distance
- pos_type const last = rowLastPrintable(row);
+ pos_type const last = row.lastPrintablePos();
// special handling of the right address boxes
- if (textclasslist[bview->buffer()->params.textclass][row->par()->layout()].margintype
- == MARGIN_RIGHT_ADDRESS_BOX)
- {
- int const tmpfill = row->fill();
- row->fill(0); // the minfill in MarginLeft()
- w = leftMargin(bview, row);
- row->fill(tmpfill);
+ if (row.par()->layout()->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
+ int const tmpfill = row.fill();
+ row.fill(0); // the minfill in MarginLeft()
+ w = leftMargin(&bview, &row);
+ row.fill(tmpfill);
} else
- w = leftMargin(bview, row);
+ w = leftMargin(&bview, &row);
+
+ Paragraph * par = row.par();
+ LyXLayout_ptr const & layout = par->layout();
- LyXLayout const & layout = textclasslist[bview->buffer()->params.textclass][row->par()->layout()];
- pos_type const main_body =
- beginningOfMainBody(bview->buffer(), row->par());
- pos_type i = row->pos();
+ pos_type const main_body = par->beginningOfMainBody();
+ pos_type i = row.pos();
while (i <= last) {
if (main_body > 0 && i == main_body) {
- w += font_metrics::width(layout.labelsep, getLabelFont(bview->buffer(), row->par()));
- if (row->par()->isLineSeparator(i - 1))
- w -= singleWidth(bview, row->par(), i - 1);
+ w += font_metrics::width(layout->labelsep, getLabelFont(bview.buffer(), par));
+ if (par->isLineSeparator(i - 1))
+ w -= singleWidth(&bview, par, i - 1);
int left_margin = labelEnd(bview, row);
if (w < left_margin)
w = left_margin;
}
- w += singleWidth(bview, row->par(), i);
+ w += singleWidth(&bview, par, i);
++i;
}
if (main_body > 0 && main_body > last) {
- w += font_metrics::width(layout.labelsep, getLabelFont(bview->buffer(), row->par()));
- if (last >= 0 && row->par()->isLineSeparator(last))
- w -= singleWidth(bview, row->par(), last);
+ w += font_metrics::width(layout->labelsep, getLabelFont(bview.buffer(), par));
+ if (last >= 0 && par->isLineSeparator(last))
+ w -= singleWidth(&bview, par, last);
int const left_margin = labelEnd(bview, row);
if (w < left_margin)
w = left_margin;
}
- int const fill = paper_width - w - rightMargin(bview->buffer(), row);
+ int const fill = paper_width - w - rightMargin(*bview.buffer(), row);
return fill;
}
// returns the minimum space a manual label needs on the screen in pixel
-int LyXText::labelFill(BufferView * bview, Row const * row) const
+int LyXText::labelFill(BufferView & bview, Row const & row) const
{
- pos_type last = beginningOfMainBody(bview->buffer(), row->par()) - 1;
+ pos_type last = row.par()->beginningOfMainBody();
+
+ lyx::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.
-
- // I don't understand this code in depth, but sometimes "last" is
- // less than 0 and this causes a crash. This fix seems to work
- // correctly, but I bet the real error is elsewhere. The bug is
- // triggered when you have an open footnote in a paragraph
- // environment with a manual label. (Asger)
- if (last < 0) last = 0;
+ --last;
// a separator at this end does not count
- if (row->par()->isLineSeparator(last))
+ if (row.par()->isLineSeparator(last))
--last;
int w = 0;
- pos_type i = row->pos();
+ pos_type i = row.pos();
while (i <= last) {
- w += singleWidth(bview, row->par(), i);
+ w += singleWidth(&bview, row.par(), i);
++i;
}
int fill = 0;
- if (!row->par()->params().labelWidthString().empty()) {
- fill = max(font_metrics::width(row->par()->params().labelWidthString(),
- getLabelFont(bview->buffer(), row->par())) - w,
- 0);
+ string const & labwidstr = row.par()->params().labelWidthString();
+ if (!labwidstr.empty()) {
+ LyXFont const labfont = getLabelFont(bview.buffer(), row.par());
+ int const labwidth = font_metrics::width(labwidstr, labfont);
+ fill = max(labwidth - w, 0);
}
return fill;
}
-// returns the number of separators in the specified row. The separator
-// on the very last column doesnt count
-int LyXText::numberOfSeparators(Buffer const * buf, Row const * row) const
-{
- pos_type last = rowLastPrintable(row);
- pos_type p = max(row->pos(), beginningOfMainBody(buf, row->par()));
-
- int n = 0;
- for (; p <= last; ++p) {
- if (row->par()->isSeparator(p)) {
- ++n;
- }
- }
- return n;
-}
-
-
-// returns the number of hfills in the specified row. The LyX-Hfill is
-// a LaTeX \hfill so that the hfills at the beginning and at the end were
-// ignored. This is *MUCH* more usefull than not to ignore!
-int LyXText::numberOfHfills(Buffer const * buf, Row const * row) const
-{
- pos_type const last = rowLast(row);
- pos_type first = row->pos();
-
- if (first) {
- // hfill *DO* count at the beginning of paragraphs!
- while (first <= last && row->par()->isHfill(first)) {
- ++first;
- }
- }
-
- first = max(first, beginningOfMainBody(buf, row->par()));
- int n = 0;
- for (pos_type p = first; p <= last; ++p) {
- // last, because the end is ignored!
-
- if (row->par()->isHfill(p)) {
- ++n;
- }
- }
- return n;
-}
-
-
-// like NumberOfHfills, but only those in the manual label!
-int LyXText::numberOfLabelHfills(Buffer const * buf, Row const * row) const
-{
- pos_type last = rowLast(row);
- pos_type first = row->pos();
- if (first) {
- // hfill *DO* count at the beginning of paragraphs!
- while (first < last && row->par()->isHfill(first))
- ++first;
- }
-
- last = min(last, beginningOfMainBody(buf, row->par()));
- int n = 0;
- for (pos_type p = first; p < last; ++p) {
- // last, because the end is ignored!
- if (row->par()->isHfill(p)) {
- ++n;
- }
- }
- return n;
-}
-
-
-// returns true, if a expansion is needed.
-// Rules are given by LaTeX
-bool LyXText::hfillExpansion(Buffer const * buf, Row const * row_ptr,
- pos_type pos) const
-{
- // by the way, is it a hfill?
- if (!row_ptr->par()->isHfill(pos))
- return false;
-
- // at the end of a row it does not count
- // unless another hfill exists on the line
- if (pos >= rowLast(row_ptr)) {
- pos_type i = row_ptr->pos();
- while (i < pos && !row_ptr->par()->isHfill(i)) {
- ++i;
- }
- if (i == pos) {
- return false;
- }
- }
-
- // at the beginning of a row it does not count, if it is not
- // the first row of a paragaph
- if (!row_ptr->pos())
- return true;
-
- // in some labels it does not count
- if (textclasslist[buf->params.textclass][row_ptr->par()->layout()].margintype
- != MARGIN_MANUAL
- && pos < beginningOfMainBody(buf, row_ptr->par()))
- return false;
-
- // if there is anything between the first char of the row and
- // the sepcified position that is not a newline and not a hfill,
- // the hfill will count, otherwise not
- pos_type i = row_ptr->pos();
- while (i < pos && (row_ptr->par()->isNewline(i)
- || row_ptr->par()->isHfill(i)))
- ++i;
-
- return i != pos;
-}
-
-
-LColor::color LyXText::backgroundColor()
+LColor::color LyXText::backgroundColor() const
{
if (inset_owner)
return inset_owner->backgroundColor();
return LColor::background;
}
-void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const
+void LyXText::setHeightOfRow(BufferView * bview, Row * row) const
{
// get the maximum ascent and the maximum descent
int asc = 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
+ // of the possibility of open footnotes
// Correction: only the fontsize count. The other properties
- // are taken from the layoutfont. Nicer on the screen :)
- Paragraph * par = row_ptr->par();
- Paragraph * firstpar = row_ptr->par();
+ // are taken from the layoutfont. Nicer on the screen :)
+ Paragraph * par = row->par();
+ Paragraph * firstpar = row->par();
- LyXLayout const & layout
- = textclasslist[bview->buffer()->params.textclass][firstpar->layout()];
+ LyXLayout_ptr const & layout = firstpar->layout();
- // as max get the first character of this row then it can increes but not
- // decrees the height. Just some point to start with so we don't have to
+ // 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(bview->buffer(), par, row_ptr->pos());
+ LyXFont font = getFont(bview->buffer(), par, row->pos());
LyXFont::FONT_SIZE const tmpsize = font.size();
font = getLayoutFont(bview->buffer(), par);
LyXFont::FONT_SIZE const size = font.size();
LyXFont labelfont = getLabelFont(bview->buffer(), par);
float spacing_val = 1.0;
- if (!row_ptr->par()->params().spacing().isDefault()) {
- spacing_val = row_ptr->par()->params().spacing().getValue();
+ if (!row->par()->params().spacing().isDefault()) {
+ spacing_val = row->par()->params().spacing().getValue();
} else {
spacing_val = bview->buffer()->params.spacing.getValue();
}
//lyxerr << "spacing_val = " << spacing_val << endl;
int maxasc = int(font_metrics::maxAscent(font) *
- layout.spacing.getValue() *
- spacing_val);
+ 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 = rowLast(row_ptr);
+ pos_type const pos_end = row->lastPos();
int labeladdon = 0;
int maxwidth = 0;
// Check if any insets are larger
- for (pos_type pos = row_ptr->pos(); pos <= pos_end; ++pos) {
- if (row_ptr->par()->isInset(pos)) {
- tmpfont = getFont(bview->buffer(), row_ptr->par(), pos);
- tmpinset = row_ptr->par()->getInset(pos);
+ for (pos_type pos = row->pos(); pos <= pos_end; ++pos) {
+ if (row->par()->isInset(pos)) {
+ tmpfont = getFont(bview->buffer(), row->par(), pos);
+ tmpinset = row->par()->getInset(pos);
if (tmpinset) {
#if 1 // this is needed for deep update on initialitation
tmpinset->update(bview, tmpfont);
maxdesc = max(maxdesc, desc);
}
} else {
- maxwidth += singleWidth(bview, row_ptr->par(), pos);
+ maxwidth += singleWidth(bview, row->par(), pos);
}
}
// This is not completely correct, but we can live with the small,
// cosmetic error for now.
LyXFont::FONT_SIZE maxsize =
- row_ptr->par()->highestFontInRange(row_ptr->pos(), pos_end, size);
+ row->par()->highestFontInRange(row->pos(), pos_end, size);
if (maxsize > font.size()) {
font.setSize(maxsize);
++maxasc;
++maxdesc;
- row_ptr->ascent_of_text(maxasc);
+ row->ascent_of_text(maxasc);
// is it a top line?
- if (!row_ptr->pos() && (row_ptr->par() == firstpar)) {
+ if (!row->pos() && (row->par() == firstpar)) {
// some parksips VERY EASY IMPLEMENTATION
if (bview->buffer()->params.paragraph_separation ==
BufferParams::PARSEP_SKIP)
{
- if (layout.isParagraph()
+ if (layout->isParagraph()
&& firstpar->getDepth() == 0
&& firstpar->previous())
{
- maxasc += bview->buffer()->params.getDefSkip().inPixels(bview);
+ maxasc += bview->buffer()->params.getDefSkip().inPixels(*bview);
} else if (firstpar->previous() &&
- textclasslist[bview->buffer()->params.textclass][firstpar->previous()->layout()].isParagraph() &&
+ firstpar->previous()->layout()->isParagraph() &&
firstpar->previous()->getDepth() == 0)
{
// is it right to use defskip here too? (AS)
- maxasc += bview->buffer()->params.getDefSkip().inPixels(bview);
+ maxasc += bview->buffer()->params.getDefSkip().inPixels(*bview);
}
}
- // the paper margins
- if (!row_ptr->par()->previous() && bv_owner)
- maxasc += LYX_PAPER_MARGIN;
+ // the top margin
+ if (!row->par()->previous() && isTopLevel())
+ maxasc += PAPER_MARGIN;
// add the vertical spaces, that the user added
- maxasc += getLengthMarkerHeight(bview, firstpar->params().spaceTop());
+ maxasc += getLengthMarkerHeight(*bview, firstpar->params().spaceTop());
// do not forget the DTP-lines!
// there height depends on the font of the nearest character
firstpar, 0));
// and now the pagebreaks
if (firstpar->params().pagebreakTop())
- maxasc += 3 * defaultHeight();
+ maxasc += 3 * defaultRowHeight();
// 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
+ if (layout->labeltype == LABEL_COUNTER_CHAPTER
&& bview->buffer()->params.secnumdepth >= 0)
{
float spacing_val = 1.0;
- if (!row_ptr->par()->params().spacing().isDefault()) {
- spacing_val = row_ptr->par()->params().spacing().getValue();
+ if (!row->par()->params().spacing().isDefault()) {
+ spacing_val = row->par()->params().spacing().getValue();
} else {
spacing_val = bview->buffer()->params.spacing.getValue();
}
labeladdon = int(font_metrics::maxDescent(labelfont) *
- layout.spacing.getValue() *
- spacing_val)
+ layout->spacing.getValue() *
+ spacing_val)
+ int(font_metrics::maxAscent(labelfont) *
- layout.spacing.getValue() *
+ layout->spacing.getValue() *
spacing_val);
}
// special code for the top label
- if ((layout.labeltype == LABEL_TOP_ENVIRONMENT
- || layout.labeltype == LABEL_BIBLIO
- || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
- && row_ptr->par()->isFirstInSequence()
- && !row_ptr->par()->getLabelstring().empty())
+ if ((layout->labeltype == LABEL_TOP_ENVIRONMENT
+ || layout->labeltype == LABEL_BIBLIO
+ || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
+ && row->par()->isFirstInSequence()
+ && !row->par()->getLabelstring().empty())
{
float spacing_val = 1.0;
- if (!row_ptr->par()->params().spacing().isDefault()) {
- spacing_val = row_ptr->par()->params().spacing().getValue();
+ if (!row->par()->params().spacing().isDefault()) {
+ spacing_val = row->par()->params().spacing().getValue();
} else {
spacing_val = bview->buffer()->params.spacing.getValue();
}
labeladdon = int(
(font_metrics::maxAscent(labelfont) *
- layout.spacing.getValue() *
+ layout->spacing.getValue() *
spacing_val)
+(font_metrics::maxDescent(labelfont) *
- layout.spacing.getValue() *
+ layout->spacing.getValue() *
spacing_val)
- + layout.topsep * defaultHeight()
- + layout.labelbottomsep * defaultHeight());
+ + layout->topsep * defaultRowHeight()
+ + layout->labelbottomsep * defaultRowHeight());
}
// and now the layout spaces, for example before and after a section,
// or between the items of a itemize or enumerate environment
if (!firstpar->params().pagebreakTop()) {
- Paragraph * prev = row_ptr->par()->previous();
+ Paragraph * prev = row->par()->previous();
if (prev)
- prev = row_ptr->par()->depthHook(row_ptr->par()->getDepth());
+ prev = row->par()->depthHook(row->par()->getDepth());
if (prev && prev->layout() == firstpar->layout() &&
prev->getDepth() == firstpar->getDepth() &&
prev->getLabelWidthString() == firstpar->getLabelWidthString())
{
- layoutasc = (layout.itemsep * defaultHeight());
- } else if (row_ptr->previous()) {
- tmptop = layout.topsep;
+ layoutasc = (layout->itemsep * defaultRowHeight());
+ } else if (row->previous()) {
+ tmptop = layout->topsep;
- if (row_ptr->previous()->par()->getDepth() >= row_ptr->par()->getDepth())
- tmptop -= textclasslist[bview->buffer()->params.textclass][row_ptr->previous()->par()->layout()].bottomsep;
+ if (row->previous()->par()->getDepth() >= row->par()->getDepth())
+ tmptop -= row->previous()->par()->layout()->bottomsep;
if (tmptop > 0)
- layoutasc = (tmptop * defaultHeight());
- } else if (row_ptr->par()->params().lineTop()) {
- tmptop = layout.topsep;
+ layoutasc = (tmptop * defaultRowHeight());
+ } else if (row->par()->params().lineTop()) {
+ tmptop = layout->topsep;
if (tmptop > 0)
- layoutasc = (tmptop * defaultHeight());
+ layoutasc = (tmptop * defaultRowHeight());
}
- prev = row_ptr->par()->outerHook();
+ prev = row->par()->outerHook();
if (prev) {
- maxasc += int(textclasslist[bview->buffer()->params.textclass][prev->layout()].parsep * defaultHeight());
+ maxasc += int(prev->layout()->parsep * defaultRowHeight());
} else {
if (firstpar->previous() &&
firstpar->previous()->getDepth() == 0 &&
{
// avoid parsep
} else if (firstpar->previous()) {
- maxasc += int(layout.parsep * defaultHeight());
+ maxasc += int(layout->parsep * defaultRowHeight());
}
}
}
}
// is it a bottom line?
- if (row_ptr->par() == par
- && (!row_ptr->next() || row_ptr->next()->par() != row_ptr->par()))
- {
- // the paper margins
- if (!par->next() && bv_owner)
- maxdesc += LYX_PAPER_MARGIN;
+ if (row->par() == par
+ && (!row->next() || row->next()->par() != row->par())) {
+ // the bottom margin
+ if (!par->next() && isTopLevel())
+ maxdesc += PAPER_MARGIN;
// add the vertical spaces, that the user added
- maxdesc += getLengthMarkerHeight(bview, firstpar->params().spaceBottom());
+ maxdesc += getLengthMarkerHeight(*bview, firstpar->params().spaceBottom());
// do not forget the DTP-lines!
// there height depends on the font of the nearest character
if (firstpar->params().lineBottom())
maxdesc += 2 * font_metrics::ascent('x',
- getFont(bview->buffer(),
+ getFont(bview->buffer(),
par,
max(pos_type(0), par->size() - 1)));
// and now the pagebreaks
if (firstpar->params().pagebreakBottom())
- maxdesc += 3 * defaultHeight();
+ maxdesc += 3 * defaultRowHeight();
// and now the layout spaces, for example before and after
// a section, or between the items of a itemize or enumerate
// environment
if (!firstpar->params().pagebreakBottom()
- && row_ptr->par()->next()) {
- Paragraph * nextpar = row_ptr->par()->next();
- Paragraph * comparepar = row_ptr->par();
+ && row->par()->next()) {
+ Paragraph * nextpar = row->par()->next();
+ Paragraph * comparepar = row->par();
float usual = 0;
float unusual = 0;
if (comparepar->getDepth() > nextpar->getDepth()) {
- usual = (textclasslist[bview->buffer()->params.textclass][comparepar->layout()].bottomsep * defaultHeight());
+ usual = (comparepar->layout()->bottomsep * defaultRowHeight());
comparepar = comparepar->depthHook(nextpar->getDepth());
if (comparepar->layout()!= nextpar->layout()
|| nextpar->getLabelWidthString() !=
comparepar->getLabelWidthString())
{
- unusual = (textclasslist[bview->buffer()->params.textclass][comparepar->layout()].bottomsep * defaultHeight());
+ unusual = (comparepar->layout()->bottomsep * defaultRowHeight());
}
if (unusual > usual)
layoutdesc = unusual;
if (comparepar->layout() != nextpar->layout()
|| nextpar->getLabelWidthString() !=
comparepar->getLabelWidthString())
- layoutdesc = int(textclasslist[bview->buffer()->params.textclass][comparepar->layout()].bottomsep * defaultHeight());
+ layoutdesc = int(comparepar->layout()->bottomsep * defaultRowHeight());
}
}
}
maxdesc += int(layoutdesc * 2 / (2 + firstpar->getDepth()));
// calculate the new height of the text
- height -= row_ptr->height();
+ height -= row->height();
+
+ row->height(maxasc + maxdesc + labeladdon);
+ row->baseline(maxasc + labeladdon);
+
+ height += row->height();
- row_ptr->height(maxasc + maxdesc + labeladdon);
- row_ptr->baseline(maxasc + labeladdon);
+ row->top_of_text(row->baseline() - font_metrics::maxAscent(font));
- height += row_ptr->height();
float x = 0;
- if (layout.margintype != MARGIN_RIGHT_ADDRESS_BOX) {
+ if (layout->margintype != MARGIN_RIGHT_ADDRESS_BOX) {
float dummy;
// this IS needed
- row_ptr->width(maxwidth);
- prepareToPrint(bview, row_ptr, x, dummy, dummy, dummy, false);
+ row->width(maxwidth);
+ prepareToPrint(bview, row, x, dummy, dummy, dummy, false);
}
- row_ptr->width(int(maxwidth + x));
+ row->width(int(maxwidth + x));
if (inset_owner) {
Row * r = firstrow;
- width = max(0,workWidth(bview));
+ width = max(0, workWidth(*bview));
while (r) {
if (r->width() > width)
width = r->width();
// Appends the implicit specified paragraph behind the specified row,
-// start at the implicit given position
+// start at the implicit given position
void LyXText::appendParagraph(BufferView * bview, Row * row) const
{
bool not_ready = true;
pos_type const lastposition = row->par()->size();
do {
// Get the next breakpoint
- pos_type z = nextBreakPoint(bview, row, workWidth(bview));
+ pos_type z = nextBreakPoint(bview, row, workWidth(*bview));
Row * tmprow = row;
// Set the dimensions of the row
// fixed fill setting now by calling inset->update() in
// SingleWidth when needed!
- tmprow->fill(fill(bview, tmprow, workWidth(bview)));
+ tmprow->fill(fill(*bview, *tmprow, workWidth(*bview)));
setHeightOfRow(bview, tmprow);
} while (not_ready);
}
+// Do we even need this at all ? Code that uses RowPainter *already*
+// sets need_break_row when it sees a CHANGED_IN_DRAW, though not
+// quite like this
+void LyXText::markChangeInDraw(BufferView * bv, Row * row, Row * prev)
+{
+ if (prev && prev->par() == row->par()) {
+ breakAgainOneRow(bv, prev);
+ if (prev->next() != row) {
+ // breakAgainOneRow() has removed row_
+ need_break_row = prev;
+ } else {
+ need_break_row = row;
+ }
+ } else if (!prev) {
+ need_break_row = firstrow;
+ } else {
+ need_break_row = prev->next();
+ }
+ setCursor(bv, cursor.par(), cursor.pos());
+ /* FIXME */
+}
+
+
void LyXText::breakAgain(BufferView * bview, Row * row) const
{
bool not_ready = true;
do {
// get the next breakpoint
- pos_type z = nextBreakPoint(bview, row, workWidth(bview));
+ pos_type z = nextBreakPoint(bview, row, workWidth(*bview));
Row * tmprow = row;
if (z < row->par()->size()) {
not_ready = false;
}
- // set the dimensions of the row
- tmprow->fill(fill(bview, tmprow, workWidth(bview)));
+ // set the dimensions of the row
+ tmprow->fill(fill(*bview, *tmprow, workWidth(*bview)));
setHeightOfRow(bview, tmprow);
} while (not_ready);
}
void LyXText::breakAgainOneRow(BufferView * bview, Row * row)
{
// get the next breakpoint
- pos_type z = nextBreakPoint(bview, row, workWidth(bview));
+ pos_type z = nextBreakPoint(bview, row, workWidth(*bview));
Row * tmprow = row;
if (z < row->par()->size()) {
if (!row->next()
|| (row->next() && row->next()->par() != row->par())) {
- // insert a new row
+ // insert a new row
++z;
insertRow(row, row->par(), z);
row = row->next();
}
// set the dimensions of the row
- tmprow->fill(fill(bview, tmprow, workWidth(bview)));
+ tmprow->fill(fill(*bview, *tmprow, workWidth(*bview)));
setHeightOfRow(bview, tmprow);
}
void LyXText::breakParagraph(BufferView * bview, 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()))
+ return;
+
LyXTextClass const & tclass =
- textclasslist[bview->buffer()->params.textclass];
- LyXLayout const & layout = tclass[cursor.par()->layout()];
+ bview->buffer()->params.getLyXTextClass();
+ LyXLayout_ptr const & layout = cursor.par()->layout();
// this is only allowed, if the current paragraph is not empty or caption
// and if it has not the keepempty flag aktive
- if ((cursor.par()->size() <= 0)
- && layout.labeltype != LABEL_SENSITIVE
- && !layout.keepempty)
+ if (cursor.par()->empty()
+ && layout->labeltype != LABEL_SENSITIVE
+ && !layout->keepempty)
return;
setUndo(bview, Undo::FINISH, cursor.par(), cursor.par()->next());
if (keep_layout)
keep_layout = 2;
else
- keep_layout = layout.isEnvironment();
+ keep_layout = layout->isEnvironment();
// we need to set this before we insert the paragraph. IMO the
// 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 = (layout.keepempty && !cursor.par()->size());
- cursor.par()->breakParagraph(bview->buffer()->params, cursor.pos(),
- keep_layout);
+ bool const isempty = (layout->keepempty && cursor.par()->empty());
+ ::breakParagraph(bview->buffer()->params, cursor.par(), cursor.pos(),
+ keep_layout);
// well this is the caption hack since one caption is really enough
- if (layout.labeltype == LABEL_SENSITIVE) {
+ if (layout->labeltype == LABEL_SENSITIVE) {
if (!cursor.pos())
// set to standard-layout
- cursor.par()->applyLayout(tclass.defaultLayoutName());
+ cursor.par()->applyLayout(tclass.defaultLayout());
else
// set to standard-layout
- cursor.par()->next()->applyLayout(tclass.defaultLayoutName());
+ cursor.par()->next()->applyLayout(tclass.defaultLayout());
}
// if the cursor is at the beginning of a row without prior newline,
// move one row up!
// This touches only the screen-update. Otherwise we would may have
- // an empty row on the screen
+ // an empty row on the screen
if (cursor.pos() && !cursor.row()->par()->isNewline(cursor.row()->pos() - 1)
- && cursor.row()->pos() == cursor.pos())
+ && cursor.row()->pos() == cursor.pos())
{
cursorLeft(bview);
}
refresh_y = cursor.y() - cursor.row()->baseline();
// Do not forget the special right address boxes
- if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX) {
+ if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
while (refresh_row->previous() &&
refresh_row->previous()->par() == refresh_row->par())
{
removeParagraph(cursor.row());
// set the dimensions of the cursor row
- cursor.row()->fill(fill(bview, cursor.row(), workWidth(bview)));
+ cursor.row()->fill(fill(*bview, *cursor.row(), workWidth(*bview)));
setHeightOfRow(bview, cursor.row());
- while (cursor.par()->next()->size()
+ while (!cursor.par()->next()->empty()
&& cursor.par()->next()->isNewline(0))
cursor.par()->next()->erase(0);
insertParagraph(bview, cursor.par()->next(), cursor.row());
- updateCounters(bview, cursor.row()->previous());
+ updateCounters(bview);
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
// insert a character, moves all the following breaks in the
-// same Paragraph one to the right and make a rebreak
+// same Paragraph one to the right and make a rebreak
void LyXText::insertChar(BufferView * bview, char c)
{
setUndo(bview, Undo::INSERT, cursor.par(), cursor.par()->next());
// When the free-spacing option is set for the current layout,
// disable the double-space checking
- bool const freeSpacing =
- textclasslist[bview->buffer()->params.textclass][cursor.row()->par()->layout()].free_spacing ||
+ bool const freeSpacing = cursor.row()->par()->layout()->free_spacing ||
cursor.row()->par()->isFreeSpacing();
if (lyxrc.auto_number) {
// CHECK There is a bug here! (Asger)
LyXFont realtmpfont = real_current_font;
- LyXFont rawtmpfont = 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
+ // 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();
static bool sent_space_message = false;
if (!sent_space_message) {
if (cursor.pos() == 0)
- bview->owner()->message(_("You cannot insert a space at the beginning of a paragraph. Please read the Tutorial."));
+ bview->owner()->message(_("You cannot insert a space at the beginning of a paragraph. Please read the Tutorial."));
else
- bview->owner()->message(_("You cannot type two spaces this way. Please read the Tutorial."));
+ bview->owner()->message(_("You cannot type two spaces this way. Please read the Tutorial."));
sent_space_message = true;
}
charInserted();
return;
}
} else if (IsNewlineChar(c)) {
- if (cursor.pos() <= beginningOfMainBody(bview->buffer(),
- cursor.par()))
- {
+ if (cursor.pos() <= cursor.par()->beginningOfMainBody()) {
charInserted();
return;
}
{
pos_type z = nextBreakPoint(bview,
row->previous(),
- workWidth(bview));
+ workWidth(*bview));
if (z >= row->pos()) {
row->pos(z + 1);
// set the dimensions of the row above
- row->previous()->fill(fill(bview,
- row->previous(),
- workWidth(bview)));
+ row->previous()->fill(fill(*bview,
+ *row->previous(),
+ workWidth(*bview)));
setHeightOfRow(bview, row->previous());
if (row->fill() >= 0) {
// needed because a newline will set fill to -1. Otherwise
// we would not get a rebreak!
- row->fill(fill(bview, row, workWidth(bview)));
+ row->fill(fill(*bview, *row, workWidth(*bview)));
}
+
if (c == Paragraph::META_INSET || row->fill() < 0) {
refresh_y = y;
refresh_row = row;
- refresh_x = cursor.x();
- refresh_pos = cursor.pos();
status(bview, LyXText::NEED_MORE_REFRESH);
breakAgainOneRow(bview, row);
// will the cursor be in another row now?
- if (rowLast(row) <= cursor.pos() + 1 && row->next()) {
+ if (row->lastPos() <= cursor.pos() + 1 && row->next()) {
if (row->next() && row->next()->par() == row->par())
// this should always be true
row = row->next();
need_break_row = 0;
} else {
refresh_y = y;
- refresh_x = cursor.x();
refresh_row = row;
- refresh_pos = cursor.pos();
int const tmpheight = row->height();
setHeightOfRow(bview, row);
redoHeightOfParagraph(bview, cursor);
} else {
// now the special right address boxes
- if (textclasslist[bview->buffer()->params.textclass][cursor.par()->layout()].margintype
+ if (cursor.par()->layout()->margintype
== MARGIN_RIGHT_ADDRESS_BOX) {
redoDrawingOfParagraph(bview, cursor);
}
bool const is_rtl =
row->par()->isRightToLeftPar(bview->buffer()->params);
if (is_rtl) {
- x = (workWidth(bview) > 0)
- ? rightMargin(bview->buffer(), row) : 0;
+ x = (workWidth(*bview) > 0)
+ ? rightMargin(*bview->buffer(), *row) : 0;
} else
- x = (workWidth(bview) > 0)
+ x = (workWidth(*bview) > 0)
? leftMargin(bview, row) : 0;
// is there a manual margin with a manual label
- LyXTextClass const & tclass = textclasslist[bview->buffer()->params.textclass];
- LyXLayout const & layout = tclass[row->par()->layout()];
+ LyXLayout_ptr const & layout = row->par()->layout();
- if (layout.margintype == MARGIN_MANUAL
- && layout.labeltype == LABEL_MANUAL) {
+ if (layout->margintype == MARGIN_MANUAL
+ && layout->labeltype == LABEL_MANUAL) {
// one more since labels are left aligned
- nlh = numberOfLabelHfills(bview->buffer(), row) + 1;
+ nlh = row->numberOfLabelHfills() + 1;
if (nlh && !row->par()->getLabelWidthString().empty()) {
- fill_label_hfill = labelFill(bview, row) / nlh;
+ fill_label_hfill = labelFill(*bview, *row) / nlh;
}
}
// are there any hfills in the row?
- float const nh = numberOfHfills(bview->buffer(), row);
+ float const nh = row->numberOfHfills();
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>(row->width()) < workWidth(bview)) {
+ } else if (static_cast<int>(row->width()) < workWidth(*bview)) {
// is it block, flushleft or flushright?
// set x how you need it
int align;
if (row->par()->params().align() == LYX_ALIGN_LAYOUT) {
- align = layout.align;
+ align = layout->align;
} else {
align = row->par()->params().align();
}
switch (align) {
case LYX_ALIGN_BLOCK:
- ns = numberOfSeparators(bview->buffer(), row);
+ ns = row->numberOfSeparators();
if (ns && row->next() && row->next()->par() == row->par() &&
!(row->next()->par()->isNewline(row->next()->pos() - 1))
&& !(row->next()->par()->isInset(row->next()->pos())
computeBidiTables(bview->buffer(), row);
if (is_rtl) {
- pos_type main_body =
- beginningOfMainBody(bview->buffer(), row->par());
- pos_type last = rowLast(row);
+ pos_type main_body = row->par()->beginningOfMainBody();
+ pos_type last = row->lastPos();
if (main_body > 0 &&
(main_body - 1 > last ||
!row->par()->isLineSeparator(main_body - 1))) {
- x += font_metrics::width(layout.labelsep,
+ x += font_metrics::width(layout->labelsep,
getLabelFont(bview->buffer(), row->par()));
if (main_body - 1 <= last)
x += fill_label_hfill;
}
-// important for the screen
+// important for the screen
// the cursor set functions have a special mechanism. When they
// realize, that you left an empty paragraph, they will delete it.
-// They also delete the corresponding row
+// They also delete the corresponding row
void LyXText::cursorRightOneWord(BufferView * bview) const
{
// Skip initial whitespace at end of word and move cursor to *start*
-// of prior word, not to end of next prior word.
+// of prior word, not to end of next prior word.
void LyXText::cursorLeftOneWord(BufferView * bview) const
{
LyXCursor tmpcursor = cursor;
}
-void LyXText::cursorLeftOneWord(LyXCursor & cur) const
+void LyXText::cursorLeftOneWord(LyXCursor & cur) const
{
// treat HFills, floats and Insets as words
cur = cursor;
}
} else { // Here, cur != 0
while (cur.pos() > 0 &&
- cur.par()->isWord(cur.pos()-1))
+ cur.par()->isWord(cur.pos() - 1))
cur.pos(cur.pos() - 1);
}
}
// Select current word. This depends on behaviour of
-// CursorLeftOneWord(), so it is patched as well.
+// CursorLeftOneWord(), so it is patched as well.
void LyXText::getWord(LyXCursor & from, LyXCursor & to,
word_location const loc) const
{
if (cursor.pos() == 0 || cursor.pos() == cursor.par()->size()
|| cursor.par()->isSeparator(cursor.pos())
|| cursor.par()->isKomma(cursor.pos())
- || cursor.par()->isSeparator(cursor.pos() -1)
- || cursor.par()->isKomma(cursor.pos() -1)) {
+ || cursor.par()->isSeparator(cursor.pos() - 1)
+ || cursor.par()->isKomma(cursor.pos() - 1)) {
to = from;
return;
}
while (to.pos() < to.par()->size()
&& !to.par()->isSeparator(to.pos())
&& !to.par()->isKomma(to.pos())
- && !to.par()->isHfill(to.pos()))
+ && !to.par()->isHfill(to.pos())
+ && !to.par()->isInset(to.pos()))
{
to.pos(to.pos() + 1);
}
// Select the word currently under the cursor when no
-// selection is currently set
+// selection is currently set
bool LyXText::selectWordWhenUnderCursor(BufferView * bview,
word_location const loc)
{
}
+void LyXText::acceptChange(BufferView * bv)
+{
+ if (!selection.set() && cursor.par()->size())
+ return;
+
+ bv->hideCursor();
+
+ if (selection.start.par() == selection.end.par()) {
+ LyXCursor & startc = selection.start;
+ LyXCursor & endc = selection.end;
+ setUndo(bv, Undo::INSERT, startc.par(), startc.par()->next());
+ startc.par()->acceptChange(startc.pos(), endc.pos());
+ finishUndo();
+ clearSelection();
+ redoParagraphs(bv, startc, startc.par()->next());
+ setCursorIntern(bv, startc.par(), 0);
+ }
+#warning handle multi par selection
+}
+
+
+void LyXText::rejectChange(BufferView * bv)
+{
+ if (!selection.set() && cursor.par()->size())
+ return;
+
+ bv->hideCursor();
+
+ if (selection.start.par() == selection.end.par()) {
+ LyXCursor & startc = selection.start;
+ LyXCursor & endc = selection.end;
+ setUndo(bv, Undo::INSERT, startc.par(), startc.par()->next());
+ startc.par()->rejectChange(startc.pos(), endc.pos());
+ finishUndo();
+ clearSelection();
+ redoParagraphs(bv, startc, startc.par()->next());
+ setCursorIntern(bv, 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.
-string const LyXText::selectNextWordToSpellcheck(BufferView * bview,
- float & value) const
+WordLangTuple const
+LyXText::selectNextWordToSpellcheck(BufferView * bview, float & value) const
{
if (the_locking_inset) {
- string str = the_locking_inset->selectNextWordToSpellcheck(bview, value);
- if (!str.empty()) {
- value += float(cursor.y())/float(height);
- return str;
+ WordLangTuple word = the_locking_inset->selectNextWordToSpellcheck(bview, value);
+ if (!word.word().empty()) {
+ value += float(cursor.y());
+ value /= float(height);
+ return word;
}
- // we have to go on checking so move cusor to the next char
+ // we have to go on checking so move cursor to the next char
if (cursor.pos() == cursor.par()->size()) {
if (!cursor.par()->next())
- return str;
+ return word;
cursor.par(cursor.par()->next());
cursor.pos(0);
} else
}
// Now, skip until we have real text (will jump paragraphs)
- while ((cursor.par()->size() > cursor.pos()
- && (!cursor.par()->isLetter(cursor.pos()))
- && (!cursor.par()->isInset(cursor.pos()) ||
- !cursor.par()->getInset(cursor.pos())->allowSpellcheck()))
- || (cursor.par()->size() == cursor.pos()
- && cursor.par()->next()))
- {
- if (cursor.pos() == cursor.par()->size()) {
- cursor.par(cursor.par()->next());
- cursor.pos(0);
- } else
- cursor.pos(cursor.pos() + 1);
+ while (1) {
+ Paragraph * cpar(cursor.par());
+ pos_type const cpos(cursor.pos());
+
+ if (cpos == cpar->size()) {
+ if (cpar->next()) {
+ cursor.par(cpar->next());
+ cursor.pos(0);
+ continue;
+ }
+ break;
+ }
+
+ bool const is_bad_inset(cpar->isInset(cpos)
+ && !cpar->getInset(cpos)->allowSpellcheck());
+
+ if (cpar->isLetter(cpos) && !isDeletedText(*cpar, cpos)
+ && !is_bad_inset)
+ break;
+
+ cursor.pos(cpos + 1);
}
// 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()))
- {
+ cursor.par()->isInset(cursor.pos())) {
// lock the inset!
cursor.par()->getInset(cursor.pos())->edit(bview);
// now call us again to do the above trick
// Start the selection from here
selection.cursor = cursor;
+ string lang_code(
+ getFont(bview->buffer(), 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()
- && (cursor.par()->isLetter(cursor.pos())))
+ && cursor.par()->isLetter(cursor.pos())
+ && !isDeletedText(*cursor.par(), cursor.pos()))
cursor.pos(cursor.pos() + 1);
// Finally, we copy the word to a string and return it
str += cursor.par()->getChar(i);
}
}
- return str;
+ return WordLangTuple(str, lang_code);
}
// Delete from cursor up to the end of the current or next word.
void LyXText::deleteWordForward(BufferView * bview)
{
- if (!cursor.par()->size())
+ if (cursor.par()->empty())
cursorRight(bview);
else {
LyXCursor tmpcursor = cursor;
// Delete from cursor to start of current or prior word.
void LyXText::deleteWordBackward(BufferView * bview)
{
- if (!cursor.par()->size())
+ if (cursor.par()->empty())
cursorLeft(bview);
else {
LyXCursor tmpcursor = cursor;
}
-// Kill to end of line.
+// Kill to end of line.
void LyXText::deleteLineForward(BufferView * bview)
{
- if (!cursor.par()->size())
+ if (cursor.par()->empty())
// Paragraph is empty, so we just go to the right
cursorRight(bview);
else {
}
-// Change the case of a word at cursor position.
-// This function directly manipulates Paragraph::text because there
-// is no Paragraph::SetChar currently. I did what I could to ensure
-// that it is correct. I guess part of it should be moved to
-// Paragraph, but it will have to change for 1.1 anyway. At least
-// it does not access outside of the allocated array as the older
-// version did. (JMarc)
-void LyXText::changeCase(BufferView * bview, LyXText::TextCase action)
+void LyXText::changeCase(BufferView & bview, LyXText::TextCase action)
{
LyXCursor from;
LyXCursor to;
to = selection.end;
} else {
getWord(from, to, PARTIAL_WORD);
- setCursor(bview, to.par(), to.pos() + 1);
+ setCursor(&bview, to.par(), to.pos() + 1);
}
- changeRegionCase(bview, from, to, action);
-}
-
-
-void LyXText::changeRegionCase(BufferView * bview,
- LyXCursor const & from,
- LyXCursor const & to,
- LyXText::TextCase action)
-{
lyx::Assert(from <= to);
- setUndo(bview, Undo::FINISH, from.par(), to.par()->next());
+ setUndo(&bview, Undo::FINISH, from.par(), to.par()->next());
pos_type pos = from.pos();
Paragraph * par = from.par();
while (par && (pos != to.pos() || par != to.par())) {
+ if (pos == par->size()) {
+ par = par->next();
+ pos = 0;
+ continue;
+ }
unsigned char c = par->getChar(pos);
if (!IsInsetChar(c) && !IsHfillChar(c)) {
switch (action) {
break;
}
}
+#warning changes
par->setChar(pos, c);
- checkParagraph(bview, par, pos);
+ checkParagraph(&bview, par, pos);
++pos;
- if (pos == par->size()) {
- par = par->next();
- pos = 0;
- }
}
if (to.row() != from.row()) {
refresh_y = from.y() - from.row()->baseline();
refresh_row = from.row();
- status(bview, LyXText::NEED_MORE_REFRESH);
+ status(&bview, LyXText::NEED_MORE_REFRESH);
}
}
// First decide if it is possible to transpose at all
- // We are at the beginning of a paragraph.
- if (tmppos == 0) return;
+ if (tmppos == 0 || tmppos == tmppar->size())
+ return;
- // We are at the end of a paragraph.
- if (tmppos == tmppar->size() - 1) return;
+ if (isDeletedText(*tmppar, tmppos - 1)
+ || isDeletedText(*tmppar, tmppos))
+ return;
unsigned char c1 = tmppar->getChar(tmppos);
unsigned char c2 = tmppar->getChar(tmppos - 1);
- if (c1 != Paragraph::META_INSET
- && c2 != Paragraph::META_INSET) {
- tmppar->setChar(tmppos, c2);
- tmppar->setChar(tmppos - 1, c1);
- }
// We should have an implementation that handles insets
// as well, but that will have to come later. (Lgb)
- checkParagraph(const_cast<BufferView*>(&bview), tmppar, tmppos);
+ if (c1 == Paragraph::META_INSET || c2 == Paragraph::META_INSET)
+ return;
+
+ bool const erased = tmppar->erase(tmppos - 1, tmppos + 1);
+ pos_type const ipos(erased ? tmppos - 1 : tmppos + 1);
+
+ tmppar->insertChar(ipos, c1);
+ tmppar->insertChar(ipos + 1, c2);
+
+ checkParagraph(&bview, tmppar, tmppos);
}
LyXCursor old_cursor = cursor;
int const old_cur_par_id = old_cursor.par()->id();
int const old_cur_par_prev_id = old_cursor.par()->previous() ?
- old_cursor.par()->previous()->id() : 0;
+ old_cursor.par()->previous()->id() : -1;
// just move to the right
cursorRight(bview);
// 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()->previous() ? cursor.par()->previous()->id() : 0)
+ if ((cursor.par()->previous() ? cursor.par()->previous()->id() : -1)
== old_cur_par_prev_id
&& cursor.par()->id() != old_cur_par_id) {
// delete-empty-paragraph-mechanism has done it
// 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()))
+ return;
+
// we may paste some paragraphs
// is it an empty paragraph?
// 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
- LyXTextClass const & tclass = textclasslist[bview->buffer()->params.textclass];
+ // Correction: Pasting is always allowed with standard-layout
+ LyXTextClass const & tclass =
+ bview->buffer()->params.getLyXTextClass();
if (cursor.par() != tmppar
&& (cursor.par()->layout() == tmppar->layout()
- || tmppar->layout() == tclass.defaultLayoutName())
+ || tmppar->layout() == tclass.defaultLayout())
&& cursor.par()->getAlign() == tmppar->getAlign()) {
removeParagraph(tmprow);
removeRow(tmprow);
- cursor.par()->pasteParagraph(bview->buffer()->params);
+ mergeParagraph(bview->buffer()->params, cursor.par());
if (!cursor.pos() || !cursor.par()->isSeparator(cursor.pos() - 1))
; //cursor.par()->insertChar(cursor.pos(), ' ');
// This rebuilds the rows.
appendParagraph(bview, cursor.row());
- updateCounters(bview, cursor.row());
+ updateCounters(bview);
// the row may have changed, block, hfills etc.
setCursor(bview, cursor.par(), cursor.pos(), false);
}
} else {
// this is the code for a normal backspace, not pasting
- // any paragraphs
+ // any paragraphs
setUndo(bview, Undo::DELETE,
cursor.par(), cursor.par()->next());
// We used to do cursorLeftIntern() here, but it is
setCursorIntern(bview, cursor.par(), cursor.pos()- 1,
false, cursor.boundary());
- // some insets are undeletable here
if (cursor.par()->isInset(cursor.pos())) {
- if (!cursor.par()->getInset(cursor.pos())->deletable())
- return;
// force complete redo when erasing display insets
// this is a cruel method but safe..... Matthias
if (cursor.par()->getInset(cursor.pos())->display() ||
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() < rowLast(row) ||
+ // when calculating the fill
+ if (cursor.pos() < row->lastPos() ||
!cursor.par()->isLineSeparator(cursor.pos())) {
row->fill(row->fill() + singleWidth(bview,
cursor.par(),
}
// some special code when deleting a newline. This is similar
- // to the behavior when pasting paragraphs
+ // to the behavior when pasting paragraphs
if (cursor.pos() && cursor.par()->isNewline(cursor.pos())) {
cursor.par()->erase(cursor.pos());
// refresh the positions
}
// delete newlines at the beginning of paragraphs
- while (cursor.par()->size() &&
+ while (!cursor.par()->empty() &&
cursor.par()->isNewline(cursor.pos()) &&
- cursor.pos() == beginningOfMainBody(bview->buffer(),
- cursor.par())) {
+ cursor.pos() == cursor.par()->beginningOfMainBody()) {
cursor.par()->erase(cursor.pos());
// refresh the positions
tmprow = row;
// is there a break one row above
if (row->previous() && row->previous()->par() == row->par()) {
z = nextBreakPoint(bview, row->previous(),
- workWidth(bview));
+ workWidth(*bview));
if (z >= row->pos()) {
row->pos(z + 1);
// set the dimensions of the row above
y -= tmprow->height();
- tmprow->fill(fill(bview, tmprow,
- workWidth(bview)));
+ tmprow->fill(fill(*bview, *tmprow, workWidth(*bview)));
setHeightOfRow(bview, tmprow);
refresh_y = y;
// break the cursor row again
if (row->next() && row->next()->par() == row->par() &&
- (rowLast(row) == row->par()->size() - 1 ||
- nextBreakPoint(bview, row, workWidth(bview)) != rowLast(row))) {
+ (row->lastPos() == row->par()->size() - 1 ||
+ nextBreakPoint(bview, row, workWidth(*bview)) != row->lastPos())) {
// 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 (rowLast(row) == row->par()->size() - 1)
+ // hack ;-)
+ if (row->lastPos() == row->par()->size() - 1)
removeRow(row->next());
refresh_y = y;
breakAgainOneRow(bview, row);
// will the cursor be in another row now?
if (row->next() && row->next()->par() == row->par() &&
- rowLast(row) <= cursor.pos()) {
+ row->lastPos() <= cursor.pos()) {
row = row->next();
breakAgainOneRow(bview, row);
}
need_break_row = 0;
} else {
// set the dimensions of the row
- row->fill(fill(bview, row, workWidth(bview)));
+ row->fill(fill(*bview, *row, workWidth(*bview)));
int const tmpheight = row->height();
setHeightOfRow(bview, row);
if (tmpheight == row->height())
redoHeightOfParagraph(bview, cursor);
} else {
// now the special right address boxes
- if (textclasslist
- [bview->buffer()->params.textclass]
- [cursor.par()->layout()].margintype == MARGIN_RIGHT_ADDRESS_BOX) {
+ if (cursor.par()->layout()->margintype
+ == MARGIN_RIGHT_ADDRESS_BOX) {
redoDrawingOfParagraph(bview, cursor);
}
}
}
-bool LyXText::paintRowBackground(DrawRowParams & p)
-{
- bool clear_area = true;
- Inset * inset = 0;
- LyXFont font(LyXFont::ALL_SANE);
-
- pos_type const last = rowLastPrintable(p.row);
-
- if (!p.bv->screen()->forceClear() && last == p.row->pos()
- && p.row->par()->isInset(p.row->pos())) {
- inset = p.row->par()->getInset(p.row->pos());
- if (inset) {
- clear_area = inset->doClearArea();
- }
- }
-
- if (p.cleared) {
- return true;
- }
-
- if (clear_area) {
- int const x = p.xo;
- int const y = p.yo < 0 ? 0 : p.yo;
- int const h = p.yo < 0 ? p.row->height() + p.yo : p.row->height();
- p.pain->fillRectangle(x, y, p.width, h, backgroundColor());
- return true;
- }
-
- if (inset == 0)
- return false;
-
- int h = p.row->baseline() - inset->ascent(p.bv, font);
-
- // first clear the whole row above the inset!
- if (h > 0) {
- p.pain->fillRectangle(p.xo, p.yo, p.width, h, backgroundColor());
- }
-
- // clear the space below the inset!
- h += inset->ascent(p.bv, font) + inset->descent(p.bv, font);
- if ((p.row->height() - h) > 0) {
- p.pain->fillRectangle(p.xo, p.yo + h,
- p.width, p.row->height() - h, backgroundColor());
- }
-
- // clear the space behind the inset, if needed
- if (!inset->display() && !inset->needFullRow()) {
- int const xp = int(p.x) + inset->width(p.bv, font);
- if (p.width - xp > 0) {
- p.pain->fillRectangle(xp, p.yo, p.width - xp,
- p.row->height(), backgroundColor());
- }
- }
-
- return false;
-}
-
-
-void LyXText::paintRowSelection(DrawRowParams & p)
-{
- bool const is_rtl = p.row->par()->isRightToLeftPar(p.bv->buffer()->params);
-
- // the current selection
- int const startx = selection.start.x();
- int const endx = selection.end.x();
- int const starty = selection.start.y();
- int const endy = selection.end.y();
- Row const * startrow = selection.start.row();
- Row const * endrow = selection.end.row();
-
- Row * row = p.row;
-
- if (bidi_same_direction) {
- int x;
- int y = p.yo;
- int w;
- int h = row->height();
-
- if (startrow == row && endrow == row) {
- if (startx < endx) {
- x = p.xo + startx;
- w = endx - startx;
- p.pain->fillRectangle(x, y, w, h, LColor::selection);
- } else {
- x = p.xo + endx;
- w = startx - endx;
- p.pain->fillRectangle(x, y, w, h, LColor::selection);
- }
- } else if (startrow == row) {
- int const x = (is_rtl) ? p.xo : (p.xo + startx);
- int const w = (is_rtl) ? startx : (p.width - startx);
- p.pain->fillRectangle(x, y, w, h, LColor::selection);
- } else if (endrow == row) {
- int const x = (is_rtl) ? (p.xo + endx) : p.xo;
- int const w = (is_rtl) ? (p.width - endx) : endx;
- p.pain->fillRectangle(x, y, w, h, LColor::selection);
- } else if (p.y > starty && p.y < endy) {
- p.pain->fillRectangle(p.xo, y, p.width, h, LColor::selection);
- }
- return;
- } else if (startrow != row && endrow != row) {
- int w = p.width;
- int h = row->height();
- if (p.y > starty && p.y < endy) {
- p.pain->fillRectangle(p.xo, p.yo, w, h, LColor::selection);
- }
- return;
- }
-
- if (!((startrow != row && !is_rtl) || (endrow != row && is_rtl))) {
- return;
- }
-
- float tmpx = p.x;
-
- p.pain->fillRectangle(p.xo, p.yo, int(p.x), row->height(), LColor::selection);
-
- Buffer const * buffer = p.bv->buffer();
- Paragraph * par = row->par();
- pos_type main_body = beginningOfMainBody(buffer, par);
- pos_type const last = rowLastPrintable(row);
-
- for (pos_type vpos = row->pos(); vpos <= last; ++vpos) {
- pos_type pos = vis2log(vpos);
- float const old_tmpx = tmpx;
- if (main_body > 0 && pos == main_body - 1) {
- LyXLayout const & layout =
- textclasslist
- [buffer->params.textclass]
- [par->layout()];
- LyXFont const lfont = getLabelFont(buffer, par);
-
- tmpx += p.label_hfill + font_metrics::width(layout.labelsep, lfont);
-
- if (par->isLineSeparator(main_body - 1))
- tmpx -= singleWidth(p.bv, par, main_body - 1);
- }
-
- if (hfillExpansion(buffer, row, pos)) {
- tmpx += singleWidth(p.bv, par, pos);
- if (pos >= main_body)
- tmpx += p.hfill;
- else
- tmpx += p.label_hfill;
- }
-
- else if (par->isSeparator(pos)) {
- tmpx += singleWidth(p.bv, par, pos);
- if (pos >= main_body)
- tmpx += p.separator;
- } else {
- tmpx += singleWidth(p.bv, par, pos);
- }
-
- if ((startrow != row || selection.start.pos() <= pos) &&
- (endrow != row || pos < selection.end.pos())) {
- // Here we do not use p.x as p.xo was added to p.x.
- p.pain->fillRectangle(int(old_tmpx), p.yo,
- int(tmpx - old_tmpx + 1),
- row->height(), LColor::selection);
- }
-
- if ((startrow != row && is_rtl) || (endrow != row && !is_rtl)) {
- p.pain->fillRectangle(p.xo + int(tmpx),
- p.yo, int(p.bv->workWidth() - tmpx),
- row->height(), LColor::selection);
- }
- }
-}
-
-
-void LyXText::paintRowAppendix(DrawRowParams & p)
-{
- // FIXME: can be just p.width ?
- int const ww = p.bv->workWidth();
- Paragraph * firstpar = p.row->par();
-
- if (firstpar->params().appendix()) {
- p.pain->line(1, p.yo, 1, p.yo + p.row->height(), LColor::appendixline);
- p.pain->line(ww - 2, p.yo, ww - 2, p.yo + p.row->height(), LColor::appendixline);
- }
-}
-
-
-void LyXText::paintRowDepthBar(DrawRowParams & p)
-{
- Paragraph::depth_type const depth = p.row->par()->getDepth();
-
- if (depth <= 0)
- return;
-
- Paragraph::depth_type prev_depth = 0;
- if (p.row->previous())
- prev_depth = p.row->previous()->par()->getDepth();
- Paragraph::depth_type next_depth = 0;
- if (p.row->next())
- next_depth = p.row->next()->par()->getDepth();
-
- for (Paragraph::depth_type i = 1; i <= depth; ++i) {
- int const x = (LYX_PAPER_MARGIN / 5) * i + p.xo;
- int const h = p.yo + p.row->height() - 1 - (i - next_depth - 1) * 3;
-
- p.pain->line(x, p.yo, x, h, LColor::depthbar);
-
- int const w = LYX_PAPER_MARGIN / 5;
-
- if (i > prev_depth) {
- p.pain->fillRectangle(x, p.yo, w, 2, LColor::depthbar);
- }
- if (i > next_depth) {
- p.pain->fillRectangle(x, h, w, 2, LColor::depthbar);
- }
- }
-}
-
-
-int LyXText::getLengthMarkerHeight(BufferView * bv, VSpace const & vsp) const
-{
- int const arrow_size = 4;
- int const space_size = int(vsp.inPixels(bv));
-
- if (vsp.kind() != VSpace::LENGTH) {
- return space_size;
- }
-
- LyXFont font;
- font.decSize();
- int const min_size = max(3 * arrow_size,
- font_metrics::maxAscent(font)
- + font_metrics::maxDescent(font));
-
- if (vsp.length().len().value() < 0.0)
- return min_size;
- else
- return max(min_size, space_size);
-}
-
-
-int LyXText::drawLengthMarker(DrawRowParams & p, string const & prefix,
- VSpace const & vsp, int start)
-{
- int const arrow_size = 4;
- int const size = getLengthMarkerHeight(p.bv, vsp);
- int const end = start + size;
-
- // the label to display (if any)
- string str;
- // y-values for top arrow
- int ty1, ty2;
- // y-values for bottom arrow
- int by1, by2;
- switch (vsp.kind()) {
- case VSpace::LENGTH:
- {
- str = prefix + " (" + vsp.asLyXCommand() + ")";
- // adding or removing space
- bool const added = !(vsp.length().len().value() < 0.0);
- ty1 = added ? (start + arrow_size) : start;
- ty2 = added ? start : (start + arrow_size);
- by1 = added ? (end - arrow_size) : end;
- by2 = added ? end : (end - arrow_size);
- break;
- }
- case VSpace:: VFILL:
- str = prefix + " (vertical fill)";
- ty1 = ty2 = start;
- by1 = by2 = end;
- break;
- default:
- // nothing to draw here
- return size;
- }
-
- int const leftx = p.xo + leftMargin(p.bv, p.row);
- int const midx = leftx + arrow_size;
- int const rightx = midx + arrow_size;
-
- // first the string
- int w = 0;
- int a = 0;
- int d = 0;
-
- LyXFont font;
- font.setColor(LColor::added_space).decSize();
- font_metrics::rectText(str, font, w, a, d);
-
- p.pain->rectText(leftx + 2 * arrow_size + 5,
- start + ((end - start) / 2) + d,
- str, font,
- backgroundColor(),
- backgroundColor());
-
- // top arrow
- p.pain->line(leftx, ty1, midx, ty2, LColor::added_space);
- p.pain->line(midx, ty2, rightx, ty1, LColor::added_space);
-
- // bottom arrow
- p.pain->line(leftx, by1, midx, by2, LColor::added_space);
- p.pain->line(midx, by2, rightx, by1, LColor::added_space);
-
- // joining line
- p.pain->line(midx, ty2, midx, by2, LColor::added_space);
-
- return size;
-}
-
-
-void LyXText::paintFirstRow(DrawRowParams & p)
-{
- Paragraph * par = p.row->par();
- ParagraphParameters const & parparams = par->params();
-
- // start of appendix?
- if (parparams.startOfAppendix()) {
- p.pain->line(1, p.yo, p.width - 2, p.yo, LColor::appendixline);
- }
-
- int y_top = 0;
-
- // think about the margins
- if (!p.row->previous() && bv_owner)
- y_top += LYX_PAPER_MARGIN;
-
- // draw a top pagebreak
- if (parparams.pagebreakTop()) {
- int const y = p.yo + y_top + 2*defaultHeight();
- p.pain->line(p.xo, y, p.xo + p.width, y,
- LColor::pagebreak, Painter::line_onoffdash);
-
- int w = 0;
- int a = 0;
- int d = 0;
-
- LyXFont pb_font;
- pb_font.setColor(LColor::pagebreak).decSize();
- font_metrics::rectText(_("Page Break (top)"), pb_font, w, a, d);
- p.pain->rectText((p.width - w)/2, y + d,
- _("Page Break (top)"), pb_font,
- backgroundColor(),
- backgroundColor());
- y_top += 3 * defaultHeight();
- }
-
- // draw the additional space if needed:
- y_top += drawLengthMarker(p, _("Space above"),
- parparams.spaceTop(), p.yo + y_top);
-
- Buffer const * buffer = p.bv->buffer();
-
- LyXTextClass const & tclass = textclasslist[buffer->params.textclass];
- LyXLayout const & layout = tclass[par->layout()];
-
- // think about the parskip
- // some parskips VERY EASY IMPLEMENTATION
- if (buffer->params.paragraph_separation == BufferParams::PARSEP_SKIP) {
- if (par->previous()) {
- if (layout.latextype == LATEX_PARAGRAPH
- && !par->getDepth()) {
- y_top += buffer->params.getDefSkip().inPixels(p.bv);
- } else {
- LyXLayout const & playout =
- tclass[par->previous()->layout()];
- if (playout.latextype == LATEX_PARAGRAPH
- && !par->previous()->getDepth()) {
- // is it right to use defskip here, too? (AS)
- y_top += buffer->params.getDefSkip().inPixels(p.bv);
- }
- }
- }
- }
-
- int const ww = p.bv->workWidth();
-
- // draw a top line
- if (parparams.lineTop()) {
- LyXFont font(LyXFont::ALL_SANE);
- int const asc = font_metrics::ascent('x', getFont(buffer, par, 0));
-
- y_top += asc;
-
- int const w = (inset_owner ? inset_owner->width(p.bv, font) : ww);
- int const xp = static_cast<int>(inset_owner ? p.xo : 0);
- p.pain->line(xp, p.yo + y_top, xp + w, p.yo + y_top,
- LColor::topline, Painter::line_solid,
- Painter::line_thick);
-
- y_top += asc;
- }
-
- bool const is_rtl = p.row->par()->isRightToLeftPar(p.bv->buffer()->params);
-
- // should we print a label?
- if (layout.labeltype >= LABEL_STATIC
- && (layout.labeltype != LABEL_STATIC
- || layout.latextype != LATEX_ENVIRONMENT
- || par->isFirstInSequence())) {
-
- LyXFont font = getLabelFont(buffer, par);
- if (!par->getLabelstring().empty()) {
- float x = p.x;
- string const str = par->getLabelstring();
-
- // this is special code for the chapter layout. This is
- // printed in an extra row and has a pagebreak at
- // the top.
- if (layout.labeltype == LABEL_COUNTER_CHAPTER) {
- if (buffer->params.secnumdepth >= 0) {
- float spacing_val = 1.0;
- if (!parparams.spacing().isDefault()) {
- spacing_val = parparams.spacing().getValue();
- } else {
- spacing_val = buffer->params.spacing.getValue();
- }
-
- int const maxdesc =
- int(font_metrics::maxDescent(font) * layout.spacing.getValue() * spacing_val)
- + int(layout.parsep) * defaultHeight();
-
- if (is_rtl) {
- x = ww - leftMargin(p.bv, p.row) -
- font_metrics::width(str, font);
- }
-
- p.pain->text(int(x),
- p.yo + p.row->baseline() -
- p.row->ascent_of_text() - maxdesc,
- str, font);
- }
- } else {
- if (is_rtl) {
- x = ww - leftMargin(p.bv, p.row)
- + font_metrics::width(layout.labelsep, font);
- } else {
- x = p.x - font_metrics::width(layout.labelsep, font)
- - font_metrics::width(str, font);
- }
-
- p.pain->text(int(x), p.yo + p.row->baseline(), str, font);
- }
- }
- // the labels at the top of an environment.
- // More or less for bibliography
- } else if (par->isFirstInSequence() &&
- (layout.labeltype == LABEL_TOP_ENVIRONMENT ||
- layout.labeltype == LABEL_BIBLIO ||
- layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
- LyXFont font = getLabelFont(buffer, par);
- if (!par->getLabelstring().empty()) {
- string const str = par->getLabelstring();
- float spacing_val = 1.0;
- if (!parparams.spacing().isDefault()) {
- spacing_val = parparams.spacing().getValue();
- } else {
- spacing_val = buffer->params.spacing.getValue();
- }
-
- int maxdesc =
- int(font_metrics::maxDescent(font) * layout.spacing.getValue() * spacing_val
- + (layout.labelbottomsep * defaultHeight()));
-
- float x = p.x;
- if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
- x = ((is_rtl ? leftMargin(p.bv, p.row) : p.x)
- + ww - rightMargin(buffer, p.row)) / 2;
- x -= font_metrics::width(str, font) / 2;
- } else if (is_rtl) {
- x = ww - leftMargin(p.bv, p.row) -
- font_metrics::width(str, font);
- }
- p.pain->text(int(x), p.yo + p.row->baseline()
- - p.row->ascent_of_text() - maxdesc,
- str, font);
- }
- }
-
- if (layout.labeltype == LABEL_BIBLIO && par->bibkey) {
- LyXFont font = getLayoutFont(buffer, par);
- float x;
- if (is_rtl) {
- x = ww - leftMargin(p.bv, p.row)
- + font_metrics::width(layout.labelsep, font);
- } else {
- x = p.x - font_metrics::width(layout.labelsep, font)
- - par->bibkey->width(p.bv, font);
- }
- par->bibkey->draw(p.bv, font, p.yo + p.row->baseline(), x, p.cleared);
- }
-}
-
-
-void LyXText::paintLastRow(DrawRowParams & p)
-{
- Paragraph * par = p.row->par();
- ParagraphParameters const & parparams = par->params();
- int y_bottom = p.row->height() - 1;
-
- // think about the margins
- if (!p.row->next() && bv_owner)
- y_bottom -= LYX_PAPER_MARGIN;
-
- int const ww = p.bv->workWidth();
-
- // draw a bottom pagebreak
- if (parparams.pagebreakBottom()) {
- LyXFont pb_font;
- pb_font.setColor(LColor::pagebreak).decSize();
- int const y = p.yo + y_bottom - 2 * defaultHeight();
-
- p.pain->line(p.xo, y, p.xo + p.width, y, LColor::pagebreak,
- Painter::line_onoffdash);
-
- int w = 0;
- int a = 0;
- int d = 0;
- font_metrics::rectText(_("Page Break (bottom)"), pb_font, w, a, d);
- p.pain->rectText((ww - w) / 2, y + d,
- _("Page Break (bottom)"),
- pb_font, backgroundColor(), backgroundColor());
-
- y_bottom -= 3 * defaultHeight();
- }
-
- // draw the additional space if needed:
- int const height = getLengthMarkerHeight(p.bv,
- parparams.spaceBottom());
- y_bottom -= drawLengthMarker(p, _("Space below"),
- parparams.spaceBottom(),
- p.yo + y_bottom - height);
-
- Buffer const * buffer = p.bv->buffer();
-
- // draw a bottom line
- if (parparams.lineBottom()) {
- LyXFont font(LyXFont::ALL_SANE);
- int const asc = font_metrics::ascent('x',
- getFont(buffer, par,
- max(pos_type(0), par->size() - 1)));
-
- y_bottom -= asc;
-
- int const w = (inset_owner ? inset_owner->width(p.bv, font) : ww);
- int const xp = static_cast<int>(inset_owner ? p.xo : 0);
- int const y = p.yo + y_bottom;
- p.pain->line(xp, y, xp + w, y, LColor::topline, Painter::line_solid,
- Painter::line_thick);
-
- y_bottom -= asc;
- }
-
- bool const is_rtl = p.row->par()->isRightToLeftPar(p.bv->buffer()->params);
- int const endlabel = par->getEndLabel(buffer->params);
-
- // draw an endlabel
- switch (endlabel) {
- case END_LABEL_BOX:
- case END_LABEL_FILLED_BOX:
- {
- LyXFont const font = getLabelFont(buffer, par);
- int const size = int(0.75 * font_metrics::maxAscent(font));
- int const y = (p.yo + p.row->baseline()) - size;
- int x = is_rtl ? LYX_PAPER_MARGIN : ww - LYX_PAPER_MARGIN - size;
-
- if (p.row->fill() <= size)
- x += (size - p.row->fill() + 1) * (is_rtl ? -1 : 1);
-
- if (endlabel == END_LABEL_BOX) {
- p.pain->rectangle(x, y, size, size, LColor::eolmarker);
- } else {
- p.pain->fillRectangle(x, y, size, size,
- LColor::eolmarker);
- }
- break;
- }
- case END_LABEL_STATIC:
- {
- LyXFont font(LyXFont::ALL_SANE);
- string const & layout = par->layout();
- string const str = textclasslist[buffer->params.textclass][layout].endlabelstring();
- font = getLabelFont(buffer, par);
- int const x = is_rtl ?
- int(p.x) - font_metrics::width(str, font)
- : ww - rightMargin(buffer, p.row) - p.row->fill();
- p.pain->text(x, p.yo + p.row->baseline(), str, font);
- break;
- }
- case END_LABEL_NO_LABEL:
- break;
- }
-}
-
-void LyXText::paintRowText(DrawRowParams & p)
-{
- Paragraph * par = p.row->par();
- Buffer const * buffer = p.bv->buffer();
-
- pos_type const last = rowLastPrintable(p.row);
- pos_type main_body =
- beginningOfMainBody(buffer, par);
- if (main_body > 0 &&
- (main_body - 1 > last ||
- !par->isLineSeparator(main_body - 1))) {
- main_body = 0;
- }
-
- LyXLayout const & layout =
- textclasslist[buffer->params.textclass][par->layout()];
-
- pos_type vpos = p.row->pos();
- while (vpos <= last) {
- if (p.x > p.bv->workWidth())
- break;
- pos_type pos = vis2log(vpos);
- if (p.x + singleWidth(p.bv, par, pos) < 0) {
- p.x += singleWidth(p.bv, par, pos);
- ++vpos;
- continue;
- }
- if (main_body > 0 && pos == main_body - 1) {
- int const lwidth = font_metrics::width(layout.labelsep,
- getLabelFont(buffer, par));
-
- p.x += p.label_hfill + lwidth
- - singleWidth(p.bv, par, main_body - 1);
- }
-
- if (par->isHfill(pos)) {
- p.x += 1;
-
- int const y0 = p.yo + p.row->baseline();
- int const y1 = y0 - defaultHeight() / 2;
-
- p.pain->line(int(p.x), y1, int(p.x), y0,
- LColor::added_space);
-
- if (hfillExpansion(buffer, p.row, pos)) {
- int const y2 = (y0 + y1) / 2;
-
- if (pos >= main_body) {
- p.pain->line(int(p.x), y2,
- int(p.x + p.hfill), y2,
- LColor::added_space,
- Painter::line_onoffdash);
- p.x += p.hfill;
- } else {
- p.pain->line(int(p.x), y2,
- int(p.x + p.label_hfill), y2,
- LColor::added_space,
- Painter::line_onoffdash);
- p.x += p.label_hfill;
- }
- p.pain->line(int(p.x), y1,
- int(p.x), y0,
- LColor::added_space);
- }
- p.x += 2;
- ++vpos;
- } else if (par->isSeparator(pos)) {
- p.x += singleWidth(p.bv, par, pos);
- if (pos >= main_body)
- p.x += p.separator;
- ++vpos;
- } else {
- if (!draw(p, vpos))
- break;
- }
- }
-}
-
-
-void LyXText::getVisibleRow(BufferView * bv, int y_offset, int x_offset,
- Row * row, int y, bool cleared)
-{
- if (row->height() <= 0) {
- lyxerr << "LYX_ERROR: row.height: "
- << row->height() << endl;
- return;
- }
-
- DrawRowParams p;
-
- // set up drawing parameters
- p.bv = bv;
- p.pain = &bv->painter();
- p.row = row;
- p.xo = x_offset;
- p.yo = y_offset;
- prepareToPrint(bv, row, p.x, p.separator, p.hfill, p.label_hfill);
- if (inset_owner && (p.x < 0))
- p.x = 0;
- p.x += p.xo;
- p.y = y;
- p.width = inset_owner ? inset_owner->textWidth(bv, true) : bv->workWidth();
- p.cleared = cleared;
-
- // start painting
-
- // clear to background if necessary
- p.cleared = paintRowBackground(p);
-
- // paint the selection background
- if (selection.set()) {
- paintRowSelection(p);
- }
-
- // vertical lines for appendix
- paintRowAppendix(p);
-
- // environment depth brackets
- paintRowDepthBar(p);
-
- // draw any stuff wanted for a first row of a paragraph
- if (!row->pos()) {
- paintFirstRow(p);
- }
-
- // draw any stuff wanted for the last row of a paragraph
- if (!row->next() || (row->next()->par() != row->par())) {
- paintLastRow(p);
- }
-
- // paint text
- paintRowText(p);
-}
-
-
-int LyXText::defaultHeight() const
-{
- LyXFont font(LyXFont::ALL_SANE);
- return int(font_metrics::maxAscent(font)
- + font_metrics::maxDescent(font) * 1.5);
-}
-
-
// returns the column near the specified x-coordinate of the row
-// x is set to the real beginning of this column
+// x is set to the real beginning of this column
pos_type
LyXText::getColumnNearX(BufferView * bview, Row * row, int & x,
bool & boundary) const
fill_hfill, fill_label_hfill);
pos_type vc = row->pos();
- pos_type last = rowLastPrintable(row);
+ pos_type last = row->lastPrintablePos();
pos_type c = 0;
- LyXLayout const & layout =
- textclasslist[bview->buffer()->params.textclass][
- row->par()->layout()];
+
+ LyXLayout_ptr const & layout = row->par()->layout();
+
bool left_side = false;
- pos_type main_body = beginningOfMainBody(bview->buffer(), row->par());
+ pos_type main_body = row->par()->beginningOfMainBody();
float last_tmpx = tmpx;
if (main_body > 0 &&
!row->par()->isLineSeparator(main_body - 1)))
main_body = 0;
+ // check for empty row
+ if (!row->par()->size()) {
+ x = int(tmpx);
+ return 0;
+ }
+
while (vc <= last && tmpx <= x) {
c = vis2log(vc);
last_tmpx = tmpx;
if (main_body > 0 && c == main_body-1) {
tmpx += fill_label_hfill +
- font_metrics::width(layout.labelsep,
+ font_metrics::width(layout->labelsep,
getLabelFont(bview->buffer(), row->par()));
if (row->par()->isLineSeparator(main_body - 1))
tmpx -= singleWidth(bview, row->par(), main_body-1);
}
- if (hfillExpansion(bview->buffer(), row, c)) {
- x += singleWidth(bview, row->par(), c);
+ if (row->hfillExpansion(c)) {
+ tmpx += singleWidth(bview, row->par(), c);
if (c >= main_body)
tmpx += fill_hfill;
else
tmpx += fill_label_hfill;
- }
- else if (row->par()->isSeparator(c)) {
+ } else if (row->par()->isSeparator(c)) {
tmpx += singleWidth(bview, row->par(), c);
if (c >= main_body)
tmpx+= fill_separator;
- } else
+ } else {
tmpx += singleWidth(bview, row->par(), c);
+ }
++vc;
}
: false; // If lastrow is false, we don't need to compute
// the value of rtl.
- if (row->pos() > last) // Row is empty?
- c = row->pos();
- else if (lastrow &&
+ if (lastrow &&
((rtl && left_side && vc == row->pos() && x < tmpx - 5) ||
(!rtl && !left_side && vc == last + 1 && x > tmpx + 5)))
c = last + 1;
if (y < tmpy) {
lyxerr << "up" << endl;
-#if 0
- while (tmprow && tmpy - tmprow->height() >= y) {
- tmpy -= tmprow->height();
- tmprow = tmprow->previous();
- }
-#else
do {
tmpy -= tmprow->height();
tmprow = tmprow->previous();
} while (tmprow && tmpy - tmprow->height() >= y);
-#endif
} else if (y > tmpy) {
lyxerr << "down" << endl;
projects / lyx.git / blobdiff