X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=6898b18145d487bf9a5ae7c438508a9fc0fdc451;hb=98c966c64594611e469313314abd1e59524adb4a;hp=ace479038f661b3ced976d0d6e96169e5baed76f;hpb=57920ce17b8d23173834015d87a67de2621254cb;p=lyx.git diff --git a/src/text.C b/src/text.C index ace479038f..6898b18145 100644 --- a/src/text.C +++ b/src/text.C @@ -1,28 +1,19 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include -#include -#include -#include #include "lyxtext.h" -#include "layout.h" +#include "lyxrow.h" +#include "lyxtextclasslist.h" #include "paragraph.h" -#include "support/textutils.h" -#include "support/LAssert.h" -#include "support/lstrings.h" -#include "insets/insetbib.h" -#include "insets/insettext.h" -#include "insets/insetspecialchar.h" -#include "lyx_gui_misc.h" #include "gettext.h" #include "bufferparams.h" #include "buffer.h" @@ -41,10 +32,20 @@ #include "undo_funcs.h" #include "font.h" +#include "insets/insetbib.h" +#include "insets/insettext.h" + +#include "support/textutils.h" +#include "support/LAssert.h" +#include "support/lstrings.h" + +#include + using std::max; using std::min; using std::endl; using std::pair; +using lyx::pos_type; namespace { @@ -64,6 +65,63 @@ int LyXText::workWidth(BufferView * bview) 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; + } + } + } + + if (!par) { + return workWidth(bview); + } + + LyXLayout const & layout = + textclasslist[bview->buffer()->params.textclass][par->layout()]; + + if (layout.margintype != MARGIN_RIGHT_ADDRESS_BOX) { + // Optimization here: in most cases, the real row is + // not needed, but only the par/pos values. So we just + // construct a dummy row for leftMargin. (JMarc) + Row dummyrow; + dummyrow.par(par); + dummyrow.pos(pos); + return workWidth(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(); + unsigned int maxw = 0; + while (frow->next() && frow->par() == frow->next()->par()) { + if ((frow != row) && (maxw < frow->width())) + maxw = frow->width(); + frow = frow->next(); + } + if (maxw) + return maxw; + } + return workWidth(bview); +} + + int LyXText::getRealCursorX(BufferView * bview) const { int x = cursor.x(); @@ -74,10 +132,10 @@ int LyXText::getRealCursorX(BufferView * bview) const unsigned char LyXText::transformChar(unsigned char c, Paragraph * par, - Paragraph::size_type pos) const + pos_type pos) const { if (!Encodings::is_arabic(c)) - if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && isdigit(c)) + if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && IsDigit(c)) return c + (0xb0 - '0'); else return c; @@ -85,7 +143,7 @@ unsigned char LyXText::transformChar(unsigned char c, Paragraph * par, unsigned char const prev_char = pos > 0 ? par->getChar(pos-1) : ' '; unsigned char next_char = ' '; - for (Paragraph::size_type i = pos+1; i < par->size(); ++i) + for (pos_type i = pos+1; i < par->size(); ++i) if (!Encodings::IsComposeChar_arabic(par->getChar(i))) { next_char = par->getChar(i); break; @@ -130,7 +188,7 @@ unsigned char LyXText::transformChar(unsigned char c, Paragraph * par, // Lgb int LyXText::singleWidth(BufferView * bview, Paragraph * par, - Paragraph::size_type pos) const + pos_type pos) const { char const c = par->getChar(pos); return singleWidth(bview, par, pos, c); @@ -138,7 +196,7 @@ int LyXText::singleWidth(BufferView * bview, Paragraph * par, int LyXText::singleWidth(BufferView * bview, Paragraph * par, - Paragraph::size_type pos, char c) const + pos_type pos, char c) const { LyXFont const font = getFont(bview->buffer(), par, pos); @@ -164,7 +222,10 @@ int LyXText::singleWidth(BufferView * bview, Paragraph * par, } else if (c == Paragraph::META_INSET) { Inset * tmpinset = par->getInset(pos); if (tmpinset) { -#if 0 // seems not to be needed, but ... +#if 1 + // this IS needed otherwise on initialitation we don't get the fill + // of the row right (ONLY on initialization if we read a file!) + // should be changed! (Jug 20011204) tmpinset->update(bview, font); #endif return tmpinset->width(bview, font); @@ -180,20 +241,19 @@ int LyXText::singleWidth(BufferView * bview, Paragraph * par, // Returns the paragraph position of the last character in the specified row -Paragraph::size_type LyXText::rowLast(Row const * row) const +pos_type LyXText::rowLast(Row const * row) const { - if (row->next() == 0) + if (!row->next() || row->next()->par() != row->par()) { return row->par()->size() - 1; - else if (row->next()->par() != row->par()) - return row->par()->size() - 1; - else + } else { return row->next()->pos() - 1; + } } -Paragraph::size_type LyXText::rowLastPrintable(Row const * row) const +pos_type LyXText::rowLastPrintable(Row const * row) const { - Paragraph::size_type const last = rowLast(row); + pos_type const last = rowLast(row); if (last >= row->pos() && row->next() && row->next()->par() == row->par() @@ -221,8 +281,8 @@ void LyXText::computeBidiTables(Buffer const * buf, Row * row) const } if (bidi_end + 2 - bidi_start > - static_cast(log2vis_list.size())) { - Paragraph::size_type new_size = + static_cast(log2vis_list.size())) { + pos_type new_size = (bidi_end + 2 - bidi_start < 500) ? 500 : 2 * (bidi_end + 2 - bidi_start); log2vis_list.resize(new_size); @@ -233,19 +293,18 @@ void LyXText::computeBidiTables(Buffer const * buf, Row * row) const vis2log_list[bidi_end + 1 - bidi_start] = -1; log2vis_list[bidi_end + 1 - bidi_start] = -1; - Paragraph::size_type stack[2]; + pos_type stack[2]; bool const rtl_par = row->par()->getParLanguage(buf->params)->RightToLeft(); int level = 0; bool rtl = false; bool rtl0 = false; - Paragraph::size_type const main_body = - beginningOfMainBody(buf, row->par()); + pos_type const main_body = beginningOfMainBody(buf, row->par()); - for (Paragraph::size_type lpos = bidi_start; + for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) { bool is_space = row->par()->isLineSeparator(lpos); - Paragraph::size_type const pos = + pos_type const pos = (is_space && lpos + 1 <= bidi_end && !row->par()->isLineSeparator(lpos + 1) && !row->par()->isNewline(lpos + 1)) @@ -296,8 +355,7 @@ void LyXText::computeBidiTables(Buffer const * buf, Row * row) const bidi_levels[lpos - bidi_start] = new_level; while (level > new_level2) { - Paragraph::size_type old_lpos = - stack[--level]; + pos_type old_lpos = stack[--level]; int delta = lpos - old_lpos - 1; if (level % 2) delta = -delta; @@ -309,15 +367,15 @@ void LyXText::computeBidiTables(Buffer const * buf, Row * row) const } while (level > 0) { - Paragraph::size_type const old_lpos = stack[--level]; + pos_type const old_lpos = stack[--level]; int delta = bidi_end - old_lpos; if (level % 2) delta = -delta; log2vis_list[old_lpos - bidi_start] += delta; } - Paragraph::size_type vpos = bidi_start - 1; - for (Paragraph::size_type lpos = bidi_start; + pos_type vpos = bidi_start - 1; + for (pos_type lpos = bidi_start; lpos <= bidi_end; ++lpos) { vpos += log2vis_list[lpos - bidi_start]; vis2log_list[vpos - bidi_start] = lpos; @@ -328,7 +386,7 @@ void LyXText::computeBidiTables(Buffer const * buf, Row * row) const // This method requires a previous call to ComputeBidiTables() bool LyXText::isBoundary(Buffer const * buf, Paragraph * par, - Paragraph::size_type pos) const + pos_type pos) const { if (!lyxrc.rtl_support || pos == 0) return false; @@ -348,8 +406,7 @@ bool LyXText::isBoundary(Buffer const * buf, Paragraph * par, bool LyXText::isBoundary(Buffer const * buf, Paragraph * par, - Paragraph::size_type pos, - LyXFont const & font) const + pos_type pos, LyXFont const & font) const { if (!lyxrc.rtl_support) return false; // This is just for speedup @@ -361,281 +418,301 @@ bool LyXText::isBoundary(Buffer const * buf, Paragraph * par, return rtl != rtl2; } +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 = lyxfont::width('n', font); + int const asc = lyxfont::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; +} + -void LyXText::draw(BufferView * bview, Row const * row, - Paragraph::size_type & vpos, - int offset, float & x, bool cleared) +void LyXText::drawInset(DrawRowParams & p, pos_type const pos) { - Painter & pain = bview->painter(); - - Paragraph::size_type pos = vis2log(vpos); - char c = row->par()->getChar(pos); - float tmpx = x; + Inset * inset = p.row->par()->getInset(pos); - if (IsNewlineChar(c)) { - ++vpos; - // Draw end-of-line marker - LyXFont const font = getFont(bview->buffer(), row->par(), pos); - int const wid = lyxfont::width('n', font); - int const asc = lyxfont::maxAscent(font); - int const y = offset + row->baseline(); - int xp[3]; - int yp[3]; - - if (bidi_level(pos) % 2 == 0) { - xp[0] = int(x + wid * 0.375); - yp[0] = int(y - 0.875 * asc * 0.75); - - xp[1] = int(x); - yp[1] = int(y - 0.500 * asc * 0.75); - - xp[2] = int(x + wid * 0.375); - yp[2] = int(y - 0.125 * asc * 0.75); - - pain.lines(xp, yp, 3, LColor::eolmarker); - - xp[0] = int(x); - yp[0] = int(y - 0.500 * asc * 0.75); - - xp[1] = int(x + wid); - yp[1] = int(y - 0.500 * asc * 0.75); - - xp[2] = int(x + wid); - yp[2] = int(y - asc * 0.75); - - pain.lines(xp, yp, 3, LColor::eolmarker); - } else { - xp[0] = int(x + wid * 0.625); - yp[0] = int(y - 0.875 * asc * 0.75); - - xp[1] = int(x + wid); - yp[1] = int(y - 0.500 * asc * 0.75); - - xp[2] = int(x + wid * 0.625); - yp[2] = int(y - 0.125 * asc * 0.75); - - pain.lines(xp, yp, 3, LColor::eolmarker); - - xp[0] = int(x + wid); - yp[0] = int(y - 0.500 * asc * 0.75); - - xp[1] = int(x); - yp[1] = int(y - 0.500 * asc * 0.75); - - xp[2] = int(x); - yp[2] = int(y - asc * 0.75); - - pain.lines(xp, yp, 3, LColor::eolmarker); - } - x += wid; + // FIXME: shouldn't happen + if (!inset) { return; } - LyXFont font = getFont(bview->buffer(), row->par(), pos); - LyXFont font2 = font; + LyXFont const & font = getFont(p.bv->buffer(), p.row->par(), pos); - if (c == Paragraph::META_INSET) { - Inset * tmpinset = row->par()->getInset(pos); - if (tmpinset) { - tmpinset->update(bview, font, false); - tmpinset->draw(bview, font, offset+row->baseline(), x, - cleared); - if (!need_break_row && !inset_owner && - bview->text->status() == CHANGED_IN_DRAW) - { - if (row->previous() && row->previous()->par() == row->par()) - breakAgainOneRow(bview, row->previous()); - setCursor(bview, cursor.par(), cursor.pos()); - need_break_row = const_cast(row); + 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) { + Row * prev = p.row->previous(); + 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 { + need_break_row = p.row; } - ++vpos; + setCursor(p.bv, cursor.par(), cursor.pos()); + } +} - if (lyxrc.mark_foreign_language && - font.language() != ignore_language && - font.language() != bview->buffer()->params.language) { - int const y = offset + row->height() - 1; - pain.line(int(tmpx), y, int(x), y, LColor::language); - } +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); +} + - /* usual characters, no insets */ +void LyXText::drawHebrewComposeChar(DrawRowParams & p, pos_type & vpos) +{ + pos_type pos = vis2log(vpos); - // Collect character that we can draw in one command + string str; - // This is dirty, but fast. Notice that it will never be too small. - // For the record, I'll note that Microsoft Word has a limit - // of 768 here. We have none :-) (Asger) - // Ok. I am the first to admit that the use of std::string will be - // a tiny bit slower than using a POD char array. However, I claim - // that this slowdown is so small that it is close to inperceptive. - // So IMHO we should go with the easier and clearer implementation. - // And even if 1024 is a large number here it might overflow, string - // will only overflow if the machine is out of memory... - static string textstring; - textstring = c; + // first char + char c = p.row->par()->getChar(pos); + str += c; ++vpos; - Paragraph::size_type const last = rowLastPrintable(row); - - if (font.language()->lang() == "hebrew") { - if (Encodings::IsComposeChar_hebrew(c)) { - int const width = lyxfont::width(c, font2); - int dx = 0; - for (Paragraph::size_type i = pos-1; i >= 0; --i) { - c = row->par()->getChar(i); - if (!Encodings::IsComposeChar_hebrew(c)) { - if (IsPrintableNonspace(c)) { - int const width2 = - singleWidth(bview, - row->par(), - i, c); - dx = (c == 'ø' || c == 'ã') // dalet / resh - ? width2 - width : (width2 - width) / 2; - } - break; - } - } - // Draw nikud - pain.text(int(x) + dx, offset + row->baseline(), - textstring, font); - } else { - while (vpos <= last && - (pos = vis2log(vpos)) >= 0 - && IsPrintableNonspace(c = row->par()->getChar(pos)) - && !Encodings::IsComposeChar_hebrew(c) - && font2 == getFont(bview->buffer(), row->par(), pos)) { - textstring += c; - ++vpos; - } - // Draw text and set the new x position - pain.text(int(x), offset + row->baseline(), - textstring, font); - x += lyxfont::width(textstring, font); - } - } else if (font.language()->lang() == "arabic" && - (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 || - lyxrc.font_norm_type == LyXRC::ISO_10646_1)) { - if (Encodings::IsComposeChar_arabic(c)) { - c = transformChar(c, row->par(), pos); - textstring = c; - int const width = lyxfont::width(c, font2); - int dx = 0; - for (Paragraph::size_type i = pos-1; i >= 0; --i) { - c = row->par()->getChar(i); - if (!Encodings::IsComposeChar_arabic(c)) { - if (IsPrintableNonspace(c)) { - int const width2 = - singleWidth(bview, - row->par(), - i, c); - dx = (width2 - width) / 2; - } - break; - } - } - // Draw nikud - pain.text(int(x) + dx, offset + row->baseline(), - textstring, font); - } else { - textstring = transformChar(c, row->par(), pos); - while (vpos <= last && - (pos = vis2log(vpos)) >= 0 - && IsPrintableNonspace(c = row->par()->getChar(pos)) - && !Encodings::IsComposeChar_arabic(c) - && font2 == getFont(bview->buffer(), row->par(), pos)) { - c = transformChar(c, row->par(), pos); - textstring += c; - ++vpos; + LyXFont const & font = getFont(p.bv->buffer(), p.row->par(), pos); + int const width = lyxfont::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; } - // Draw text and set the new x position - pain.text(int(x), offset + row->baseline(), - textstring, font); - x += lyxfont::width(textstring, font); + break; } - } else { - while (vpos <= last && - (pos = vis2log(vpos)) >= 0 - && IsPrintableNonspace(c = row->par()->getChar(pos)) - && font2 == getFont(bview->buffer(), row->par(), pos)) { - textstring += c; - ++vpos; + } + + // 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 = lyxfont::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 text and set the new x position - pain.text(int(x), offset + row->baseline(), textstring, font); - x += lyxfont::width(textstring, font); } + // 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 += lyxfont::width(str, orig_font); +} + + +void 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; + } else if (IsInsetChar(c)) { + drawInset(p, pos); + ++vpos; + drawForeignMark(p, orig_x, orig_font); + return; + } + + // 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 - if (lyxrc.mark_foreign_language && - font.language() != bview->buffer()->params.language) { - int const y = offset + row->height() - 1; - pain.line(int(tmpx), y, int(x), y, - LColor::language); - } - - // If we want ulem.sty support, drawing - // routines should go here. (Asger) - // Why shouldn't LyXFont::drawText handle it internally? +#endif } -// Returns the left beginning of the text. -// This information cannot be taken from the layouts-objekt, because in +// Returns the left beginning of the text. +// This information cannot be taken from the layouts-objekt, because in // LaTeX the beginning of the text fits in some cases (for example sections) // exactly the label-width. int LyXText::leftMargin(BufferView * bview, Row const * row) const { - LyXLayout const & layout = - textclasslist.Style(bview->buffer()->params.textclass, - row->par()->getLayout()); - - string parindent = layout.parindent; + LyXTextClass const & tclass = + textclasslist[bview->buffer()->params.textclass]; + LyXLayout const & layout = tclass[row->par()->layout()]; + + string parindent = layout.parindent; int x = LYX_PAPER_MARGIN; - - x += lyxfont::signedWidth(textclasslist - .TextClass(bview->buffer()->params.textclass) - .leftmargin(), - textclasslist - .TextClass(bview->buffer()->params.textclass) - .defaultfont()); + + x += lyxfont::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()->getLayout()) { + if (row->par()->layout() == tclass.defaultLayoutName()) { // find the previous same level paragraph if (row->par()->previous()) { Paragraph * newpar = row->par() ->depthHook(row->par()->getDepth()); if (newpar && - textclasslist.Style(bview->buffer()->params.textclass, - newpar->getLayout()) - .nextnoindent) + tclass[newpar->layout()].nextnoindent) parindent.erase(); } } } else { // find the next level paragraph - + Paragraph * newpar = row->par()->outerHook(); - + // make a corresponding row. Needed to call LeftMargin() - - // check wether it is a sufficent paragraph - if (newpar - && textclasslist - .Style(bview->buffer()->params.textclass, - newpar->getLayout()).isEnvironment()) { + + // check wether it is a sufficent paragraph + if (newpar && tclass[newpar->layout()].isEnvironment()) { Row dummyrow; dummyrow.par(newpar); dummyrow.pos(newpar->size()); @@ -647,27 +724,21 @@ int LyXText::leftMargin(BufferView * bview, Row const * row) const // LeftMargin() is always called row->par()->params().depth(0); } - - if (newpar && !row->par()->getLayout()) { + + if (newpar && row->par()->layout() == tclass.defaultLayoutName()) { if (newpar->params().noindent()) parindent.erase(); else - parindent = textclasslist - .Style(bview->buffer()->params.textclass, - newpar->getLayout()).parindent; + parindent = tclass[newpar->layout()].parindent; } - } - + LyXFont const labelfont = getLabelFont(bview->buffer(), row->par()); switch (layout.margintype) { case MARGIN_DYNAMIC: if (!layout.leftmargin.empty()) { x += lyxfont::signedWidth(layout.leftmargin, - textclasslist - .TextClass(bview->buffer()->params. - textclass) - .defaultfont()); + tclass.defaultfont()); } if (!row->par()->getLabelstring().empty()) { x += lyxfont::signedWidth(layout.labelindent, @@ -688,7 +759,7 @@ int LyXText::leftMargin(BufferView * bview, Row const * row) const } break; case MARGIN_STATIC: - x += lyxfont::signedWidth(layout.leftmargin, textclasslist.TextClass(bview->buffer()->params.textclass).defaultfont()) * 4 + x += lyxfont::signedWidth(layout.leftmargin, tclass.defaultfont()) * 4 / (row->par()->getDepth() + 4); break; case MARGIN_FIRST_DYNAMIC: @@ -717,38 +788,36 @@ int LyXText::leftMargin(BufferView * bview, Row const * row) const x += lyxfont::width(layout.labelsep, labelfont); x += lyxfont::width(row->par()->getLabelstring(), labelfont); - } + } break; - + 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 const * tmprow = row; while (tmprow->previous() && tmprow->previous()->par() == row->par()) tmprow = tmprow->previous(); - + int minfill = tmprow->fill(); while (tmprow->next() && tmprow->next()->par() == row->par()) { tmprow = tmprow->next(); if (tmprow->fill() < minfill) minfill = tmprow->fill(); } - + x += lyxfont::signedWidth(layout.leftmargin, - textclasslist - .TextClass(bview->buffer()->params.textclass) - .defaultfont()); + tclass.defaultfont()); x += minfill; } break; } - - int align; // wrong type + + LyXAlignment align; // wrong type if (row->par()->params().align() == LYX_ALIGN_LAYOUT) align = layout.align; @@ -757,68 +826,59 @@ int LyXText::leftMargin(BufferView * bview, Row const * row) const // set the correct parindent if (row->pos() == 0) { - if ((layout.labeltype == LABEL_NO_LABEL - || layout.labeltype == LABEL_TOP_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()->layout || + // in tabulars and ert paragraphs are never indented! + && (!row->par()->inInset() || !row->par()->inInset()->owner() || + (row->par()->inInset()->owner()->lyxCode() != Inset::TABULAR_CODE && + row->par()->inInset()->owner()->lyxCode() != Inset::ERT_CODE)) + && (row->par()->layout() != tclass.defaultLayoutName() || bview->buffer()->params.paragraph_separation == - BufferParams::PARSEP_INDENT)) + BufferParams::PARSEP_INDENT)) { x += lyxfont::signedWidth(parindent, - textclasslist - .TextClass(bview->buffer()->params - .textclass) - .defaultfont()); - else if (layout.labeltype == LABEL_BIBLIO) { + tclass.defaultfont()); + } else if (layout.labeltype == LABEL_BIBLIO) { // ale970405 Right width for bibitems - x += bibitemMaxWidth(bview,textclasslist - .TextClass(bview->buffer()->params - .textclass) - .defaultfont()); + x += bibitemMaxWidth(bview, tclass.defaultfont()); } } + return x; } int LyXText::rightMargin(Buffer const * buf, Row const * row) const { - LyXLayout const & layout = - textclasslist.Style(buf->params.textclass, - row->par()->getLayout()); - + LyXTextClass const & tclass = textclasslist[buf->params.textclass]; + LyXLayout const & layout = tclass[row->par()->layout()]; + int x = LYX_PAPER_MARGIN - + lyxfont::signedWidth(textclasslist - .TextClass(buf->params.textclass) - .rightmargin(), - textclasslist - .TextClass(buf->params.textclass) - .defaultfont()); + + lyxfont::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()) { // find the next level paragraph - + Paragraph * newpar = row->par(); - + do { newpar = newpar->previous(); } while (newpar && newpar->getDepth() >= row->par()->getDepth()); - + // make a corresponding row. Needed to call LeftMargin() - + // check wether it is a sufficent paragraph - if (newpar - && textclasslist.Style(buf->params.textclass, - newpar->getLayout()) - .isEnvironment()) { + if (newpar && tclass[newpar->layout()].isEnvironment()) { Row dummyrow; dummyrow.par(newpar); dummyrow.pos(0); @@ -831,35 +891,32 @@ int LyXText::rightMargin(Buffer const * buf, Row const * row) const row->par()->params().depth(0); } } - + //lyxerr << "rightmargin: " << layout->rightmargin << endl; - x += lyxfont::signedWidth(layout.rightmargin, textclasslist - .TextClass(buf->params.textclass) - .defaultfont()) * 4 / (row->par()->getDepth() - + 4); + x += lyxfont::signedWidth(layout.rightmargin, tclass.defaultfont()) + * 4 / (row->par()->getDepth() + 4); return x; } int LyXText::labelEnd(BufferView * bview, Row const * row) const { - if (textclasslist.Style(bview->buffer()->params.textclass, - row->par()->getLayout()).margintype + if (textclasslist[bview->buffer()->params.textclass][row->par()->layout()].margintype == MARGIN_MANUAL) { Row tmprow; tmprow = *row; tmprow.pos(row->par()->size()); - return leftMargin(bview, &tmprow); /* just the beginning + return leftMargin(bview, &tmprow); /* just the beginning of the main body */ } else - return 0; /* LabelEnd is only needed, if the + return 0; /* LabelEnd is only needed, if the layout fills a flushleft label. */ } // get the next breakpoint in a given paragraph -Paragraph::size_type +pos_type LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const { Paragraph * par = row->par(); @@ -867,19 +924,18 @@ LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const if (width < 0) return par->size(); - Paragraph::size_type const pos = row->pos(); + pos_type const pos = row->pos(); - - // position of the last possible breakpoint + // position of the last possible breakpoint // -1 isn't a suitable value, but a flag - Paragraph::size_type last_separator = -1; + pos_type last_separator = -1; width -= rightMargin(bview->buffer(), row); - - Paragraph::size_type const main_body = + + pos_type const main_body = beginningOfMainBody(bview->buffer(), par); LyXLayout const & layout = - textclasslist.Style(bview->buffer()->params.textclass, par->getLayout()); - Paragraph::size_type i = pos; + textclasslist[bview->buffer()->params.textclass][par->layout()]; + pos_type i = pos; if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX) { /* special code for right address boxes, only newlines count */ @@ -888,15 +944,15 @@ LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const last_separator = i; i = par->size() - 1; // this means break //x = width; - } else if (par->getChar(i) == Paragraph::META_INSET && - par->getInset(i) && par->getInset(i)->display()){ + } else if (par->isInset(i) && par->getInset(i) + && par->getInset(i)->display()) { par->getInset(i)->display(false); } ++i; } } else { // Last position is an invariant - Paragraph::size_type const last = + pos_type const last = par->size(); // this is the usual handling int x = leftMargin(bview, row); @@ -904,29 +960,30 @@ LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const while (doitonetime || ((x < width) && (i < last))) { doitonetime = false; char const c = par->getChar(i); + Inset * in = 0; + if (c == Paragraph::META_INSET) + in = par->getInset(i); if (IsNewlineChar(c)) { last_separator = i; x = width; // this means break - } else if (c == Paragraph::META_INSET && - par->getInset(i)) { - + } else if (in && !in->isChar()) { // check wether a Display() inset is // valid here. if not, change it to // non-display - if (par->getInset(i)->display() && + if (in->display() && (layout.isCommand() || (layout.labeltype == LABEL_MANUAL - && i < beginningOfMainBody(bview->buffer(), par)))) { + && i < beginningOfMainBody(bview->buffer(), par)))) + { // display istn't allowd - par->getInset(i)->display(false); + in->display(false); x += singleWidth(bview, par, i, c); - } else if (par->getInset(i)->display() || - par->getInset(i)->needFullRow()) { + } else if (in->display() || in->needFullRow()) { // So break the line here if (i == pos) { if (pos < last-1) { last_separator = i; - if (IsLineSeparatorChar(par->getChar(i+1))) + if (par->isLineSeparator(i+1)) ++last_separator; } else last_separator = last; // to avoid extra rows @@ -935,9 +992,19 @@ LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const x = width; // this means break } else { x += singleWidth(bview, par, i, c); + // we have to check this separately as we could have a + // lineseparator and then the algorithm below would prefer + // that which IS wrong! We should always break on an inset + // if it's too long and not on the last separator. + // Maybe the only exeption is insets used as chars but + // then we would have to have a special function inside + // the inset to tell us this. Till then we leave it as + // it is now. (Jug 20020106) + if (pos < i && x >= width && last_separator >= 0) + last_separator = i - 1; } } else { - if (IsLineSeparatorChar(c)) + if (par->isLineSeparator(i)) last_separator = i; x += singleWidth(bview, par, i, c); } @@ -952,21 +1019,25 @@ LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const x = left_margin; } } + if ((pos+1 < i) && (last_separator < 0) && (x >= width)) + last_separator = i - 2; + else if ((pos < i) && (last_separator < 0) && (x >= width)) + last_separator = i - 1; // end of paragraph is always a suitable separator - if (i == last && x < width) + else if (i == last && x < width) last_separator = i; } - - // well, if last_separator is still 0, the line isn't breakable. + + // well, if last_separator is still 0, the line isn't breakable. // don't care and cut simply at the end if (last_separator < 0) { last_separator = i; } - + // manual labels cannot be broken in LaTeX, do not care if (main_body && last_separator < main_body) last_separator = main_body - 1; - + return last_separator; } @@ -975,28 +1046,27 @@ LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const int LyXText::fill(BufferView * bview, Row * row, int paper_width) const { if (paper_width < 0) - return 20; + return 0; int w; // get the pure distance - Paragraph::size_type const last = rowLastPrintable(row); - + pos_type const last = rowLastPrintable(row); + // special handling of the right address boxes - if (textclasslist.Style(bview->buffer()->params.textclass, - row->par()->getLayout()).margintype - == MARGIN_RIGHT_ADDRESS_BOX) { + 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); } else w = leftMargin(bview, row); - - LyXLayout const & layout = textclasslist.Style(bview->buffer()->params.textclass, - row->par()->getLayout()); - Paragraph::size_type const main_body = + + LyXLayout const & layout = textclasslist[bview->buffer()->params.textclass][row->par()->layout()]; + pos_type const main_body = beginningOfMainBody(bview->buffer(), row->par()); - Paragraph::size_type i = row->pos(); + pos_type i = row->pos(); while (i <= last) { if (main_body > 0 && i == main_body) { @@ -1018,15 +1088,8 @@ int LyXText::fill(BufferView * bview, Row * row, int paper_width) const if (w < left_margin) w = left_margin; } - + int const fill = paper_width - w - rightMargin(bview->buffer(), row); -#ifdef WITH_WARNINGS -#warning Please fix me (Jug!) -#endif -#if 0 - if (fill < 0) - return 0; -#endif return fill; } @@ -1034,8 +1097,8 @@ int LyXText::fill(BufferView * bview, Row * row, int paper_width) const // returns the minimum space a manual label needs on the screen in pixel int LyXText::labelFill(BufferView * bview, Row const * row) const { - Paragraph::size_type last = beginningOfMainBody(bview->buffer(), row->par()) - 1; - // -1 because a label ends either with a space that is in the label, + pos_type last = beginningOfMainBody(bview->buffer(), row->par()) - 1; + // -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 @@ -1044,36 +1107,35 @@ int LyXText::labelFill(BufferView * bview, Row const * row) const // triggered when you have an open footnote in a paragraph // environment with a manual label. (Asger) if (last < 0) last = 0; - - if (row->par()->isLineSeparator(last)) /* a sepearator at this end + + if (row->par()->isLineSeparator(last)) /* a sepearator at this end does not count */ --last; - + int w = 0; - int i = row->pos(); + pos_type i = row->pos(); while (i <= last) { w += singleWidth(bview, row->par(), i); ++i; } - + int fill = 0; if (!row->par()->params().labelWidthString().empty()) { fill = max(lyxfont::width(row->par()->params().labelWidthString(), getLabelFont(bview->buffer(), row->par())) - w, 0); } - + return fill; } -// returns the number of separators in the specified row. The separator +// 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 { - Paragraph::size_type const last = rowLast(row); - Paragraph::size_type p = - max(row->pos(), beginningOfMainBody(buf, row->par())); + pos_type const last = rowLast(row); + pos_type p = max(row->pos(), beginningOfMainBody(buf, row->par())); int n = 0; for (; p < last; ++p) { if (row->par()->isSeparator(p)) { @@ -1085,21 +1147,25 @@ int LyXText::numberOfSeparators(Buffer const * buf, Row const * row) const // 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 +// 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 { - Paragraph::size_type const last = rowLast(row); - Paragraph::size_type first = row->pos(); - if (first) { /* hfill *DO* count at the beginning + 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)) + while (first <= last && row->par()->isHfill(first)) { ++first; + } } first = max(first, beginningOfMainBody(buf, row->par())); int n = 0; - for (int p = first; p <= last; ++p) { // last, because the end is ignored! + for (pos_type p = first; p <= last; ++p) { + // last, because the end is ignored! + if (row->par()->isHfill(p)) { ++n; } @@ -1111,18 +1177,18 @@ int LyXText::numberOfHfills(Buffer const * buf, Row const * row) const // like NumberOfHfills, but only those in the manual label! int LyXText::numberOfLabelHfills(Buffer const * buf, Row const * row) const { - Paragraph::size_type last = rowLast(row); - Paragraph::size_type first = row->pos(); - if (first) { /* hfill *DO* count at the beginning + 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)) + while (first < last && row->par()->isHfill(first)) ++first; } last = min(last, beginningOfMainBody(buf, row->par())); int n = 0; - for (Paragraph::size_type p = first; - p < last; ++p) { // last, because the end is ignored! + for (pos_type p = first; p < last; ++p) { + // last, because the end is ignored! if (row->par()->isHfill(p)) { ++n; } @@ -1134,36 +1200,43 @@ int LyXText::numberOfLabelHfills(Buffer const * buf, Row const * row) const // returns true, if a expansion is needed. // Rules are given by LaTeX bool LyXText::hfillExpansion(Buffer const * buf, Row const * row_ptr, - Paragraph::size_type pos) const + 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 - if (pos >= rowLast(row_ptr)) - return false; - - // at the beginning of a row it does not count, if it is not + // 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.Style(buf->params.textclass, - row_ptr->par()->getLayout()).margintype + if (textclasslist[buf->params.textclass][row_ptr->par()->layout()].margintype != MARGIN_MANUAL && pos < beginningOfMainBody(buf, row_ptr->par())) - return false; - + 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 - Paragraph::size_type i = row_ptr->pos(); + pos_type i = row_ptr->pos(); while (i < pos && (row_ptr->par()->isNewline(i) || row_ptr->par()->isHfill(i))) ++i; - + return i != pos; } @@ -1178,7 +1251,7 @@ LColor::color LyXText::backgroundColor() void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const { - /* get the maximum ascent and the maximum descent */ + /* get the maximum ascent and the maximum descent */ int asc = 0; int desc = 0; float layoutasc = 0; @@ -1187,23 +1260,17 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const LyXFont tmpfont; Inset * tmpinset = 0; - /* this must not happen before the currentrow for clear reasons. - so the trick is just to set the current row onto this row */ - int unused_y; - getRow(row_ptr->par(), row_ptr->pos(), unused_y); - - /* ok , let us initialize the maxasc and maxdesc value. + /* ok , let us initialize the maxasc and maxdesc value. * This depends in LaTeX of the font of the last character * in the paragraph. The hack below is necessary because * of the possibility of open footnotes */ - + /* Correction: only the fontsize count. The other properties are taken from the layoutfont. Nicer on the screen :) */ Paragraph * par = row_ptr->par(); Paragraph * firstpar = row_ptr->par(); - - LyXLayout const & layout = textclasslist.Style(bview->buffer()->params.textclass, - firstpar->getLayout()); + + LyXLayout const & layout = textclasslist[bview->buffer()->params.textclass][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 @@ -1223,20 +1290,20 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const spacing_val = bview->buffer()->params.spacing.getValue(); } //lyxerr << "spacing_val = " << spacing_val << endl; - + int maxasc = int(lyxfont::maxAscent(font) * - layout.spacing.getValue() * - spacing_val); + layout.spacing.getValue() * + spacing_val); int maxdesc = int(lyxfont::maxDescent(font) * - layout.spacing.getValue() * - spacing_val); - int const pos_end = rowLast(row_ptr); + layout.spacing.getValue() * + spacing_val); + pos_type const pos_end = rowLast(row_ptr); int labeladdon = 0; int maxwidth = 0; // Check if any insets are larger - for (int pos = row_ptr->pos(); pos <= pos_end; ++pos) { - if (row_ptr->par()->getChar(pos) == Paragraph::META_INSET) { + 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); if (tmpinset) { @@ -1264,7 +1331,7 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const asc = lyxfont::maxAscent(font); desc = lyxfont::maxDescent(font); - if (asc > maxasc) + if (asc > maxasc) maxasc = asc; if (desc > maxdesc) maxdesc = desc; @@ -1275,10 +1342,10 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const ++maxdesc; row_ptr->ascent_of_text(maxasc); - + // is it a top line? if (!row_ptr->pos() && (row_ptr->par() == firstpar)) { - + // some parksips VERY EASY IMPLEMENTATION if (bview->buffer()->params.paragraph_separation == BufferParams::PARSEP_SKIP) @@ -1289,34 +1356,31 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const { maxasc += bview->buffer()->params.getDefSkip().inPixels(bview); } else if (firstpar->previous() && - textclasslist.Style(bview->buffer()->params.textclass, - firstpar->previous()-> - getLayout()).isParagraph() && - firstpar->previous()->getDepth() == 0) + textclasslist[bview->buffer()->params.textclass][firstpar->previous()->layout()].isParagraph() && + firstpar->previous()->getDepth() == 0) { // is it right to use defskip here too? (AS) maxasc += bview->buffer()->params.getDefSkip().inPixels(bview); } } - + // the paper margins if (!row_ptr->par()->previous() && bv_owner) maxasc += LYX_PAPER_MARGIN; - + // add the vertical spaces, that the user added - if (firstpar->params().spaceTop().kind() != VSpace::NONE) - maxasc += int(firstpar->params().spaceTop().inPixels(bview)); - + maxasc += getLengthMarkerHeight(bview, firstpar->params().spaceTop()); + // do not forget the DTP-lines! // there height depends on the font of the nearest character if (firstpar->params().lineTop()) maxasc += 2 * lyxfont::ascent('x', getFont(bview->buffer(), - firstpar, 0)); - + firstpar, 0)); + // and now the pagebreaks if (firstpar->params().pagebreakTop()) maxasc += 3 * defaultHeight(); - + // 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 @@ -1328,15 +1392,15 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const } else { spacing_val = bview->buffer()->params.spacing.getValue(); } - + labeladdon = int(lyxfont::maxDescent(labelfont) * - layout.spacing.getValue() * - spacing_val) + layout.spacing.getValue() * + spacing_val) + int(lyxfont::maxAscent(labelfont) * layout.spacing.getValue() * spacing_val); } - + // special code for the top label if ((layout.labeltype == LABEL_TOP_ENVIRONMENT || layout.labeltype == LABEL_BIBLIO @@ -1350,7 +1414,7 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const } else { spacing_val = bview->buffer()->params.spacing.getValue(); } - + labeladdon = int( (lyxfont::maxAscent(labelfont) * layout.spacing.getValue() * @@ -1361,45 +1425,42 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const + layout.topsep * defaultHeight() + layout.labelbottomsep * defaultHeight()); } - - // and now the layout spaces, for example before and after a section, + + // 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(); if (prev) prev = row_ptr->par()->depthHook(row_ptr->par()->getDepth()); - if (prev && prev->getLayout() == firstpar->getLayout() && + 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; - + if (row_ptr->previous()->par()->getDepth() >= row_ptr->par()->getDepth()) - tmptop -= textclasslist.Style(bview->buffer()->params.textclass, - row_ptr->previous()->par()-> - getLayout()).bottomsep; - + tmptop -= textclasslist[bview->buffer()->params.textclass][row_ptr->previous()->par()->layout()].bottomsep; + if (tmptop > 0) layoutasc = (tmptop * defaultHeight()); } else if (row_ptr->par()->params().lineTop()) { tmptop = layout.topsep; - + if (tmptop > 0) layoutasc = (tmptop * defaultHeight()); } - + prev = row_ptr->par()->outerHook(); if (prev) { - maxasc += int(textclasslist.Style(bview->buffer()->params.textclass, - prev->getLayout()).parsep * defaultHeight()); + maxasc += int(textclasslist[bview->buffer()->params.textclass][prev->layout()].parsep * defaultHeight()); } else { if (firstpar->previous() && firstpar->previous()->getDepth() == 0 && - firstpar->previous()->getLayout() != - firstpar->getLayout()) + firstpar->previous()->layout() != + firstpar->layout()) { // avoid parsep } else if (firstpar->previous()) { @@ -1408,7 +1469,7 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const } } } - + // is it a bottom line? if (row_ptr->par() == par && (!row_ptr->next() || row_ptr->next()->par() != row_ptr->par())) @@ -1416,76 +1477,78 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const // the paper margins if (!par->next() && bv_owner) maxdesc += LYX_PAPER_MARGIN; - + // add the vertical spaces, that the user added - if (firstpar->params().spaceBottom().kind() != VSpace::NONE) - maxdesc += int(firstpar->params().spaceBottom().inPixels(bview)); - + 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 * lyxfont::ascent('x', - getFont(bview->buffer(), - par, par->size() - 1)); - + getFont(bview->buffer(), + par, + max(pos_type(0), par->size() - 1))); + // and now the pagebreaks if (firstpar->params().pagebreakBottom()) maxdesc += 3 * defaultHeight(); - + // 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()) { + if (!firstpar->params().pagebreakBottom() + && row_ptr->par()->next()) { Paragraph * nextpar = row_ptr->par()->next(); Paragraph * comparepar = row_ptr->par(); float usual = 0; float unusual = 0; - + if (comparepar->getDepth() > nextpar->getDepth()) { - usual = (textclasslist.Style(bview->buffer()->params.textclass, - comparepar->getLayout()).bottomsep * defaultHeight()); + usual = (textclasslist[bview->buffer()->params.textclass][comparepar->layout()].bottomsep * defaultHeight()); comparepar = comparepar->depthHook(nextpar->getDepth()); - if (comparepar->getLayout()!= nextpar->getLayout() - || nextpar->getLabelWidthString() != + if (comparepar->layout()!= nextpar->layout() + || nextpar->getLabelWidthString() != comparepar->getLabelWidthString()) { - unusual = (textclasslist.Style(bview->buffer()->params.textclass, - comparepar->getLayout()).bottomsep * defaultHeight()); + unusual = (textclasslist[bview->buffer()->params.textclass][comparepar->layout()].bottomsep * defaultHeight()); } if (unusual > usual) layoutdesc = unusual; else layoutdesc = usual; } else if (comparepar->getDepth() == nextpar->getDepth()) { - - if (comparepar->getLayout()!= nextpar->getLayout() - || nextpar->getLabelWidthString() != + + if (comparepar->layout() != nextpar->layout() + || nextpar->getLabelWidthString() != comparepar->getLabelWidthString()) - layoutdesc = int(textclasslist.Style(bview->buffer()->params.textclass, - comparepar->getLayout()).bottomsep * defaultHeight()); + layoutdesc = int(textclasslist[bview->buffer()->params.textclass][comparepar->layout()].bottomsep * defaultHeight()); } } } - + // incalculate the layout spaces maxasc += int(layoutasc * 2 / (2 + firstpar->getDepth())); maxdesc += int(layoutdesc * 2 / (2 + firstpar->getDepth())); - + // calculate the new height of the text height -= row_ptr->height(); - + row_ptr->height(maxasc + maxdesc + labeladdon); row_ptr->baseline(maxasc + labeladdon); - + height += row_ptr->height(); - float x; - float dummy; - prepareToPrint(bview, row_ptr, x, dummy, dummy, dummy, false); + float x = 0; + 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_ptr->width(int(maxwidth + x)); if (inset_owner) { Row * r = firstrow; width = max(0,workWidth(bview)); - while(r) { + while (r) { if (r->width() > width) width = r->width(); r = r->next(); @@ -1498,45 +1561,44 @@ void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const * start at the implicit given position */ void LyXText::appendParagraph(BufferView * bview, Row * row) const { - bool not_ready = true; - - // The last character position of a paragraph is an invariant so we can - // safely get it here. (Asger) - int const lastposition = row->par()->size(); - do { - // Get the next breakpoint - int z = nextBreakPoint(bview, row, workWidth(bview)); - - Row * tmprow = row; - - // Insert the new row - if (z < lastposition) { - ++z; - insertRow(row, row->par(), z); - row = row->next(); - - row->height(0); - } else - not_ready = false; - - // Set the dimensions of the row -#ifdef WITH_WARNINGS -#warning Something is rotten here! (Jug) -#endif - tmprow->fill(fill(bview, tmprow, workWidth(bview))); - setHeightOfRow(bview, tmprow); + bool not_ready = true; + + // The last character position of a paragraph is an invariant so we can + // safely get it here. (Asger) + pos_type const lastposition = row->par()->size(); + do { + // Get the next breakpoint + pos_type z = nextBreakPoint(bview, row, workWidth(bview)); + + Row * tmprow = row; + + // Insert the new row + if (z < lastposition) { + ++z; + insertRow(row, row->par(), z); + row = row->next(); + + row->height(0); + } else + not_ready = false; + + // 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))); + setHeightOfRow(bview, tmprow); - } while (not_ready); + } while (not_ready); } void LyXText::breakAgain(BufferView * bview, Row * row) const { bool not_ready = true; - + do { // get the next breakpoint - Paragraph::size_type z = nextBreakPoint(bview, row, workWidth(bview)); + pos_type z = nextBreakPoint(bview, row, workWidth(bview)); Row * tmprow = row; if (z < row->par()->size()) { @@ -1557,7 +1619,7 @@ void LyXText::breakAgain(BufferView * bview, Row * row) const } } else { /* if there are some rows too much, delete them */ - /* only if you broke the whole paragraph! */ + /* only if you broke the whole paragraph! */ Row * tmprow2 = row; while (tmprow2->next() && tmprow2->next()->par() == row->par()) { tmprow2 = tmprow2->next(); @@ -1568,8 +1630,8 @@ void LyXText::breakAgain(BufferView * bview, Row * row) const } not_ready = false; } - - /* set the dimensions of the row */ + + /* set the dimensions of the row */ tmprow->fill(fill(bview, tmprow, workWidth(bview))); setHeightOfRow(bview, tmprow); } while (not_ready); @@ -1580,19 +1642,19 @@ void LyXText::breakAgain(BufferView * bview, Row * row) const void LyXText::breakAgainOneRow(BufferView * bview, Row * row) { // get the next breakpoint - Paragraph::size_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(); row->height(0); } else { - row= row->next(); + row = row->next(); ++z; if (row->pos() != z) row->pos(z); @@ -1610,7 +1672,7 @@ void LyXText::breakAgainOneRow(BufferView * bview, Row * row) removeRow(tmprow2->next()); } } - + // set the dimensions of the row tmprow->fill(fill(bview, tmprow, workWidth(bview))); setHeightOfRow(bview, tmprow); @@ -1619,16 +1681,16 @@ void LyXText::breakAgainOneRow(BufferView * bview, Row * row) void LyXText::breakParagraph(BufferView * bview, char keep_layout) { - LyXLayout const & layout = - textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->getLayout()); + LyXTextClass const & tclass = + textclasslist[bview->buffer()->params.textclass]; + LyXLayout const & layout = tclass[cursor.par()->layout()]; // this is only allowed, if the current paragraph is not empty or caption if ((cursor.par()->size() <= 0) && layout.labeltype!= LABEL_SENSITIVE) return; - - setUndo(bview, Undo::INSERT,cursor.par(),cursor.par()->next()); + + setUndo(bview, Undo::FINISH, cursor.par(), cursor.par()->next()); // Always break behind a space // @@ -1636,12 +1698,12 @@ void LyXText::breakParagraph(BufferView * bview, char keep_layout) if (cursor.pos() < cursor.par()->size() && cursor.par()->isLineSeparator(cursor.pos())) cursor.par()->erase(cursor.pos()); - // cursor.pos(cursor.pos() + 1); + // cursor.pos(cursor.pos() + 1); // break the paragraph if (keep_layout) keep_layout = 2; - else + else keep_layout = layout.isEnvironment(); cursor.par()->breakParagraph(bview->buffer()->params, cursor.pos(), keep_layout); @@ -1650,25 +1712,25 @@ void LyXText::breakParagraph(BufferView * bview, char keep_layout) if (layout.labeltype == LABEL_SENSITIVE) { if (!cursor.pos()) // set to standard-layout - cursor.par()->setLayout(0); + cursor.par()->applyLayout(tclass.defaultLayoutName()); else // set to standard-layout - cursor.par()->next()->setLayout(0); + cursor.par()->next()->applyLayout(tclass.defaultLayoutName()); } - - /* if the cursor is at the beginning of a row without prior newline, - * move one row up! + + /* 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 */ if (cursor.pos() && !cursor.row()->par()->isNewline(cursor.row()->pos() - 1) && cursor.row()->pos() == cursor.pos()) { cursorLeft(bview); - } - + } + status(bview, LyXText::NEED_MORE_REFRESH); refresh_row = cursor.row(); refresh_y = cursor.y() - cursor.row()->baseline(); - + // Do not forget the special right address boxes if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX) { while (refresh_row->previous() && @@ -1678,7 +1740,7 @@ void LyXText::breakParagraph(BufferView * bview, char keep_layout) } } removeParagraph(cursor.row()); - + // set the dimensions of the cursor row cursor.row()->fill(fill(bview, cursor.row(), workWidth(bview))); @@ -1687,18 +1749,18 @@ void LyXText::breakParagraph(BufferView * bview, char keep_layout) while (cursor.par()->next()->size() && cursor.par()->next()->isNewline(0)) cursor.par()->next()->erase(0); - + insertParagraph(bview, cursor.par()->next(), cursor.row()); updateCounters(bview, cursor.row()->previous()); - + /* This check is necessary. Otherwise the new empty paragraph will - * be deleted automatically. And it is more friendly for the user! */ + * be deleted automatically. And it is more friendly for the user! */ if (cursor.pos()) setCursor(bview, cursor.par()->next(), 0); else setCursor(bview, cursor.par(), 0); - + if (cursor.row()->next()) breakAgain(bview, cursor.row()->next()); @@ -1706,7 +1768,7 @@ void LyXText::breakParagraph(BufferView * bview, char keep_layout) } -// Just a macro to make some thing easier. +// Just a macro to make some thing easier. void LyXText::redoParagraph(BufferView * bview) const { clearSelection(); @@ -1715,20 +1777,18 @@ void LyXText::redoParagraph(BufferView * bview) const } -/* insert a character, moves all the following breaks in the +/* insert a character, moves all the following breaks in the * 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()); + 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.Style(bview->buffer()->params.textclass, - cursor.row()->par()->getLayout()).free_spacing; - + bool const freeSpacing = + textclasslist[bview->buffer()->params.textclass][cursor.row()->par()->layout()].free_spacing || + cursor.row()->par()->isFreeSpacing(); if (lyxrc.auto_number) { static string const number_operators = "+-/*"; @@ -1736,7 +1796,7 @@ void LyXText::insertChar(BufferView * bview, char c) static string const number_seperators = ".,:"; if (current_font.number() == LyXFont::ON) { - if (!isdigit(c) && !contains(number_operators, c) && + if (!IsDigit(c) && !contains(number_operators, c) && !(contains(number_seperators, c) && cursor.pos() >= 1 && cursor.pos() < cursor.par()->size() && @@ -1746,9 +1806,9 @@ void LyXText::insertChar(BufferView * bview, char c) getFont(bview->buffer(), cursor.par(), cursor.pos() - 1).number() == LyXFont::ON) - ) + ) number(bview); // Set current_font.number to OFF - } else if (isdigit(c) && + } else if (IsDigit(c) && real_current_font.isVisibleRightToLeft()) { number(bview); // Set current_font.number to ON @@ -1757,8 +1817,8 @@ void LyXText::insertChar(BufferView * bview, char c) if (contains(number_unary_operators, c) && (cursor.pos() == 1 || cursor.par()->isSeparator(cursor.pos() - 2) || - cursor.par()->isNewline(cursor.pos() - 2) ) - ) { + cursor.par()->isNewline(cursor.pos() - 2)) + ) { setCharFont(bview->buffer(), cursor.par(), cursor.pos() - 1, @@ -1778,41 +1838,41 @@ void LyXText::insertChar(BufferView * bview, char c) } - /* First check, if there will be two blanks together or a blank at - the beginning of a paragraph. - I decided to handle blanks like normal characters, the main + /* First check, if there will be two blanks together or a blank at + the beginning of a paragraph. + I decided to handle blanks like normal characters, the main difference are the special checks when calculating the row.fill - (blank does not count at the end of a row) and the check here */ + (blank does not count at the end of a row) and the check here */ // The bug is triggered when we type in a description environment: // The current_font is not changed when we go from label to main text // and it should (along with realtmpfont) when we type the space. // CHECK There is a bug here! (Asger) - + LyXFont realtmpfont = real_current_font; LyXFont rawtmpfont = current_font; /* store the current font. * This is because of the use * of cursor movements. The moving - * cursor would refresh the + * cursor would refresh the * current font */ // Get the font that is used to calculate the baselineskip - Paragraph::size_type const lastpos = cursor.par()->size(); + pos_type const lastpos = cursor.par()->size(); LyXFont rawparfont = cursor.par()->getFontSettings(bview->buffer()->params, lastpos - 1); bool jumped_over_space = false; - + if (!freeSpacing && IsLineSeparatorChar(c)) { - if ((cursor.pos() > 0 + if ((cursor.pos() > 0 && cursor.par()->isLineSeparator(cursor.pos() - 1)) || (cursor.pos() > 0 && cursor.par()->isNewline(cursor.pos() - 1)) || (cursor.pos() == 0)) { static bool sent_space_message = false; if (!sent_space_message) { - if (cursor.pos() == 0) + if (cursor.pos() == 0) 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.")); @@ -1822,13 +1882,13 @@ void LyXText::insertChar(BufferView * bview, char c) return; } } else if (IsNewlineChar(c)) { - if (cursor.par() == cursor.par() - && cursor.pos() <= beginningOfMainBody(bview->buffer(), cursor.par())) { + if (cursor.pos() <= beginningOfMainBody(bview->buffer(), + cursor.par())) { charInserted(); return; } - /* No newline at first position - * of a paragraph or behind labels. + /* No newline at first position + * of a paragraph or behind labels. * TeX does not allow that. */ if (cursor.pos() < cursor.par()->size() && @@ -1837,19 +1897,21 @@ void LyXText::insertChar(BufferView * bview, char c) cursorRight(bview); cursor.row()->fill(-1); // to force a new break } - + // the display inset stuff - if (cursor.row()->par()->getChar(cursor.row()->pos()) == Paragraph::META_INSET - && cursor.row()->par()->getInset(cursor.row()->pos()) - && (cursor.row()->par()->getInset(cursor.row()->pos())->display() || - cursor.row()->par()->getInset(cursor.row()->pos())->needFullRow())) - cursor.row()->fill(-1); // to force a new break + if (cursor.row()->par()->isInset(cursor.row()->pos())) { + Inset * inset = cursor.row()->par()->getInset(cursor.row()->pos()); + if (inset && (inset->display() || inset->needFullRow())) { + // force a new break + cursor.row()->fill(-1); // to force a new break + } + } // get the cursor row fist Row * row = cursor.row(); int y = cursor.y() - row->baseline(); - if (c != Paragraph::META_INSET) /* Here case LyXText::InsertInset - * already insertet the character */ + if (c != Paragraph::META_INSET) /* Here case LyXText::InsertInset + * already insertet the character */ cursor.par()->insertChar(cursor.pos(), c); setCharFont(bview->buffer(), cursor.par(), cursor.pos(), rawtmpfont); @@ -1861,30 +1923,33 @@ void LyXText::insertChar(BufferView * bview, char c) tmprow->pos(tmprow->pos() + 1); } } - + // Is there a break one row above if ((cursor.par()->isLineSeparator(cursor.pos()) || cursor.par()->isNewline(cursor.pos()) + || ((cursor.pos() < cursor.par()->size()) && + cursor.par()->isInset(cursor.pos()+1)) || cursor.row()->fill() == -1) - && row->previous() && row->previous()->par() == row->par()) { - Paragraph::size_type z = nextBreakPoint(bview, + && row->previous() && row->previous()->par() == row->par()) + { + pos_type z = nextBreakPoint(bview, row->previous(), 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))); setHeightOfRow(bview, row->previous()); - + y -= row->previous()->height(); refresh_y = y; refresh_row = row->previous(); status(bview, LyXText::NEED_MORE_REFRESH); - + breakAgainOneRow(bview, row); current_font = rawtmpfont; @@ -1892,34 +1957,34 @@ void LyXText::insertChar(BufferView * bview, char c) setCursor(bview, cursor.par(), cursor.pos() + 1, false, cursor.boundary()); // cursor MUST be in row now. - + if (row->next() && row->next()->par() == row->par()) need_break_row = row->next(); else need_break_row = 0; - + // check, wether the last characters font has changed. if (cursor.pos() && cursor.pos() == cursor.par()->size() && rawparfont != rawtmpfont) redoHeightOfParagraph(bview, cursor); - + charInserted(); return; } } - + // recalculate the fill of the row if (row->fill() >= 0) /* needed because a newline - * will set fill to -1. Otherwise - * we would not get a rebreak! */ + * will set fill to -1. Otherwise + * we would not get a rebreak! */ row->fill(fill(bview, row, workWidth(bview))); if (row->fill() < 0) { refresh_y = y; - refresh_row = row; + refresh_row = row; refresh_x = cursor.x(); refresh_pos = cursor.pos(); status(bview, LyXText::NEED_MORE_REFRESH); - breakAgainOneRow(bview, row); + breakAgainOneRow(bview, row); // will the cursor be in another row now? if (rowLast(row) <= cursor.pos() + 1 && row->next()) { if (row->next() && row->next()->par() == row->par()) @@ -1939,20 +2004,20 @@ void LyXText::insertChar(BufferView * bview, char c) if (row->next() && row->next()->par() == row->par()) need_break_row = row->next(); else - need_break_row = 0; + 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); if (tmpheight == row->height()) status(bview, LyXText::NEED_VERY_LITTLE_REFRESH); else status(bview, LyXText::NEED_MORE_REFRESH); - + current_font = rawtmpfont; real_current_font = realtmpfont; setCursor(bview, cursor.par(), cursor.pos() + 1, false, @@ -1965,16 +2030,15 @@ void LyXText::insertChar(BufferView * bview, char c) redoHeightOfParagraph(bview, cursor); } else { // now the special right address boxes - if (textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->getLayout()).margintype + if (textclasslist[bview->buffer()->params.textclass][cursor.par()->layout()].margintype == MARGIN_RIGHT_ADDRESS_BOX) { - redoDrawingOfParagraph(bview, cursor); + redoDrawingOfParagraph(bview, cursor); } } charInserted(); } - + void LyXText::charInserted() { @@ -1991,74 +2055,84 @@ void LyXText::charInserted() void LyXText::prepareToPrint(BufferView * bview, - Row * row, float & x, - float & fill_separator, - float & fill_hfill, - float & fill_label_hfill, - bool bidi) const + Row * row, float & x, + float & fill_separator, + float & fill_hfill, + float & fill_label_hfill, + bool bidi) const { float nlh; float ns; - + float w = row->fill(); fill_hfill = 0; fill_label_hfill = 0; fill_separator = 0; fill_label_hfill = 0; - bool const is_rtl = + bool const is_rtl = row->par()->isRightToLeftPar(bview->buffer()->params); if (is_rtl) { x = (workWidth(bview) > 0) ? rightMargin(bview->buffer(), row) : 0; } else x = (workWidth(bview) > 0) ? leftMargin(bview, row) : 0; - + // is there a manual margin with a manual label - if (textclasslist.Style(bview->buffer()->params.textclass, - row->par()->getLayout()).margintype == MARGIN_MANUAL - && textclasslist.Style(bview->buffer()->params.textclass, - row->par()->getLayout()).labeltype == LABEL_MANUAL) { - - /* one more since labels are left aligned */ + LyXTextClass const & tclass = textclasslist[bview->buffer()->params.textclass]; + LyXLayout const & layout = tclass[row->par()->layout()]; + + if (layout.margintype == MARGIN_MANUAL + && layout.labeltype == LABEL_MANUAL) { + // one more since labels are left aligned nlh = numberOfLabelHfills(bview->buffer(), row) + 1; if (nlh && !row->par()->getLabelWidthString().empty()) { fill_label_hfill = labelFill(bview, row) / nlh; } } - + // are there any hfills in the row? float const nh = numberOfHfills(bview->buffer(), row); if (nh) { if (w > 0) fill_hfill = w / nh; - } else { - // is it block, flushleft or flushright? + // 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(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 = textclasslist.Style(bview->buffer()->params.textclass, row->par()->getLayout()).align; + align = layout.align; } else { align = row->par()->params().align(); } - - // center displayed insets + + // center displayed insets Inset * inset; - if (row->par()->getChar(row->pos()) == Paragraph::META_INSET + if (row->par()->isInset(row->pos()) && (inset=row->par()->getInset(row->pos())) && (inset->display())) // || (inset->scroll() < 0))) align = (inset->lyxCode() == Inset::MATHMACRO_CODE) - ? LYX_ALIGN_BLOCK : LYX_ALIGN_CENTER; - + ? LYX_ALIGN_BLOCK : LYX_ALIGN_CENTER; + // ERT insets should always be LEFT ALIGNED on screen + inset = row->par()->inInset(); + if (inset && inset->owner() && + inset->owner()->lyxCode() == Inset::ERT_CODE) + { + align = LYX_ALIGN_LEFT; + } + switch (align) { case LYX_ALIGN_BLOCK: ns = numberOfSeparators(bview->buffer(), row); if (ns && row->next() && row->next()->par() == row->par() && !(row->next()->par()->isNewline(row->next()->pos() - 1)) - && !(row->next()->par()->getChar(row->next()->pos()) == Paragraph::META_INSET - && row->next()->par()->getInset(row->next()->pos()) - && row->next()->par()->getInset(row->next()->pos())->display()) + && !(row->next()->par()->isInset(row->next()->pos()) + && row->next()->par()->getInset(row->next()->pos()) + && row->next()->par()->getInset(row->next()->pos())->display()) ) { fill_separator = w / ns; @@ -2079,24 +2153,21 @@ void LyXText::prepareToPrint(BufferView * bview, computeBidiTables(bview->buffer(), row); if (is_rtl) { - Paragraph::size_type main_body = + pos_type main_body = beginningOfMainBody(bview->buffer(), row->par()); - Paragraph::size_type last = rowLast(row); + pos_type last = rowLast(row); if (main_body > 0 && - (main_body-1 > last || - !row->par()->isLineSeparator(main_body-1))) { - LyXLayout const & layout = - textclasslist.Style(bview->buffer()->params.textclass, - row->par()->getLayout()); + (main_body - 1 > last || + !row->par()->isLineSeparator(main_body - 1))) { x += lyxfont::width(layout.labelsep, getLabelFont(bview->buffer(), row->par())); - if (main_body-1 <= last) + if (main_body - 1 <= last) x += fill_label_hfill; } } } - + /* important for the screen */ @@ -2126,7 +2197,7 @@ void LyXText::cursorRightOneWord(BufferView * bview) const } // Advance through word. while (tmpcursor.pos() < tmpcursor.par()->size() && - tmpcursor.par()->isWord( tmpcursor.pos())) { + tmpcursor.par()->isWord(tmpcursor.pos())) { // printf("Current pos2 %d", tmpcursor.pos()) ; tmpcursor.pos(tmpcursor.pos() + 1); ++steps; @@ -2140,22 +2211,22 @@ void LyXText::cursorTab(BufferView * bview) const { LyXCursor tmpcursor = cursor; while (tmpcursor.pos() < tmpcursor.par()->size() - && !tmpcursor.par()->isNewline(tmpcursor.pos())) - tmpcursor.pos(tmpcursor.pos() + 1); - - if (tmpcursor.pos() == tmpcursor.par()->size()){ - if (tmpcursor.par()->next()) { - tmpcursor.par(tmpcursor.par()->next()); - tmpcursor.pos(0); - } + && !tmpcursor.par()->isNewline(tmpcursor.pos())) + tmpcursor.pos(tmpcursor.pos() + 1); + + if (tmpcursor.pos() == tmpcursor.par()->size()) { + if (tmpcursor.par()->next()) { + tmpcursor.par(tmpcursor.par()->next()); + tmpcursor.pos(0); + } } else - tmpcursor.pos(tmpcursor.pos() + 1); + tmpcursor.pos(tmpcursor.pos() + 1); setCursor(bview, tmpcursor.par(), tmpcursor.pos()); } /* -------> 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 { @@ -2168,8 +2239,8 @@ void LyXText::cursorLeftOneWord(LyXCursor & cur) const { // treat HFills, floats and Insets as words cur = cursor; - while (cur.pos() - && (cur.par()->isSeparator(cur.pos() - 1) + while (cur.pos() + && (cur.par()->isSeparator(cur.pos() - 1) || cur.par()->isKomma(cur.pos() - 1)) && !(cur.par()->isHfill(cur.pos() - 1) || cur.par()->isInset(cur.pos() - 1))) @@ -2180,25 +2251,25 @@ void LyXText::cursorLeftOneWord(LyXCursor & cur) const || cur.par()->isHfill(cur.pos() - 1))) { cur.pos(cur.pos() - 1); } else if (!cur.pos()) { - if (cur.par()->previous()){ + if (cur.par()->previous()) { cur.par(cur.par()->previous()); cur.pos(cur.par()->size()); } - } else { // Here, cur != 0 + } 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. */ -void LyXText::getWord(LyXCursor & from, LyXCursor & to, +void LyXText::getWord(LyXCursor & from, LyXCursor & to, word_location const loc) const { // first put the cursor where we wana start to select the word from = cursor; - switch(loc) { + switch (loc) { case WHOLE_WORD_STRICT: if (cursor.pos() == 0 || cursor.pos() == cursor.par()->size() || cursor.par()->isSeparator(cursor.pos()) @@ -2209,7 +2280,7 @@ void LyXText::getWord(LyXCursor & from, LyXCursor & to, return; } // no break here, we go to the next - + case WHOLE_WORD: // Move cursor to the beginning, when not already there. if (from.pos() && !from.par()->isSeparator(from.pos() - 1) @@ -2230,14 +2301,14 @@ void LyXText::getWord(LyXCursor & from, LyXCursor & to, 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.pos(to.pos() + 1); } } -void LyXText::selectWord(BufferView * bview, word_location const loc) +void LyXText::selectWord(BufferView * bview, word_location const loc) { LyXCursor from; LyXCursor to; @@ -2247,15 +2318,15 @@ void LyXText::selectWord(BufferView * bview, word_location const loc) if (to == from) return; selection.cursor = cursor; - setCursor(bview, to.par(), to.pos() ); + setCursor(bview, to.par(), to.pos()); setSelection(bview); } /* -------> Select the word currently under the cursor when no selection is currently set */ -bool LyXText::selectWordWhenUnderCursor(BufferView * bview, - word_location const loc) +bool LyXText::selectWordWhenUnderCursor(BufferView * bview, + word_location const loc) { if (!selection.set()) { selectWord(bview, loc); @@ -2267,17 +2338,16 @@ bool LyXText::selectWordWhenUnderCursor(BufferView * bview, // This function is only used by the spellchecker for NextWord(). // It doesn't handle LYX_ACCENTs and probably never will. -string const LyXText::selectNextWord(BufferView * bview, - float & value) const +string const LyXText::selectNextWordToSpellcheck(BufferView * bview, + float & value) const { if (the_locking_inset) { - string str = the_locking_inset->selectNextWord(bview, value); + string str = the_locking_inset->selectNextWordToSpellcheck(bview, value); if (!str.empty()) { value += float(cursor.y())/float(height); return str; } -#warning Dekel please have a look on this one RTL? (Jug) - // we have to go on checking so move cusor to the right + // we have to go on checking so move cusor to the next char if (cursor.pos() == cursor.par()->size()) { if (!cursor.par()->next()) return str; @@ -2287,7 +2357,7 @@ string const LyXText::selectNextWord(BufferView * bview, cursor.pos(cursor.pos() + 1); } Paragraph * 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. @@ -2296,12 +2366,12 @@ string const LyXText::selectNextWord(BufferView * bview, && cursor.par()->isLetter(cursor.pos())) cursor.pos(cursor.pos() + 1); } - + // 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())->isTextInset())) + !cursor.par()->getInset(cursor.pos())->allowSpellcheck())) || (cursor.par()->size() == cursor.pos() && cursor.par()->next())) { @@ -2314,44 +2384,36 @@ string const LyXText::selectNextWord(BufferView * bview, // 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 // but obviously we have to start from down below ;) - return bview->text->selectNextWord(bview, value); - } - + return bview->text->selectNextWordToSpellcheck(bview, value); + } + // Update the value if we changed paragraphs - if (cursor.par() != tmppar){ + if (cursor.par() != tmppar) { setCursor(bview, cursor.par(), cursor.pos()); value = float(cursor.y())/float(height); } // Start the selection from here selection.cursor = cursor; - - Inset * inset; - // and find the end of the word - // (optional hyphens are part of a word) + // 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())) - // assignment is intentional here - || ((inset = getInset()) - && inset->lyxCode() == Inset::SPECIALCHAR_CODE - && static_cast(inset)->kind() - == InsetSpecialChar::HYPHENATION - )) + && (cursor.par()->isLetter(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()) { - Paragraph::size_type i; + pos_type i; for (i = selection.cursor.pos(); i < cursor.pos(); ++i) { - if (cursor.par()->getChar(i) != Paragraph::META_INSET) + if (!cursor.par()->isInset(i)) str += cursor.par()->getChar(i); } } @@ -2368,24 +2430,17 @@ void LyXText::selectSelectedWord(BufferView * bview) } // move cursor to the beginning setCursor(bview, selection.cursor.par(), selection.cursor.pos()); - + // set the sel cursor selection.cursor = cursor; - Inset * inset; - + // now find the end of the word while (cursor.pos() < cursor.par()->size() - && (cursor.par()->isLetter(cursor.pos()) - // assignment is intentional here - || ((inset = getInset()) - && inset->lyxCode() == Inset::SPECIALCHAR_CODE - && static_cast(inset)->kind() - == InsetSpecialChar::HYPHENATION - ))) + && (cursor.par()->isLetter(cursor.pos()))) cursor.pos(cursor.pos() + 1); - + setCursor(bview, cursor.par(), cursor.pos()); - + // finally set the selection setSelection(bview); } @@ -2405,7 +2460,7 @@ void LyXText::deleteWordForward(BufferView * bview) selection.cursor = cursor; cursor = tmpcursor; setSelection(bview); - + /* -----> Great, CutSelection() gets rid of multiple spaces. */ cutSelection(bview, true, false); } @@ -2458,13 +2513,13 @@ void LyXText::deleteLineForward(BufferView * bview) } -// Change the case of a word at cursor position. +// 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) +// version did. (JMarc) void LyXText::changeCase(BufferView * bview, LyXText::TextCase action) { LyXCursor from; @@ -2488,11 +2543,10 @@ void LyXText::changeRegionCase(BufferView * bview, LyXText::TextCase action) { lyx::Assert(from <= to); - - setUndo(bview, Undo::FINISH, - from.par(), to.par()->next()); - Paragraph::size_type pos = from.pos(); + 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())) { @@ -2500,14 +2554,14 @@ void LyXText::changeRegionCase(BufferView * bview, if (!IsInsetChar(c) && !IsHfillChar(c)) { switch (action) { case text_lowercase: - c = tolower(c); + c = lowercase(c); break; case text_capitalization: - c = toupper(c); + c = uppercase(c); action = text_lowercase; break; case text_uppercase: - c = toupper(c); + c = uppercase(c); break; } } @@ -2532,10 +2586,9 @@ void LyXText::transposeChars(BufferView & bview) { Paragraph * tmppar = cursor.par(); - setUndo(&bview, Undo::FINISH, - tmppar, tmppar->next()); + setUndo(&bview, Undo::FINISH, tmppar, tmppar->next()); - Paragraph::size_type tmppos = cursor.pos(); + pos_type tmppos = cursor.pos(); // First decide if it is possible to transpose at all @@ -2567,7 +2620,7 @@ void LyXText::Delete(BufferView * bview) 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; - + // just move to the right cursorRight(bview); @@ -2579,17 +2632,18 @@ void LyXText::Delete(BufferView * bview) //work better? if ((cursor.par()->previous() ? cursor.par()->previous()->id() : 0) == old_cur_par_prev_id - && cursor.par()->id() != old_cur_par_id) - { - return; // delete-empty-paragraph-mechanism has done it + && cursor.par()->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; - cursor = old_cursor; // to make sure undo gets the right cursor position + // to make sure undo gets the right cursor position + cursor = old_cursor; setUndo(bview, Undo::DELETE, - cursor.par(), cursor.par()->next()); + cursor.par(), cursor.par()->next()); cursor = tmpcursor; backspace(bview); } @@ -2599,7 +2653,7 @@ void LyXText::Delete(BufferView * bview) void LyXText::backspace(BufferView * bview) { // Get the font that is used to calculate the baselineskip - Paragraph::size_type lastpos = cursor.par()->size(); + pos_type lastpos = cursor.par()->size(); LyXFont rawparfont = cursor.par()->getFontSettings(bview->buffer()->params, lastpos - 1); @@ -2607,20 +2661,20 @@ void LyXText::backspace(BufferView * bview) if (cursor.pos() == 0) { // The cursor is at the beginning of a paragraph, // so the the backspace will collapse two paragraphs into one. - + // we may paste some paragraphs - + // is it an empty paragraph? - + if ((lastpos == 0 || (lastpos == 1 && cursor.par()->isSeparator(0)))) { // This is an empty paragraph and we delete it just by moving the cursor one step // left and let the DeleteEmptyParagraphMechanism handle the actual deletion // of the paragraph. - + if (cursor.par()->previous()) { Paragraph * tmppar = cursor.par()->previous(); - if (cursor.par()->getLayout() == tmppar->getLayout() + if (cursor.par()->layout() == tmppar->layout() && cursor.par()->getAlign() == tmppar->getAlign()) { // Inherit bottom DTD from the paragraph below. // (the one we are deleting) @@ -2628,9 +2682,9 @@ void LyXText::backspace(BufferView * bview) tmppar->params().spaceBottom(cursor.par()->params().spaceBottom()); tmppar->params().pagebreakBottom(cursor.par()->params().pagebreakBottom()); } - + cursorLeft(bview); - + // the layout things can change the height of a row ! int const tmpheight = cursor.row()->height(); setHeightOfRow(bview, cursor.row()); @@ -2645,42 +2699,43 @@ void LyXText::backspace(BufferView * bview) if (cursor.par()->previous()) { setUndo(bview, Undo::DELETE, - cursor.par()->previous(), cursor.par()->next()); + cursor.par()->previous(), cursor.par()->next()); } - - Paragraph * tmppar = cursor.par(); - Row * tmprow = cursor.row(); + + Paragraph * tmppar = cursor.par(); + Row * tmprow = cursor.row(); // 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()->previous()) { + if (cursor.par()->previous()) { // steps into the above paragraph. setCursorIntern(bview, cursor.par()->previous(), - cursor.par()->previous()->size(), - false); + cursor.par()->previous()->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. Even so with a footnote paragraph and a non-footnote - paragraph. I will not allow pasting in this case, - because the user would be confused if the footnote behaves + paragraph. I will not allow pasting in this case, + because the user would be confused if the footnote behaves different wether it is open or closed. - + Correction: Pasting is always allowed with standard-layout */ + LyXTextClass const & tclass = textclasslist[bview->buffer()->params.textclass]; + if (cursor.par() != tmppar - && (cursor.par()->getLayout() == tmppar->getLayout() - || tmppar->getLayout() == 0 /*standard*/) - && cursor.par()->getAlign() == tmppar->getAlign()) - { + && (cursor.par()->layout() == tmppar->layout() + || tmppar->layout() == tclass.defaultLayoutName()) + && cursor.par()->getAlign() == tmppar->getAlign()) { removeParagraph(tmprow); removeRow(tmprow); cursor.par()->pasteParagraph(bview->buffer()->params); - + if (!cursor.pos() || !cursor.par()->isSeparator(cursor.pos() - 1)) ; //cursor.par()->insertChar(cursor.pos(), ' '); // strangely enough it seems that commenting out the line above removes @@ -2689,44 +2744,44 @@ void LyXText::backspace(BufferView * bview) else if (cursor.pos()) cursor.pos(cursor.pos() - 1); - + status(bview, LyXText::NEED_MORE_REFRESH); refresh_row = cursor.row(); refresh_y = cursor.y() - cursor.row()->baseline(); - + // remove the lost paragraph // This one is not safe, since the paragraph that the tmprow and the // following rows belong to has been deleted by the PasteParagraph // above. The question is... could this be moved in front of the // PasteParagraph? //RemoveParagraph(tmprow); - //RemoveRow(tmprow); - + //RemoveRow(tmprow); + // This rebuilds the rows. appendParagraph(bview, cursor.row()); updateCounters(bview, cursor.row()); - + // 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()); + cursor.par(), cursor.par()->next()); // 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(bview, cursor.par(), cursor.pos()- 1, - false, cursor.boundary()); - + false, cursor.boundary()); + // some insets are undeletable here - if (cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET) { + if (cursor.par()->isInset(cursor.pos())) { if (!cursor.par()->getInset(cursor.pos())->deletable()) - return; + return; // force complete redo when erasing display insets - // this is a cruel method but safe..... Matthias + // this is a cruel method but safe..... Matthias if (cursor.par()->getInset(cursor.pos())->display() || cursor.par()->getInset(cursor.pos())->needFullRow()) { cursor.par()->erase(cursor.pos()); @@ -2734,21 +2789,21 @@ void LyXText::backspace(BufferView * bview) return; } } - + Row * row = cursor.row(); int y = cursor.y() - row->baseline(); - Paragraph::size_type z; + pos_type z; /* remember that a space at the end of a row doesnt count - * when calculating the fill */ + * when calculating the fill */ if (cursor.pos() < rowLast(row) || !cursor.par()->isLineSeparator(cursor.pos())) { row->fill(row->fill() + singleWidth(bview, - cursor.par(), - cursor.pos())); + cursor.par(), + cursor.pos())); } - + /* 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 @@ -2763,7 +2818,7 @@ void LyXText::backspace(BufferView * bview) if (cursor.pos() < cursor.par()->size() && !cursor.par()->isSeparator(cursor.pos())) { cursor.par()->insertChar(cursor.pos(), ' '); - setCharFont(bview->buffer(), cursor.par(), + setCharFont(bview->buffer(), cursor.par(), cursor.pos(), current_font); // refresh the positions tmprow = row; @@ -2774,7 +2829,7 @@ void LyXText::backspace(BufferView * bview) } } else { cursor.par()->erase(cursor.pos()); - + // refresh the positions Row * tmprow = row; while (tmprow->next() @@ -2791,23 +2846,23 @@ void LyXText::backspace(BufferView * bview) cursor.par()->erase(cursor.pos()); // refresh the positions tmprow = row; - while (tmprow->next() && + while (tmprow->next() && tmprow->next()->par() == row->par()) { tmprow = tmprow->next(); tmprow->pos(tmprow->pos() - 1); } } } - + // is there a break one row above if (row->previous() && row->previous()->par() == row->par()) { z = nextBreakPoint(bview, row->previous(), workWidth(bview)); if (z >= row->pos()) { row->pos(z + 1); - + Row * tmprow = row->previous(); - + // maybe the current row is now empty if (row->pos() >= row->par()->size()) { // remove it @@ -2820,13 +2875,13 @@ void LyXText::backspace(BufferView * bview) else need_break_row = 0; } - + // set the dimensions of the row above y -= tmprow->height(); tmprow->fill(fill(bview, tmprow, workWidth(bview))); setHeightOfRow(bview, tmprow); - + refresh_y = y; refresh_row = tmprow; status(bview, LyXText::NEED_MORE_REFRESH); @@ -2842,23 +2897,23 @@ void LyXText::backspace(BufferView * bview) return; } } - + // 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))) { - + /* 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 + * is to long to be broken. Well, I don t care this * hack ;-) */ if (rowLast(row) == row->par()->size() - 1) removeRow(row->next()); - + refresh_y = y; refresh_row = row; status(bview, LyXText::NEED_MORE_REFRESH); - + breakAgainOneRow(bview, row); // will the cursor be in another row now? if (row->next() && row->next()->par() == row->par() && @@ -2899,697 +2954,777 @@ void LyXText::backspace(BufferView * bview) lastpos = cursor.par()->size(); if (cursor.pos() == lastpos) setCurrentFont(bview); - + // check, whether the last characters font has changed. - if (rawparfont != + if (rawparfont != cursor.par()->getFontSettings(bview->buffer()->params, lastpos - 1)) { redoHeightOfParagraph(bview, cursor); } else { // now the special right address boxes - if (textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->getLayout()).margintype == MARGIN_RIGHT_ADDRESS_BOX) { - redoDrawingOfParagraph(bview, cursor); + if (textclasslist + [bview->buffer()->params.textclass] + [cursor.par()->layout()].margintype == MARGIN_RIGHT_ADDRESS_BOX) { + redoDrawingOfParagraph(bview, cursor); } } } -void LyXText::getVisibleRow(BufferView * bview, int y_offset, int x_offset, - Row * row_ptr, int y, bool cleared) +bool LyXText::paintRowBackground(DrawRowParams & p) { - // returns a printed row - Painter & pain = bview->painter(); - - bool const is_rtl = - row_ptr->par()->isRightToLeftPar(bview->buffer()->params); - - Paragraph::size_type const last = rowLastPrintable(row_ptr); + bool clear_area = true; + Inset * inset = 0; + LyXFont font(LyXFont::ALL_SANE); - Paragraph::size_type vpos; - Paragraph::size_type pos; + pos_type const last = rowLastPrintable(p.row); - float tmpx; + 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(); + } + } - LyXFont font(LyXFont::ALL_SANE); - int maxdesc; - if (row_ptr->height() <= 0) { - lyxerr << "LYX_ERROR: row.height: " - << row_ptr->height() << endl; - return; + if (p.cleared) { + return true; } - float x; - float fill_separator; - float fill_hfill; - float fill_label_hfill; - prepareToPrint(bview, row_ptr, x, fill_separator, - fill_hfill, fill_label_hfill); - - if (inset_owner && (x < 0)) - x = 0; - x += x_offset; - - // clear the area where we want to paint/print - int const ww = bview->workWidth(); + 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; + } - bool clear_area = true; - Inset * inset = 0; + if (inset == 0) + return false; - if (!bview->screen()->forceClear() && last == row_ptr->pos() - && row_ptr->par()->getChar(row_ptr->pos()) == Paragraph::META_INSET - && (inset = row_ptr->par()->getInset(row_ptr->pos()))) { - clear_area = inset->doClearArea(); - } - // we don't need to clear it's already done!!! - if (cleared) { - clear_area = true; - } else if (clear_area) { - int const y = y_offset < 0 ? 0 : y_offset; - int const h = y_offset < 0 ? - row_ptr->height() + y_offset : row_ptr->height(); - int const w = inset_owner ? - inset_owner->textWidth(bview, true) : ww; - int const x = x_offset; - pain.fillRectangle(x, y, w, h, backgroundColor()); - } else if (inset != 0) { - int h = row_ptr->baseline() - inset->ascent(bview, font); - // first clear the whole row above the inset! - if (h > 0) { - int const w = (inset_owner ? - inset_owner->textWidth(bview, true) : ww); - pain.fillRectangle(x_offset, y_offset, w, h, - backgroundColor()); - } - h += inset->ascent(bview, font) + inset->descent(bview, font); - // clear the space below the inset! - if ((row_ptr->height() - h) > 0) { - int const w = (inset_owner ? - inset_owner->textWidth(bview, true) : ww); - pain.fillRectangle(x_offset, y_offset + h, - w, row_ptr->height() - h, - backgroundColor()); - } - // clear the space behind the inset, if needed - if (!inset->display() && !inset->needFullRow()) { - int const w = (inset_owner ? - inset_owner->textWidth(bview, true) : ww); - int const xp = int(x) + inset->width(bview, font); - if (w-xp > 0) { - pain.fillRectangle(xp, y_offset, - w-xp, row_ptr->height(), - backgroundColor()); - } + 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()); } } - if (selection.set()) { - int const w = (inset_owner ? - inset_owner->textWidth(bview, true) : ww); - // selection code - if (bidi_same_direction) { - if (selection.start.row() == row_ptr && - selection.end.row() == row_ptr) { - if (selection.start.x() < selection.end.x()) - pain.fillRectangle(x_offset + selection.start.x(), - y_offset, - selection.end.x() - selection.start.x(), - row_ptr->height(), - LColor::selection); - else - pain.fillRectangle(x_offset + selection.end.x(), - y_offset, - selection.start.x() - selection.end.x(), - row_ptr->height(), - LColor::selection); - } else if (selection.start.row() == row_ptr) { - if (is_rtl) - pain.fillRectangle(x_offset, y_offset, - selection.start.x(), - row_ptr->height(), - LColor::selection); - else - pain.fillRectangle(x_offset + selection.start.x(), - y_offset, - w - selection.start.x(), - row_ptr->height(), - LColor::selection); - } else if (selection.end.row() == row_ptr) { - if (is_rtl) - pain.fillRectangle(x_offset + selection.end.x(), - y_offset, - w - selection.end.x(), - row_ptr->height(), - LColor::selection); - else - pain.fillRectangle(x_offset, y_offset, - selection.end.x(), - row_ptr->height(), - LColor::selection); - } else if (y > selection.start.y() - && y < selection.end.y()) { - pain.fillRectangle(x_offset, y_offset, w, - row_ptr->height(), - LColor::selection); - } - } else if (selection.start.row() != row_ptr && - selection.end.row() != row_ptr && - y > selection.start.y() - && y < selection.end.y()) { - pain.fillRectangle(x_offset, y_offset, w, - row_ptr->height(), - LColor::selection); - } else if (selection.start.row() == row_ptr || - selection.end.row() == row_ptr) { - float tmpx = x; - if ((selection.start.row() != row_ptr && !is_rtl) || - (selection.end.row() != row_ptr && is_rtl)) - pain.fillRectangle(x_offset, y_offset, - int(tmpx), - row_ptr->height(), - LColor::selection); - Paragraph::size_type main_body = - beginningOfMainBody(bview->buffer(), - row_ptr->par()); - - for (vpos = row_ptr->pos(); vpos <= last; ++vpos) { - pos = vis2log(vpos); - float const old_tmpx = tmpx; - if (main_body > 0 && pos == main_body-1) { - tmpx += fill_label_hfill + - lyxfont::width(textclasslist.Style(bview->buffer()->params.textclass, - row_ptr->par()->getLayout()).labelsep, - getLabelFont(bview->buffer(),row_ptr->par())); - if (row_ptr->par()->isLineSeparator(main_body-1)) - tmpx -= singleWidth(bview, row_ptr->par(), main_body-1); - } - if (hfillExpansion(bview->buffer(), row_ptr, pos)) { - tmpx += singleWidth(bview, row_ptr->par(), pos); - if (pos >= main_body) - tmpx += fill_hfill; - else - tmpx += fill_label_hfill; - } - else if (row_ptr->par()->isSeparator(pos)) { - tmpx += singleWidth(bview, row_ptr->par(), pos); - if (pos >= main_body) - tmpx += fill_separator; - } else - tmpx += singleWidth(bview, row_ptr->par(), pos); - - if ((selection.start.row() != row_ptr || - selection.start.pos() <= pos) && - (selection.end.row() != row_ptr || - pos < selection.end.pos()) ) - // Here we do not use x_offset as x_offset was - // added to x. - pain.fillRectangle(int(old_tmpx), - y_offset, - int(tmpx - old_tmpx + 1), - row_ptr->height(), - LColor::selection); + 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 + lyxfont::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 ((selection.start.row() != row_ptr && is_rtl) || - (selection.end.row() != row_ptr && !is_rtl) ) - pain.fillRectangle(x_offset + int(tmpx), - y_offset, - int(ww - tmpx), - row_ptr->height(), - LColor::selection); + 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); } } +} - int box_x = 0; - // Draw appendix lines - Paragraph * firstpar = row_ptr->par(); +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()) { - pain.line(1, y_offset, - 1, y_offset + row_ptr->height(), - LColor::appendixline); - pain.line(ww - 2, y_offset, - ww - 2, y_offset + row_ptr->height(), - LColor::appendixline); - } - - // Draw depth lines - Paragraph::depth_type const depth = firstpar->getDepth(); - if (depth > 0) { - Paragraph::depth_type next_depth = 0; - Paragraph::depth_type prev_depth = 0; - if (row_ptr->next()) - next_depth = row_ptr->next()->par()->getDepth(); - if (row_ptr->previous()) - prev_depth = row_ptr->previous()->par()->getDepth(); - - for (Paragraph::depth_type i = 1; i <= depth; ++i) { - int const line_x = (LYX_PAPER_MARGIN / 5) * - i + box_x + x_offset; - pain.line(line_x, y_offset, line_x, - y_offset + row_ptr->height() - 1 - (i - next_depth - 1) * 3, - LColor::depthbar); - - if (i > prev_depth) - pain.fillRectangle(line_x, y_offset, LYX_PAPER_MARGIN / 5, 2, - LColor::depthbar); - if (i > next_depth) - pain.fillRectangle(line_x, - y_offset + row_ptr->height() - 2 - (i - next_depth - 1) * 3, - LYX_PAPER_MARGIN / 5, 2, - LColor::depthbar); - } - } - - - LyXLayout const & layout = - textclasslist.Style(bview->buffer()->params.textclass, - row_ptr->par()->getLayout()); + 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, + lyxfont::maxAscent(font) + + lyxfont::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(); + lyxfont::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; - int y_bottom = row_ptr->height(); - - // is it a first row? - if (!row_ptr->pos() && (row_ptr->par() == firstpar)) { - - // start of appendix? - if (row_ptr->par()->params().startOfAppendix()) { - pain.line(1, y_offset, - ww - 2, y_offset, - LColor::appendixline); - } - - // think about the margins - if (!row_ptr->previous() && bv_owner) - y_top += LYX_PAPER_MARGIN; - - // draw a top pagebreak - if (row_ptr->par()->params().pagebreakTop()) { - LyXFont pb_font; - pb_font.setColor(LColor::pagebreak).decSize(); - int w = 0; - int a = 0; - int d = 0; - pain.line(0, y_offset + y_top + 2*defaultHeight(), - ww, - y_offset + y_top + 2 * defaultHeight(), - LColor::pagebreak, - Painter::line_onoffdash); - lyxfont::rectText(_("Page Break (top)"), pb_font, - w, a, d); - pain.rectText((ww - w)/2, - y_offset + y_top + 2 * defaultHeight() + d, - _("Page Break (top)"), - pb_font, - backgroundColor(), - backgroundColor()); - y_top += 3 * defaultHeight(); - } - - if (row_ptr->par()->params().spaceTop().kind() == VSpace::VFILL) { - // draw a vfill top - pain.line(0, y_offset + 2 + y_top, - LYX_PAPER_MARGIN, y_offset + 2 + y_top, - LColor::vfillline); - - pain.line(0, y_offset + y_top + 3 * defaultHeight(), - LYX_PAPER_MARGIN, - y_offset + y_top + 3 * defaultHeight(), - LColor::vfillline); - - pain.line(LYX_PAPER_MARGIN / 2, y_offset + 2 + y_top, - LYX_PAPER_MARGIN / 2, - y_offset + y_top + 3 * defaultHeight(), - LColor::vfillline); - - y_top += 3 * defaultHeight(); - } - - // think about user added space - y_top += int(row_ptr->par()->params().spaceTop().inPixels(bview)); - - // think about the parskip - // some parskips VERY EASY IMPLEMENTATION - if (bview->buffer()->params.paragraph_separation == BufferParams::PARSEP_SKIP) { - if (layout.latextype == LATEX_PARAGRAPH - && firstpar->getDepth() == 0 - && firstpar->previous()) - y_top += bview->buffer()->params.getDefSkip().inPixels(bview); - else if (firstpar->previous() - && textclasslist.Style(bview->buffer()->params.textclass, - firstpar->previous()->getLayout()).latextype == LATEX_PARAGRAPH - && firstpar->previous()->getDepth() == 0) - // is it right to use defskip here, too? (AS) - y_top += bview->buffer()->params.getDefSkip().inPixels(bview); - } - - if (row_ptr->par()->params().lineTop()) { - // draw a top line - y_top += lyxfont::ascent('x', - getFont(bview->buffer(), - row_ptr->par(), 0)); - int const w = (inset_owner ? - inset_owner->width(bview, font) : ww); - int const xp = static_cast(inset_owner ? x : 0); - pain.line(xp, y_offset + y_top, - w, y_offset + y_top, - LColor::topline, - Painter::line_solid, - Painter::line_thick); - - y_top += lyxfont::ascent('x',getFont(bview->buffer(), - row_ptr->par(), 0)); - } - - // should we print a label? - if (layout.labeltype >= LABEL_STATIC - && (layout.labeltype != LABEL_STATIC - || layout.latextype != LATEX_ENVIRONMENT - || row_ptr->par()->isFirstInSequence())) { - font = getLabelFont(bview->buffer(), row_ptr->par()); - if (!row_ptr->par()->getLabelstring().empty()) { - tmpx = x; - string const tmpstring = - row_ptr->par()->getLabelstring(); - - if (layout.labeltype == LABEL_COUNTER_CHAPTER) { - if (bview->buffer()->params.secnumdepth >= 0) { - // this is special code for - // the chapter layout. This is - // printed in an extra row - // and has a pagebreak at - // the top. - float spacing_val = 1.0; - if (!row_ptr->par()->params().spacing().isDefault()) { - spacing_val = row_ptr->par()->params().spacing().getValue(); - } else { - spacing_val = bview->buffer()->params.spacing.getValue(); - } - - maxdesc = int(lyxfont::maxDescent(font) * layout.spacing.getValue() * spacing_val) - + int(layout.parsep) * defaultHeight(); - if (is_rtl) - tmpx = ww - leftMargin(bview, row_ptr) - - lyxfont::width(tmpstring, font); - pain.text(int(tmpx), - y_offset + row_ptr->baseline() - row_ptr->ascent_of_text() - maxdesc, - tmpstring, font); - } - } else { - if (is_rtl) { - tmpx = ww - leftMargin(bview, row_ptr) - + lyxfont::width(layout.labelsep, font); - } else - tmpx = x - lyxfont::width(layout.labelsep, font) - - lyxfont::width(tmpstring, font); - // draw it! - pain.text(int(tmpx), - y_offset + row_ptr->baseline(), - tmpstring, font); + // 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(); + lyxfont::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); } } - // the labels at the top of an environment. - // More or less for bibliography - } else if (layout.labeltype == LABEL_TOP_ENVIRONMENT || - layout.labeltype == LABEL_BIBLIO || - layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) { - if (row_ptr->par()->isFirstInSequence()) { - font = getLabelFont(bview->buffer(), - row_ptr->par()); - if (!row_ptr->par()->getLabelstring().empty()) { - string const tmpstring = - row_ptr->par()->getLabelstring(); + } + } + + int const ww = p.bv->workWidth(); + + // draw a top line + if (parparams.lineTop()) { + LyXFont font(LyXFont::ALL_SANE); + int const asc = lyxfont::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(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 (!row_ptr->par()->params().spacing().isDefault()) { - spacing_val = row_ptr->par()->params().spacing().getValue(); + if (!parparams.spacing().isDefault()) { + spacing_val = parparams.spacing().getValue(); } else { - spacing_val = bview->buffer()->params.spacing.getValue(); + spacing_val = buffer->params.spacing.getValue(); } - - maxdesc = int(lyxfont::maxDescent(font) * layout.spacing.getValue() * spacing_val - + (layout.labelbottomsep * defaultHeight())); - - tmpx = x; - if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT){ - tmpx = ( (is_rtl ? leftMargin(bview, row_ptr) : x) - + ww - rightMargin(bview->buffer(), row_ptr) ) / 2; - tmpx -= lyxfont::width(tmpstring, font) / 2; - } else if (is_rtl) - tmpx = ww - leftMargin(bview, row_ptr) - - lyxfont::width(tmpstring, font); - pain.text(int(tmpx), - y_offset + row_ptr->baseline() - - row_ptr->ascent_of_text() - - maxdesc, - tmpstring, font); + + int const maxdesc = + int(lyxfont::maxDescent(font) * layout.spacing.getValue() * spacing_val) + + int(layout.parsep) * defaultHeight(); + + if (is_rtl) { + x = ww - leftMargin(p.bv, p.row) - + lyxfont::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) + + lyxfont::width(layout.labelsep, font); + } else { + x = p.x - lyxfont::width(layout.labelsep, font) + - lyxfont::width(str, font); + } + + p.pain->text(int(x), p.yo + p.row->baseline(), str, font); } } - if (layout.labeltype == LABEL_BIBLIO && row_ptr->par()->bibkey) { - font = getLayoutFont(bview->buffer(), row_ptr->par()); - if (is_rtl) - tmpx = ww - leftMargin(bview, row_ptr) - + lyxfont::width(layout.labelsep, font); - else - tmpx = x - lyxfont::width(layout.labelsep, font) - - row_ptr->par()->bibkey->width(bview, font); - row_ptr->par()->bibkey->draw(bview, font, - y_offset + row_ptr->baseline(), - tmpx, clear_area); + // 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(lyxfont::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 -= lyxfont::width(str, font) / 2; + } else if (is_rtl) { + x = ww - leftMargin(p.bv, p.row) - + lyxfont::width(str, font); + } + p.pain->text(int(x), p.yo + p.row->baseline() + - p.row->ascent_of_text() - maxdesc, + str, font); } } - - // is it a last row? - Paragraph * par = row_ptr->par(); - if (row_ptr->par() == par - && (!row_ptr->next() || row_ptr->next()->par() != row_ptr->par())) { - // think about the margins - if (!row_ptr->next() && bv_owner) - y_bottom -= LYX_PAPER_MARGIN; - - // draw a bottom pagebreak - if (firstpar->params().pagebreakBottom()) { - LyXFont pb_font; - pb_font.setColor(LColor::pagebreak).decSize(); - int const y_place = y_offset + y_bottom - - 2 * defaultHeight(); - - int w = 0; - int a = 0; - int d = 0; - pain - .line(0, y_place, ww, y_place, - LColor::pagebreak, - Painter::line_onoffdash); - lyxfont::rectText(_("Page Break (bottom)"), pb_font, - w, a, d); - pain.rectText((ww - w) / 2, y_place + d, - _("Page Break (bottom)"), - pb_font, - backgroundColor(), - backgroundColor()); - y_bottom -= 3 * defaultHeight(); - } - - if (firstpar->params().spaceBottom().kind() == VSpace::VFILL) { - // draw a vfill bottom - int const y_place = y_offset + y_bottom - - 3 * defaultHeight(); - - pain.line(0, y_place, - LYX_PAPER_MARGIN, y_place, - LColor::vfillline); - pain.line(0, y_offset + y_bottom - 2, - LYX_PAPER_MARGIN, - y_offset + y_bottom - 2, - LColor::vfillline); - pain.line(LYX_PAPER_MARGIN / 2, - y_place, - LYX_PAPER_MARGIN / 2, - y_offset + y_bottom - 2, - LColor::vfillline); - y_bottom -= 3 * defaultHeight(); - } - - // think about user added space - y_bottom -= int(firstpar->params().spaceBottom().inPixels(bview)); - - if (firstpar->params().lineBottom()) { - // draw a bottom line - y_bottom -= lyxfont::ascent('x', - getFont(bview->buffer(), - par, - par->size() - 1)); - int const w = (inset_owner ? - inset_owner->width(bview, font) : ww); - int const xp = static_cast(inset_owner ? x : 0); - pain.line(xp, y_offset + y_bottom, - w, y_offset + y_bottom, - LColor::topline, Painter::line_solid, - Painter::line_thick); - y_bottom -= lyxfont::ascent('x', - getFont(bview->buffer(), - par, - par->size() - 1)); - } - - // draw an endlabel - int const endlabel = - row_ptr->par()->getEndLabel(bview->buffer()->params); - switch (endlabel) { - case END_LABEL_BOX: - case END_LABEL_FILLED_BOX: - { - LyXFont const font = getFont(bview->buffer(), - row_ptr->par(), last); - int const size = int(0.75 * lyxfont::maxAscent(font)); - int const y = (y_offset + row_ptr->baseline()) - size; - int x = is_rtl ? LYX_PAPER_MARGIN - : ww - LYX_PAPER_MARGIN - size; - - if (row_ptr->fill() <= size) - x += (size - row_ptr->fill() + 1) * (is_rtl ? -1 : 1); - if (endlabel == END_LABEL_BOX) { - pain.line(x, y, x, y + size, - LColor::eolmarker); - pain.line(x + size, y, x + size , y + size, - LColor::eolmarker); - pain.line(x, y, x + size, y, - LColor::eolmarker); - pain.line(x, y + size, x + size, y + size, - LColor::eolmarker); - } else - pain.fillRectangle(x, y, size, size, - LColor::eolmarker); - break; - } - case END_LABEL_STATIC: - { - LyXTextClass::LayoutList::size_type layout = row_ptr->par()->getLayout(); - string const tmpstring = textclasslist. - Style(bview->buffer()->params.textclass, - layout).endlabelstring(); - font = getLabelFont(bview->buffer(), row_ptr->par()); - int const tmpx = is_rtl ? - int(x) - lyxfont::width(tmpstring, font) - : ww - rightMargin(bview->buffer(), row_ptr) - row_ptr->fill(); - pain.text( tmpx, y_offset + row_ptr->baseline(), tmpstring, font); - break; + + if (layout.labeltype == LABEL_BIBLIO && par->bibkey) { + LyXFont font = getLayoutFont(buffer, par); + float x; + if (is_rtl) { + x = ww - leftMargin(p.bv, p.row) + + lyxfont::width(layout.labelsep, font); + } else { + x = p.x - lyxfont::width(layout.labelsep, font) + - par->bibkey->width(p.bv, font); } - case END_LABEL_NO_LABEL: - break; + 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; + lyxfont::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 = lyxfont::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(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 * lyxfont::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) - lyxfont::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; } - - // draw the text in the pixmap - - vpos = row_ptr->pos(); +} + +void LyXText::paintRowText(DrawRowParams & p) +{ + Paragraph * par = p.row->par(); + Buffer const * buffer = p.bv->buffer(); - Paragraph::size_type main_body = - beginningOfMainBody(bview->buffer(), row_ptr->par()); + pos_type const last = rowLastPrintable(p.row); + pos_type main_body = + beginningOfMainBody(buffer, par); if (main_body > 0 && - (main_body-1 > last || - !row_ptr->par()->isLineSeparator(main_body - 1))) + (main_body - 1 > last || + !par->isLineSeparator(main_body - 1))) { main_body = 0; - - while (vpos <= last) { - pos = vis2log(vpos); + } + + LyXLayout const & layout = + textclasslist[buffer->params.textclass][par->layout()]; + + pos_type vpos = p.row->pos(); + while (vpos <= last) { + pos_type pos = vis2log(vpos); if (main_body > 0 && pos == main_body - 1) { - x += fill_label_hfill - + lyxfont::width(layout.labelsep, - getLabelFont(bview->buffer(), - row_ptr->par())) - - singleWidth(bview, - row_ptr->par(), - main_body - 1); - } - - if (row_ptr->par() ->isHfill(pos)) { - x += 1; - pain.line(int(x), - y_offset + row_ptr->baseline() - defaultHeight() / 2, - int(x), - y_offset + row_ptr->baseline(), - LColor::vfillline); - - if (hfillExpansion(bview->buffer(), - row_ptr, pos)) { + int const lwidth = lyxfont::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) { - pain.line(int(x), - y_offset + row_ptr->baseline() - defaultHeight() / 4, - int(x + fill_hfill), - y_offset + row_ptr->baseline() - defaultHeight() / 4, - LColor::vfillline, + p.pain->line(int(p.x), y2, + int(p.x + p.hfill), y2, + LColor::added_space, Painter::line_onoffdash); - x += fill_hfill; + p.x += p.hfill; } else { - pain.line(int(x), - y_offset + row_ptr->baseline() - defaultHeight() / 4, - int(x + fill_label_hfill), - y_offset + row_ptr->baseline() - defaultHeight() / 4, - LColor::vfillline, + p.pain->line(int(p.x), y2, + int(p.x + p.label_hfill), y2, + LColor::added_space, Painter::line_onoffdash); - - x += fill_label_hfill; + p.x += p.label_hfill; } - pain.line(int(x), - y_offset + row_ptr->baseline() - defaultHeight() / 2, - int(x), - y_offset + row_ptr->baseline(), - LColor::vfillline); + p.pain->line(int(p.x), y1, + int(p.x), y0, + LColor::added_space); } - x += 2; + p.x += 2; ++vpos; - } else if (row_ptr->par()->isSeparator(pos)) { - x += singleWidth(bview, - row_ptr->par(), pos); + } else if (par->isSeparator(pos)) { + p.x += singleWidth(p.bv, par, pos); if (pos >= main_body) - x += fill_separator; + p.x += p.separator; ++vpos; - } else - draw(bview, row_ptr, vpos, y_offset, x, clear_area); + } else { + draw(p, vpos); + } } } +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(lyxfont::maxAscent(font) + lyxfont::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 */ -int LyXText::getColumnNearX(BufferView * bview, Row * row, int & x, - bool & boundary) const + +/* returns the column near the specified x-coordinate of the row +* x is set to the real beginning of this column */ +pos_type +LyXText::getColumnNearX(BufferView * bview, Row * row, int & x, + bool & boundary) const { float tmpx = 0.0; float fill_separator; float fill_hfill; float fill_label_hfill; - + prepareToPrint(bview, row, tmpx, fill_separator, fill_hfill, fill_label_hfill); - Paragraph::size_type vc = row->pos(); - Paragraph::size_type last = rowLastPrintable(row); - Paragraph::size_type c = 0; + pos_type vc = row->pos(); + pos_type last = rowLastPrintable(row); + pos_type c = 0; LyXLayout const & layout = - textclasslist.Style(bview->buffer()->params.textclass, - row->par()->getLayout()); + textclasslist[bview->buffer()->params.textclass][ + row->par()->layout()]; bool left_side = false; - Paragraph::size_type - main_body = beginningOfMainBody(bview->buffer(), row->par()); + pos_type main_body = beginningOfMainBody(bview->buffer(), row->par()); float last_tmpx = tmpx; - + if (main_body > 0 && - (main_body - 1 > last || + (main_body - 1 > last || !row->par()->isLineSeparator(main_body - 1))) main_body = 0; - + while (vc <= last && tmpx <= x) { c = vis2log(vc); last_tmpx = tmpx; @@ -3600,7 +3735,7 @@ int LyXText::getColumnNearX(BufferView * bview, Row * row, int & x, 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 (c >= main_body) @@ -3616,7 +3751,7 @@ int LyXText::getColumnNearX(BufferView * bview, Row * row, int & x, tmpx += singleWidth(bview, row->par(), c); ++vc; } - + if ((tmpx + last_tmpx) / 2 > x) { tmpx = last_tmpx; left_side = true; @@ -3627,18 +3762,18 @@ int LyXText::getColumnNearX(BufferView * bview, Row * row, int & x, boundary = false; bool const lastrow = lyxrc.rtl_support // This is not needed, but gives - // some speedup if rtl_support=false + // some speedup if rtl_support=false && (!row->next() || row->next()->par() != row->par()); bool const rtl = (lastrow) ? row->par()->isRightToLeftPar(bview->buffer()->params) : false; // If lastrow is false, we don't need to compute - // the value of rtl. + // the value of rtl. if (row->pos() > last) // Row is empty? c = row->pos(); else if (lastrow && - ( ( rtl && left_side && vc == row->pos() && x < tmpx - 5) || - (!rtl && !left_side && vc == last + 1 && x > tmpx + 5) )) + ((rtl && left_side && vc == row->pos() && x < tmpx - 5) || + (!rtl && !left_side && vc == last + 1 && x > tmpx + 5))) c = last + 1; else if (vc == row->pos()) { c = vis2log(vc); @@ -3669,21 +3804,20 @@ int LyXText::getColumnNearX(BufferView * bview, Row * row, int & x, // returns pointer to a specified row -Row * LyXText::getRow(Paragraph * par, - Paragraph::size_type pos, int & y) const +Row * LyXText::getRow(Paragraph * par, pos_type pos, int & y) const { if (!firstrow) return 0; - + Row * tmprow = firstrow; y = 0; - + // find the first row of the specified paragraph while (tmprow->next() && tmprow->par() != par) { y += tmprow->height(); tmprow = tmprow->next(); } - + // now find the wanted row while (tmprow->pos() < pos && tmprow->next() @@ -3692,6 +3826,75 @@ Row * LyXText::getRow(Paragraph * par, y += tmprow->height(); tmprow = tmprow->next(); } - + return tmprow; } + + +Row * LyXText::getRowNearY(int & y) const +{ +#if 1 + // If possible we should optimize this method. (Lgb) + Row * tmprow = firstrow; + int tmpy = 0; + + while (tmprow->next() && tmpy + tmprow->height() <= y) { + tmpy += tmprow->height(); + tmprow = tmprow->next(); + } + + y = tmpy; // return the real y + + //lyxerr << "returned y = " << y << endl; + + return tmprow; +#else + // Search from the current cursor position. + + Row * tmprow = cursor.row(); + int tmpy = cursor.y() - tmprow->baseline(); + + lyxerr << "cursor.y() = " << tmpy << endl; + lyxerr << "tmprow->height() = " << tmprow->height() << endl; + lyxerr << "tmprow->baseline() = " << tmprow->baseline() << endl; + lyxerr << "first = " << first << endl; + lyxerr << "y = " << y << endl; + + 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; + + while (tmprow->next() && tmpy + tmprow->height() <= y) { + tmpy += tmprow->height(); + tmprow = tmprow->next(); + } + } else { + lyxerr << "equal" << endl; + } + + y = tmpy; // return the real y + + lyxerr << "returned y = " << y << endl; + + return tmprow; + +#endif +} + + +int LyXText::getDepth() const +{ + return cursor.par()->getDepth(); +}